Commit 51967aa8 authored by Matija Obreza's avatar Matija Obreza
Browse files

Java package organization

parent d1f12782
......@@ -14,12 +14,12 @@
* limitations under the License.
**/
package org.genesys2.rest.common.persistence.domain;
package org.genesys2.server.common.persistence.domain;
import java.util.List;
import org.genesys2.rest.common.model.impl.Dataset;
import org.genesys2.rest.common.model.impl.SparseEntry;
import org.genesys2.server.common.model.impl.Dataset;
import org.genesys2.server.common.model.impl.SparseEntry;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
......
......@@ -14,11 +14,11 @@
* limitations under the License.
**/
package org.genesys2.rest.common.persistence.domain;
package org.genesys2.server.common.persistence.domain;
import java.util.List;
import org.genesys2.rest.common.model.genesys.Taxonomy;
import org.genesys2.server.common.model.genesys.Taxonomy;
import org.springframework.data.jpa.repository.JpaRepository;
public interface TaxonomyRepository extends JpaRepository<Taxonomy, Long> {
......
......@@ -14,16 +14,16 @@
* limitations under the License.
**/
package org.genesys2.rest.common.persistence.domain;
package org.genesys2.server.common.persistence.domain;
import java.util.List;
import java.util.Map;
import org.genesys2.rest.common.model.genesys.Accession;
import org.genesys2.rest.common.model.genesys.AccessionTrait;
import org.genesys2.rest.common.model.genesys.ExperimentTrait;
import org.genesys2.rest.common.model.genesys.Metadata;
import org.genesys2.rest.common.model.genesys.Method;
import org.genesys2.server.common.model.genesys.Accession;
import org.genesys2.server.common.model.genesys.AccessionTrait;
import org.genesys2.server.common.model.genesys.ExperimentTrait;
import org.genesys2.server.common.model.genesys.Metadata;
import org.genesys2.server.common.model.genesys.Method;
public interface TraitValueRepository {
......
......@@ -14,7 +14,7 @@
* limitations under the License.
**/
package org.genesys2.rest.common.persistence.domain;
package org.genesys2.server.common.persistence.domain;
import java.util.ArrayList;
import java.util.HashMap;
......@@ -25,11 +25,11 @@ import javax.sql.DataSource;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.genesys2.rest.common.model.genesys.Accession;
import org.genesys2.rest.common.model.genesys.AccessionTrait;
import org.genesys2.rest.common.model.genesys.ExperimentTrait;
import org.genesys2.rest.common.model.genesys.Metadata;
import org.genesys2.rest.common.model.genesys.Method;
import org.genesys2.server.common.model.genesys.Accession;
import org.genesys2.server.common.model.genesys.AccessionTrait;
import org.genesys2.server.common.model.genesys.ExperimentTrait;
import org.genesys2.server.common.model.genesys.Metadata;
import org.genesys2.server.common.model.genesys.Method;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Repository;
......
......@@ -15,9 +15,9 @@
**/
package org.genesys2.rest.common.persistence.domain;
package org.genesys2.server.common.persistence.domain;
import org.genesys2.rest.common.model.impl.User;
import org.genesys2.server.common.model.impl.User;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.transaction.annotation.Transactional;
......
......@@ -15,11 +15,11 @@
**/
package org.genesys2.rest.common.security;
package org.genesys2.server.common.security;
import java.util.concurrent.Callable;
import org.genesys2.rest.common.aspect.AsAdmin;
import org.genesys2.server.common.aspect.AsAdmin;
import org.springframework.stereotype.Service;
@Service
......
......@@ -15,11 +15,11 @@
**/
package org.genesys2.rest.common.security;
package org.genesys2.server.common.security;
import java.util.Collection;
import org.genesys2.rest.common.model.impl.User;
import org.genesys2.server.common.model.impl.User;
import org.springframework.security.core.GrantedAuthority;
public class AuthUserDetails extends org.springframework.security.core.userdetails.User {
......
......@@ -15,15 +15,15 @@
**/
package org.genesys2.rest.common.security;
package org.genesys2.server.common.security;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import org.genesys2.rest.common.model.UserRole;
import org.genesys2.rest.common.model.impl.User;
import org.genesys2.rest.common.service.UserService;
import org.genesys2.server.common.model.UserRole;
import org.genesys2.server.common.model.impl.User;
import org.genesys2.server.common.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
......
......@@ -15,7 +15,7 @@
**/
package org.genesys2.rest.common.security;
package org.genesys2.server.common.security;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......
......@@ -15,12 +15,12 @@
**/
package org.genesys2.rest.common.service;
package org.genesys2.server.common.service;
import java.util.List;
import org.genesys2.rest.common.model.impl.ActivityPost;
import org.genesys2.rest.common.model.impl.Article;
import org.genesys2.server.common.model.impl.ActivityPost;
import org.genesys2.server.common.model.impl.Article;
public interface ContentService {
......
......@@ -15,14 +15,14 @@
**/
package org.genesys2.rest.common.service;
package org.genesys2.server.common.service;
import java.util.List;
import java.util.Locale;
import org.genesys2.rest.common.model.genesys.Taxonomy;
import org.genesys2.rest.common.model.impl.Crop;
import org.genesys2.rest.common.model.impl.CropTaxonomy;
import org.genesys2.server.common.model.genesys.Taxonomy;
import org.genesys2.server.common.model.impl.Crop;
import org.genesys2.server.common.model.impl.CropTaxonomy;
public interface CropService {
......
......@@ -15,12 +15,12 @@
**/
package org.genesys2.rest.common.service;
package org.genesys2.server.common.service;
import java.util.List;
import org.genesys2.rest.common.model.impl.Dataset;
import org.genesys2.rest.common.model.impl.Descriptor;
import org.genesys2.server.common.model.impl.Dataset;
import org.genesys2.server.common.model.impl.Descriptor;
public interface DataService {
......
......@@ -15,13 +15,13 @@
**/
package org.genesys2.rest.common.service;
package org.genesys2.server.common.service;
import java.util.List;
import org.genesys2.rest.common.model.impl.Dataset;
import org.genesys2.rest.common.model.impl.DatasetDescriptor;
import org.genesys2.rest.common.model.impl.Descriptor;
import org.genesys2.server.common.model.impl.Dataset;
import org.genesys2.server.common.model.impl.DatasetDescriptor;
import org.genesys2.server.common.model.impl.Descriptor;
public interface DescriptorService {
......
package org.genesys2.rest.common.service;
package org.genesys2.server.common.service;
import java.util.List;
import org.genesys2.rest.common.model.genesys.Accession;
import org.genesys2.server.common.model.genesys.Accession;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
......
......@@ -14,26 +14,26 @@
* limitations under the License.
**/
package org.genesys2.rest.common.service;
package org.genesys2.server.common.service;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import org.genesys2.rest.common.model.genesys.Accession;
import org.genesys2.rest.common.model.genesys.AllAccnames;
import org.genesys2.rest.common.model.genesys.AllAcqBreeding;
import org.genesys2.rest.common.model.genesys.AllAcqCollect;
import org.genesys2.rest.common.model.genesys.AllAcqExchange;
import org.genesys2.rest.common.model.genesys.AllEnvironment;
import org.genesys2.rest.common.model.genesys.ExperimentTrait;
import org.genesys2.rest.common.model.genesys.Metadata;
import org.genesys2.rest.common.model.genesys.Method;
import org.genesys2.rest.common.model.genesys.Taxonomy;
import org.genesys2.rest.common.model.impl.Country;
import org.genesys2.rest.common.model.impl.Crop;
import org.genesys2.rest.common.model.impl.FaoInstitute;
import org.genesys2.rest.common.model.impl.Organization;
import org.genesys2.server.common.model.genesys.Accession;
import org.genesys2.server.common.model.genesys.AllAccnames;
import org.genesys2.server.common.model.genesys.AllAcqBreeding;
import org.genesys2.server.common.model.genesys.AllAcqCollect;
import org.genesys2.server.common.model.genesys.AllAcqExchange;
import org.genesys2.server.common.model.genesys.AllEnvironment;
import org.genesys2.server.common.model.genesys.ExperimentTrait;
import org.genesys2.server.common.model.genesys.Metadata;
import org.genesys2.server.common.model.genesys.Method;
import org.genesys2.server.common.model.genesys.Taxonomy;
import org.genesys2.server.common.model.impl.Country;
import org.genesys2.server.common.model.impl.Crop;
import org.genesys2.server.common.model.impl.FaoInstitute;
import org.genesys2.server.common.model.impl.Organization;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
......
......@@ -14,12 +14,12 @@
* limitations under the License.
**/
package org.genesys2.rest.common.service;
package org.genesys2.server.common.service;
import java.io.IOException;
import java.util.List;
import org.genesys2.rest.common.model.impl.Country;
import org.genesys2.server.common.model.impl.Country;
public interface GeoService {
......
......@@ -14,13 +14,13 @@
* limitations under the License.
**/
package org.genesys2.rest.common.service;
package org.genesys2.server.common.service;
import java.util.Collection;
import java.util.List;
import org.genesys2.rest.common.model.impl.Country;
import org.genesys2.rest.common.model.impl.FaoInstitute;
import org.genesys2.server.common.model.impl.Country;
import org.genesys2.server.common.model.impl.FaoInstitute;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
......
package org.genesys2.rest.common.service;
package org.genesys2.server.common.service;
public interface LuceneIndexer {
......
package org.genesys2.rest.common.service;
package org.genesys2.server.common.service;
import org.genesys2.rest.common.model.impl.Organization;
import org.genesys2.server.common.model.impl.Organization;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
......
package org.genesys2.rest.common.service;
package org.genesys2.server.common.service;
import org.hibernate.search.SearchException;
import org.springframework.data.domain.Page;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment