From 12df9e93455a863b6ab7150a20cd231493536e75 Mon Sep 17 00:00:00 2001 From: Ioannis Kalyvas Date: Wed, 21 Mar 2018 12:16:32 +0200 Subject: [PATCH] no message --- .gitignore | 1 + dmp-backend/pom.xml | 10 ++++++-- dmp-backend/queryable/pom.xml | 16 ++++++++++++ .../eu/eudat/queryable/QueryableList.java | 8 ++---- .../exceptions/NotSingleResultException.java | 0 .../QueryableHibernateList.java | 8 ++---- .../NestedQuerySinglePredicate.java | 0 .../predicates/OrderByPredicate.java | 0 .../predicates/QueryablePredicate.java | 0 .../queryable/predicates/SelectPredicate.java | 0 .../queryable/predicates/SinglePredicate.java | 0 .../queryableentity}/DataEntity.java | 2 +- .../queryable/types/FieldSelectionType.java | 0 .../eudat/queryable/types/SelectionField.java | 0 .../eu/eudat/queryable/QueryableList.class | Bin 0 -> 4557 bytes .../exceptions/NotSingleResultException.class | Bin 0 -> 799 bytes .../QueryableHibernateList.class | Bin 0 -> 24953 bytes .../NestedQuerySinglePredicate.class | Bin 0 -> 575 bytes .../predicates/OrderByPredicate.class | Bin 0 -> 476 bytes .../predicates/QueryablePredicate.class | Bin 0 -> 210 bytes .../predicates/SelectPredicate.class | Bin 0 -> 309 bytes .../predicates/SinglePredicate.class | Bin 0 -> 482 bytes .../queryableentity/DataEntity.class | Bin 0 -> 334 bytes .../queryable/types/FieldSelectionType.class | Bin 0 -> 1184 bytes .../queryable/types/SelectionField.class | Bin 0 -> 1185 bytes dmp-backend/web/pom.xml | 24 ++++++++++++++++++ .../main/java/eu/eudat/EuDatApplication.java | 3 --- .../main/java/eu/eudat/builders/Builder.java | 2 -- .../eu/eudat/builders/BuilderFactory.java | 0 .../eu/eudat/builders/BuilderFactoryImpl.java | 1 - .../eudat/builders/entity/ContentBuilder.java | 0 .../builders/entity/CredentialBuilder.java | 0 .../entity/DatasetProfileBuilder.java | 0 .../builders/entity/UserInfoBuilder.java | 0 .../builders/entity/UserRoleBuilder.java | 0 .../builders/entity/UserTokenBuilder.java | 0 .../builders/helpers/BuilderApplier.java | 0 .../DataRepositoryCriteriaBuilder.java | 0 .../ExternalDatasetCriteriaBuilder.java | 0 .../criteria/RegistryCriteriaBuilder.java | 0 .../criteria/ServiceCriteriaBuilder.java | 0 .../model/models/DataTableDataBuilder.java | 1 - .../model/models/PrincipalBuilder.java | 1 - .../builders/model/models/ProjectBuilder.java | 1 - .../models/RecentActivityDataBuilder.java | 1 - .../model/models/ResearcherBuilder.java | 1 - .../java/eu/eudat/cache/ResponsesCache.java | 0 .../DevelDatabaseConfiguration.java | 0 .../ProductionDatabaseConfiguration.java | 0 .../configurations/WebMVCConfiguration.java | 2 -- .../main/java/eu/eudat/controllers/Admin.java | 0 .../eu/eudat/controllers/BaseController.java | 0 .../main/java/eu/eudat/controllers/DMPs.java | 0 .../controllers/DashBoardController.java | 0 .../eudat/controllers/DataRepositories.java | 0 .../controllers/DatasetProfileController.java | 0 .../eu/eudat/controllers/DatasetProfiles.java | 0 .../controllers/DatasetWizardController.java | 0 .../java/eu/eudat/controllers/Datasets.java | 0 .../eudat/controllers/ExternalDatasets.java | 0 .../eu/eudat/controllers/FileController.java | 0 .../main/java/eu/eudat/controllers/Login.java | 0 .../eu/eudat/controllers/Organisations.java | 0 .../java/eu/eudat/controllers/Projects.java | 0 .../java/eu/eudat/controllers/Registries.java | 0 .../eu/eudat/controllers/Researchers.java | 3 --- .../java/eu/eudat/controllers/Services.java | 0 .../controllers/UserInvitationController.java | 0 .../main/java/eu/eudat/controllers/Users.java | 0 .../ControllerErrorHandler.java | 0 .../interceptors/RequestInterceptor.java | 0 .../java/eu/eudat/dao/DatabaseAccess.java | 2 +- .../eu/eudat/dao/DatabaseAccessLayer.java | 3 +-- .../context/DatabaseContext.java | 2 +- .../service/DatabaseService.java | 2 +- .../eu/eudat/dao/entities/ContentDao.java | 0 .../eu/eudat/dao/entities/ContentDaoImpl.java | 0 .../java/eu/eudat/dao/entities/DMPDao.java | 0 .../eu/eudat/dao/entities/DMPDaoImpl.java | 0 .../eudat/dao/entities/DataRepositoryDao.java | 0 .../dao/entities/DataRepositoryDaoImpl.java | 0 .../eu/eudat/dao/entities/DatasetDao.java | 1 - .../eu/eudat/dao/entities/DatasetDaoImpl.java | 0 .../eudat/dao/entities/DatasetProfileDao.java | 0 .../dao/entities/DatasetProfileDaoImpl.java | 0 .../dao/entities/ExternalDatasetDao.java | 0 .../dao/entities/ExternalDatasetDaoImpl.java | 0 .../eu/eudat/dao/entities/InvitationDao.java | 0 .../eudat/dao/entities/InvitationDaoImpl.java | 0 .../eudat/dao/entities/OrganisationDao.java | 0 .../dao/entities/OrganisationDaoImpl.java | 0 .../eu/eudat/dao/entities/ProjectDao.java | 0 .../eu/eudat/dao/entities/ProjectDaoImpl.java | 0 .../eu/eudat/dao/entities/RegistryDao.java | 0 .../eudat/dao/entities/RegistryDaoImpl.java | 0 .../eu/eudat/dao/entities/ResearcherDao.java | 0 .../eudat/dao/entities/ResearcherDaoImpl.java | 0 .../eu/eudat/dao/entities/ServiceDao.java | 0 .../eu/eudat/dao/entities/ServiceDaoImpl.java | 0 .../eu/eudat/dao/entities/UserDmpDao.java | 0 .../eu/eudat/dao/entities/UserDmpDaoImpl.java | 0 .../eu/eudat/dao/entities/UserInfoDao.java | 0 .../eudat/dao/entities/UserInfoDaoImpl.java | 0 .../eu/eudat/dao/entities/UserRoleDao.java | 0 .../eudat/dao/entities/UserRoleDaoImpl.java | 0 .../dao/entities/security/CredentialDao.java | 0 .../entities/security/CredentialDaoImpl.java | 0 .../dao/entities/security/UserTokenDao.java | 0 .../entities/security/UserTokenDaoImpl.java | 0 .../eudat/documents/helpers/FileEnvelope.java | 0 .../eudat/documents/types/ParagraphStyle.java | 0 .../eu/eudat/documents/types/TextStyle.java | 0 .../eu/eudat/documents/word/WordBuilder.java | 0 .../eudat/documents/xml/ExportXmlBuilder.java | 1 - .../main/java/eu/eudat/entities/Content.java | 1 + .../java/eu/eudat/entities/Credential.java | 2 ++ .../src/main/java/eu/eudat/entities/DMP.java | 1 + .../eu/eudat/entities/DMPOrganisation.java | 0 .../java/eu/eudat/entities/DMPProfile.java | 0 .../java/eu/eudat/entities/DMPResearcher.java | 0 .../eu/eudat/entities/DataRepository.java | 1 + .../main/java/eu/eudat/entities/Dataset.java | 3 ++- .../entities/DatasetExternalDataset.java | 0 .../eu/eudat/entities/DatasetProfile.java | 2 +- .../eudat/entities/DatasetProfileRuleset.java | 0 .../entities/DatasetProfileViewstyle.java | 0 .../eu/eudat/entities/DatasetRegistry.java | 0 .../eu/eudat/entities/DatasetService.java | 0 .../eu/eudat/entities/ExternalDataset.java | 1 + .../java/eu/eudat/entities/Invitation.java | 1 + .../java/eu/eudat/entities/Organisation.java | 1 + .../main/java/eu/eudat/entities/Project.java | 2 +- .../main/java/eu/eudat/entities/Registry.java | 1 + .../java/eu/eudat/entities/Researcher.java | 1 + .../main/java/eu/eudat/entities/Service.java | 1 + .../main/java/eu/eudat/entities/UserDMP.java | 1 + .../main/java/eu/eudat/entities/UserInfo.java | 1 + .../main/java/eu/eudat/entities/UserRole.java | 1 + .../java/eu/eudat/entities/UserToken.java | 2 ++ .../DatabaseViewStyleDefinition.java | 0 .../datasetprofiledefinition/Field.java | 0 .../datasetprofiledefinition/FieldSet.java | 0 .../datasetprofiledefinition/Page.java | 0 .../datasetprofiledefinition/Section.java | 0 .../ViewStyleModel.java | 0 .../DatabaseModelDefinition.java | 0 .../DMPWithDatasetsException.java | 0 .../files/TempFileNotFoundException.java | 0 .../security/NonValidTokenException.java | 0 .../security/UnauthorisedException.java | 0 .../handlers/PrincipalArgumentResolver.java | 1 - .../java/eu/eudat/managers/AdminManager.java | 0 .../eu/eudat/managers/DashBoardManager.java | 0 .../managers/DataManagementPlanManager.java | 0 .../eu/eudat/managers/DatasetManager.java | 0 .../eudat/managers/DatasetProfileManager.java | 0 .../eudat/managers/DatasetWizardManager.java | 1 - .../managers/ExternalDatasetManager.java | 1 - .../java/eu/eudat/managers/FileManager.java | 0 .../eu/eudat/managers/InvitationsManager.java | 0 .../eu/eudat/managers/PaginationManager.java | 2 +- .../eu/eudat/managers/ProjectManager.java | 0 .../eu/eudat/managers/ResearcherManager.java | 1 - .../java/eu/eudat/managers/UserManager.java | 0 .../main/java/eu/eudat/models/DataModel.java | 3 ++- .../eu/eudat/models/HintedModelFactory.java | 0 .../components/datasetprofile/Field.java | 0 .../components/datasetprofile/FieldSet.java | 0 .../admin/components/datasetprofile/Page.java | 0 .../components/datasetprofile/Section.java | 0 .../admin/composite/DatasetProfile.java | 0 .../components/commons/DefaultValue.java | 0 .../components/commons/Multiplicity.java | 0 .../eudat/models/components/commons/Rule.java | 0 .../models/components/commons/ViewStyle.java | 0 .../models/components/commons/Visibility.java | 0 .../commons/datafield/AutoCompleteData.java | 0 .../datafield/BooleanDecisionData.java | 0 .../commons/datafield/CheckBoxData.java | 0 .../commons/datafield/ComboBoxData.java | 0 .../commons/datafield/FieldData.java | 0 .../commons/datafield/FreeTextData.java | 0 .../commons/datafield/RadioBoxData.java | 0 .../commons/datafield/TextAreaData.java | 0 .../commons/datafield/WordListData.java | 0 .../eu/eudat/models/criteria/Criteria.java | 3 ++- .../criteria/DataManagementPlanCriteria.java | 0 .../criteria/DataRepositoryCriteria.java | 0 .../models/criteria/DatasetCriteria.java | 0 .../criteria/DatasetProfileCriteria.java | 0 .../DatasetProfileWizardCriteria.java | 0 .../DatasetWizardUserDmpCriteria.java | 0 .../criteria/ExternalDatasetCriteria.java | 0 .../models/criteria/InvitationCriteria.java | 0 .../models/criteria/OrganisationCriteria.java | 0 .../models/criteria/ProjectCriteria.java | 0 .../models/criteria/RegistryCriteria.java | 0 .../models/criteria/ResearcherCriteria.java | 0 .../models/criteria/ServiceCriteria.java | 0 .../models/criteria/UserInfoCriteria.java | 0 .../models/criteria/UserRoleCriteria.java | 0 .../dashboard/recent/RecentActivity.java | 0 .../dashboard/recent/RecentActivityData.java | 0 .../statistics/DashBoardStatistics.java | 0 .../eudat/models/dataset/DataRepository.java | 0 .../java/eu/eudat/models/dataset/Dataset.java | 0 .../models/dataset/DatasetTableRequest.java | 0 .../eu/eudat/models/dataset/Registry.java | 0 .../java/eu/eudat/models/dataset/Service.java | 0 .../DatasetProfileAutocompleteItem.java | 0 .../DatasetProfileAutocompleteRequest.java | 0 .../DatasetProfileListingModel.java | 0 .../DatasetProfileTableRequestItem.java | 0 .../DataManagentPlanListingModel.java | 0 ...tasetProfileWizardAutocompleteRequest.java | 0 .../DatasetWizardAutocompleteRequest.java | 0 .../datasetwizard/DatasetWizardModel.java | 0 .../eudat/models/dmp/AssociatedProfile.java | 0 .../eudat/models/dmp/DataManagementPlan.java | 0 .../DataManagementPlanCriteriaRequest.java | 0 .../DataManagementPlanNewVersionModel.java | 0 .../dmp/DataManagementPlanTableRequest.java | 0 .../eu/eudat/models/dmp/Organisation.java | 0 .../java/eu/eudat/models/dmp/Researcher.java | 0 .../errormodels/ValidationErrorContext.java | 0 .../models/external/ExternalDatasetModel.java | 0 .../eudat/models/external/ExternalItem.java | 0 .../models/external/ExternalListingItem.java | 0 .../external/ExternalSourcesItemModel.java | 0 .../OrganisationsExternalSourcesModel.java | 0 .../ProjectsExternalSourcesModel.java | 0 .../RegistriesExternalSourcesModel.java | 0 .../ResearchersExternalSourcesModel.java | 0 .../external/ServiceExternalSourcesModel.java | 0 .../ExternalDatasetListingModel.java | 0 .../ExternalDatasetTableRequest.java | 0 .../eu/eudat/models/files/ContentFile.java | 0 .../common/AutoCompleteLookupItem.java | 0 .../helpers/common/ColumnOrderings.java | 0 .../models/helpers/common/DataTableData.java | 0 .../eudat/models/helpers/common/Ordering.java | 0 .../helpers/common/SelectionFields.java | 0 .../models/helpers/requests/RequestItem.java | 0 .../models/helpers/requests/TableRequest.java | 0 .../helpers/responses/ResponseItem.java | 0 .../eudat/models/invitation/Invitation.java | 0 .../DataManagementPlanListingModel.java | 0 .../listingmodels/DatasetListingModel.java | 0 .../eu/eudat/models/login/Credentials.java | 0 .../java/eu/eudat/models/login/LoginInfo.java | 0 .../loginprovider/LoginProviderUser.java | 0 .../java/eu/eudat/models/mail/SimpleMail.java | 0 .../java/eu/eudat/models/project/Project.java | 0 .../models/project/ProjectCriteriaModel.java | 0 .../project/ProjectCriteriaRequest.java | 0 .../models/project/ProjectListingModel.java | 0 .../models/project/ProjectTableRequest.java | 0 .../models/properties/DatasetProfilePage.java | 0 .../eu/eudat/models/properties/Field.java | 0 .../eu/eudat/models/properties/FieldSet.java | 0 .../eu/eudat/models/properties/Group.java | 0 .../properties/PropertiesGenerator.java | 0 .../models/properties/PropertiesModel.java | 0 .../eu/eudat/models/properties/Section.java | 0 .../eudat/models/researcher/Researcher.java | 0 .../researcher/ResearcherCriteriaRequest.java | 0 .../eu/eudat/models/security/Principal.java | 0 .../urls/DataManagementPlanUrlListing.java | 0 .../java/eu/eudat/models/urls/UrlListing.java | 3 +-- .../models/user/components/commons/Rule.java | 0 .../user/components/datasetprofile/Field.java | 0 .../components/datasetprofile/FieldSet.java | 0 .../components/datasetprofile/Section.java | 0 .../models/user/composite/DatasetProfile.java | 0 .../user/composite/DatasetProfilePage.java | 0 .../user/composite/PagedDatasetProfile.java | 0 .../composite/PropertiesModelBuilder.java | 0 .../eu/eudat/models/userinfo/UserInfo.java | 0 .../userinfo/UserInfoInvitationModel.java | 0 .../models/userinfo/UserInfoRequestItem.java | 0 .../userinfo/UserInfoTableRequestItem.java | 0 .../models/userinfo/UserListingModel.java | 0 .../src/main/java/eu/eudat/proxy/Proxy.java | 0 .../eu/eudat/proxy/config/ExternalUrls.java | 0 .../eu/eudat/proxy/config/FetchStrategy.java | 0 .../java/eu/eudat/proxy/config/UrlConfig.java | 0 .../config/configloaders/ConfigLoader.java | 0 .../configloaders/DevelConfigLoader.java | 0 .../configloaders/ProductionConfigLoader.java | 0 .../proxy/config/entities/DatasetUrls.java | 0 .../config/entities/OrganisationUrls.java | 0 .../proxy/config/entities/ProjectUrls.java | 0 .../proxy/config/entities/RegistryUrls.java | 0 .../proxy/config/entities/RepositoryUrls.java | 0 .../proxy/config/entities/ResearcherUrls.java | 0 .../proxy/config/entities/ServiceUrls.java | 0 .../config/exceptions/HugeResultSet.java | 0 .../proxy/config/exceptions/NoURLFound.java | 0 .../eudat/proxy/fetching/RemoteFetcher.java | 0 .../CustomAuthenticationProvider.java | 0 .../security/claims/ClaimedAuthorities.java | 0 .../eudat/security/claims/ClaimedRights.java | 0 .../B2AccessCustomProvider.java | 0 .../B2AccessCustomProviderImpl.java | 0 .../customproviders/B2AccessUser.java | 0 .../security/validators/TokenValidator.java | 0 .../validators/TokenValidatorFactory.java | 0 .../validators/TokenValidatorFactoryImpl.java | 0 .../b2access/B2AccessTokenValidator.java | 0 .../b2access/helpers/B2AccessRequest.java | 0 .../helpers/B2AccessResponseToken.java | 0 .../facebook/FacebookTokenValidator.java | 0 .../google/GoogleTokenValidator.java | 0 .../linkedin/LinkedInTokenValidator.java | 0 .../twitter/TwitterTokenValidator.java | 0 .../java/eu/eudat/services/ApiContext.java | 0 .../eu/eudat/services/ApiContextImpl.java | 0 .../services/forms/VisibilityContext.java | 0 .../eudat/services/forms/VisibilityRule.java | 0 .../services/forms/VisibilityRuleService.java | 0 .../forms/VisibilityRuleServiceImpl.java | 1 - .../services/forms/VisibilityRuleSource.java | 0 .../services/helpers/FileStorageService.java | 0 .../helpers/FileStorageServiceImpl.java | 0 .../services/helpers/HelpersService.java | 0 .../services/helpers/HelpersServiceImpl.java | 0 .../eudat/services/helpers/LoggerService.java | 0 .../services/helpers/LoggerServiceImpl.java | 0 .../operations/AuthenticationService.java | 2 -- .../operations/AuthenticationServiceImpl.java | 0 .../operations/DatabaseRepository.java | 0 .../operations/DatabaseRepositoryImpl.java | 0 .../operations/OperationsContext.java | 0 .../operations/OperationsContextImpl.java | 0 .../services/utilities/InvitationService.java | 0 .../utilities/InvitationServiceImpl.java | 0 .../eudat/services/utilities/MailService.java | 0 .../services/utilities/MailServiceImpl.java | 0 .../services/utilities/UtilitiesService.java | 0 .../utilities/UtilitiesServiceImpl.java | 0 .../eu/eudat/typedefinition/DataType.java | 0 .../typedefinition/DatabaseColumnType.java | 0 .../PostgreSQLDatabaseColumnType.java | 0 .../eu/eudat/typedefinition/UUIDType.java | 0 .../java/eu/eudat/typedefinition/XMLType.java | 0 .../java/eu/eudat/types/ApiMessageCode.java | 0 .../java/eu/eudat/types/ApiResponseType.java | 0 .../main/java/eu/eudat/types/Authorities.java | 0 .../src/main/java/eu/eudat/types/Rights.java | 0 .../java/eu/eudat/types/WarningLevel.java | 0 .../utilities/builders/ModelBuilder.java | 0 .../eudat/utilities/builders/XmlBuilder.java | 0 .../eudat/utilities/helpers/LabelBuilder.java | 0 .../utilities/helpers/LabelGenerator.java | 0 .../helpers/ModelBuilderCollector.java | 0 .../utilities/helpers/ModelSerializer.java | 0 .../eudat/utilities/interfaces/Applier.java | 0 .../interfaces/ApplierWithValue.java | 0 .../eudat/utilities/interfaces/Cloneable.java | 0 .../interfaces/DatabaseDefinition.java | 0 .../utilities/interfaces/ModelDefinition.java | 0 .../utilities/interfaces/ModelSerializer.java | 0 .../interfaces/ViewStyleDefinition.java | 0 .../utilities/interfaces/XmlSerializable.java | 0 ...DataManagementPlanNewVersionValidator.java | 0 ...taManagementPlanTableRequestValidator.java | 0 .../validators/DatasetProfileValidator.java | 0 .../validators/ProjectModelValidator.java | 0 .../ProjectTableRequestValidator.java | 0 .../src/main/resources/ExternalUrls.xml | 0 .../main/resources/META-INF/persistence.xml | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/documents/h2020.docx | Bin .../src/main/resources/images/default.png | Bin .../src/main/resources/messages.properties | 0 .../src/main/resources/messages_el.properties | 0 .../src/test/resources/ExternalUrlsTEST.xml | 0 .../test/resources/applicationContextTEST.xml | 0 .../src/test/resources/dmpTEST.properties | 0 379 files changed, 84 insertions(+), 53 deletions(-) create mode 100644 dmp-backend/queryable/pom.xml rename dmp-backend/{ => queryable}/src/main/java/eu/eudat/queryable/QueryableList.java (87%) rename dmp-backend/{ => queryable}/src/main/java/eu/eudat/queryable/exceptions/NotSingleResultException.java (100%) rename dmp-backend/{ => queryable}/src/main/java/eu/eudat/queryable/hibernatequeryablelist/QueryableHibernateList.java (98%) rename dmp-backend/{ => queryable}/src/main/java/eu/eudat/queryable/predicates/NestedQuerySinglePredicate.java (100%) rename dmp-backend/{ => queryable}/src/main/java/eu/eudat/queryable/predicates/OrderByPredicate.java (100%) rename dmp-backend/{ => queryable}/src/main/java/eu/eudat/queryable/predicates/QueryablePredicate.java (100%) rename dmp-backend/{ => queryable}/src/main/java/eu/eudat/queryable/predicates/SelectPredicate.java (100%) rename dmp-backend/{ => queryable}/src/main/java/eu/eudat/queryable/predicates/SinglePredicate.java (100%) rename dmp-backend/{src/main/java/eu/eudat/entities => queryable/src/main/java/eu/eudat/queryable/queryableentity}/DataEntity.java (65%) rename dmp-backend/{ => queryable}/src/main/java/eu/eudat/queryable/types/FieldSelectionType.java (100%) rename dmp-backend/{ => queryable}/src/main/java/eu/eudat/queryable/types/SelectionField.java (100%) create mode 100644 dmp-backend/queryable/target/classes/eu/eudat/queryable/QueryableList.class create mode 100644 dmp-backend/queryable/target/classes/eu/eudat/queryable/exceptions/NotSingleResultException.class create mode 100644 dmp-backend/queryable/target/classes/eu/eudat/queryable/hibernatequeryablelist/QueryableHibernateList.class create mode 100644 dmp-backend/queryable/target/classes/eu/eudat/queryable/predicates/NestedQuerySinglePredicate.class create mode 100644 dmp-backend/queryable/target/classes/eu/eudat/queryable/predicates/OrderByPredicate.class create mode 100644 dmp-backend/queryable/target/classes/eu/eudat/queryable/predicates/QueryablePredicate.class create mode 100644 dmp-backend/queryable/target/classes/eu/eudat/queryable/predicates/SelectPredicate.class create mode 100644 dmp-backend/queryable/target/classes/eu/eudat/queryable/predicates/SinglePredicate.class create mode 100644 dmp-backend/queryable/target/classes/eu/eudat/queryable/queryableentity/DataEntity.class create mode 100644 dmp-backend/queryable/target/classes/eu/eudat/queryable/types/FieldSelectionType.class create mode 100644 dmp-backend/queryable/target/classes/eu/eudat/queryable/types/SelectionField.class create mode 100644 dmp-backend/web/pom.xml rename dmp-backend/{ => web}/src/main/java/eu/eudat/EuDatApplication.java (81%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/builders/Builder.java (73%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/builders/BuilderFactory.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/builders/BuilderFactoryImpl.java (96%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/builders/entity/ContentBuilder.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/builders/entity/CredentialBuilder.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/builders/entity/DatasetProfileBuilder.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/builders/entity/UserInfoBuilder.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/builders/entity/UserRoleBuilder.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/builders/entity/UserTokenBuilder.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/builders/helpers/BuilderApplier.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/builders/model/criteria/DataRepositoryCriteriaBuilder.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/builders/model/criteria/ExternalDatasetCriteriaBuilder.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/builders/model/criteria/RegistryCriteriaBuilder.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/builders/model/criteria/ServiceCriteriaBuilder.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/builders/model/models/DataTableDataBuilder.java (94%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/builders/model/models/PrincipalBuilder.java (96%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/builders/model/models/ProjectBuilder.java (98%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/builders/model/models/RecentActivityDataBuilder.java (96%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/builders/model/models/ResearcherBuilder.java (96%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/cache/ResponsesCache.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/configurations/DevelDatabaseConfiguration.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/configurations/ProductionDatabaseConfiguration.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/configurations/WebMVCConfiguration.java (93%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/controllers/Admin.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/controllers/BaseController.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/controllers/DMPs.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/controllers/DashBoardController.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/controllers/DataRepositories.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/controllers/DatasetProfileController.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/controllers/DatasetProfiles.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/controllers/DatasetWizardController.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/controllers/Datasets.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/controllers/ExternalDatasets.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/controllers/FileController.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/controllers/Login.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/controllers/Organisations.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/controllers/Projects.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/controllers/Registries.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/controllers/Researchers.java (96%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/controllers/Services.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/controllers/UserInvitationController.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/controllers/Users.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/controllers/controllerhandler/ControllerErrorHandler.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/controllers/interceptors/RequestInterceptor.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/dao/DatabaseAccess.java (88%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/dao/DatabaseAccessLayer.java (84%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/dao/databaselayer/context/DatabaseContext.java (96%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/dao/databaselayer/service/DatabaseService.java (94%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/dao/entities/ContentDao.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/dao/entities/ContentDaoImpl.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/dao/entities/DMPDao.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/dao/entities/DMPDaoImpl.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/dao/entities/DataRepositoryDao.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/dao/entities/DataRepositoryDaoImpl.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/dao/entities/DatasetDao.java (91%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/dao/entities/DatasetDaoImpl.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/dao/entities/DatasetProfileDao.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/dao/entities/DatasetProfileDaoImpl.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/dao/entities/ExternalDatasetDao.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/dao/entities/ExternalDatasetDaoImpl.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/dao/entities/InvitationDao.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/dao/entities/InvitationDaoImpl.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/dao/entities/OrganisationDao.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/dao/entities/OrganisationDaoImpl.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/dao/entities/ProjectDao.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/dao/entities/ProjectDaoImpl.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/dao/entities/RegistryDao.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/dao/entities/RegistryDaoImpl.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/dao/entities/ResearcherDao.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/dao/entities/ResearcherDaoImpl.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/dao/entities/ServiceDao.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/dao/entities/ServiceDaoImpl.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/dao/entities/UserDmpDao.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/dao/entities/UserDmpDaoImpl.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/dao/entities/UserInfoDao.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/dao/entities/UserInfoDaoImpl.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/dao/entities/UserRoleDao.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/dao/entities/UserRoleDaoImpl.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/dao/entities/security/CredentialDao.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/dao/entities/security/CredentialDaoImpl.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/dao/entities/security/UserTokenDao.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/dao/entities/security/UserTokenDaoImpl.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/documents/helpers/FileEnvelope.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/documents/types/ParagraphStyle.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/documents/types/TextStyle.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/documents/word/WordBuilder.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/documents/xml/ExportXmlBuilder.java (99%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/entities/Content.java (98%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/entities/Credential.java (98%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/entities/DMP.java (99%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/entities/DMPOrganisation.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/entities/DMPProfile.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/entities/DMPResearcher.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/entities/DataRepository.java (98%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/entities/Dataset.java (98%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/entities/DatasetExternalDataset.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/entities/DatasetProfile.java (98%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/entities/DatasetProfileRuleset.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/entities/DatasetProfileViewstyle.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/entities/DatasetRegistry.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/entities/DatasetService.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/entities/ExternalDataset.java (97%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/entities/Invitation.java (97%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/entities/Organisation.java (98%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/entities/Project.java (99%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/entities/Registry.java (98%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/entities/Researcher.java (98%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/entities/Service.java (98%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/entities/UserDMP.java (97%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/entities/UserInfo.java (98%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/entities/UserRole.java (95%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/entities/UserToken.java (96%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/DatabaseViewStyleDefinition.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Field.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/FieldSet.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Page.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Section.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/ViewStyleModel.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/entities/xmlmodels/modeldefinition/DatabaseModelDefinition.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/exceptions/datamanagementplan/DMPWithDatasetsException.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/exceptions/files/TempFileNotFoundException.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/exceptions/security/NonValidTokenException.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/exceptions/security/UnauthorisedException.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/handlers/PrincipalArgumentResolver.java (97%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/managers/AdminManager.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/managers/DashBoardManager.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/managers/DataManagementPlanManager.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/managers/DatasetManager.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/managers/DatasetProfileManager.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/managers/DatasetWizardManager.java (98%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/managers/ExternalDatasetManager.java (98%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/managers/FileManager.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/managers/InvitationsManager.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/managers/PaginationManager.java (98%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/managers/ProjectManager.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/managers/ResearcherManager.java (97%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/managers/UserManager.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/DataModel.java (77%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/HintedModelFactory.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/admin/components/datasetprofile/Field.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/admin/components/datasetprofile/FieldSet.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/admin/components/datasetprofile/Page.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/admin/components/datasetprofile/Section.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/admin/composite/DatasetProfile.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/components/commons/DefaultValue.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/components/commons/Multiplicity.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/components/commons/Rule.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/components/commons/ViewStyle.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/components/commons/Visibility.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/components/commons/datafield/AutoCompleteData.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/components/commons/datafield/BooleanDecisionData.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/components/commons/datafield/CheckBoxData.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/components/commons/datafield/ComboBoxData.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/components/commons/datafield/FieldData.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/components/commons/datafield/FreeTextData.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/components/commons/datafield/RadioBoxData.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/components/commons/datafield/TextAreaData.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/components/commons/datafield/WordListData.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/criteria/Criteria.java (81%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/criteria/DataManagementPlanCriteria.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/criteria/DataRepositoryCriteria.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/criteria/DatasetCriteria.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/criteria/DatasetProfileCriteria.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/criteria/DatasetProfileWizardCriteria.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/criteria/DatasetWizardUserDmpCriteria.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/criteria/ExternalDatasetCriteria.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/criteria/InvitationCriteria.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/criteria/OrganisationCriteria.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/criteria/ProjectCriteria.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/criteria/RegistryCriteria.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/criteria/ResearcherCriteria.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/criteria/ServiceCriteria.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/criteria/UserInfoCriteria.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/criteria/UserRoleCriteria.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/dashboard/recent/RecentActivity.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/dashboard/recent/RecentActivityData.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/dashboard/statistics/DashBoardStatistics.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/dataset/DataRepository.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/dataset/Dataset.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/dataset/DatasetTableRequest.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/dataset/Registry.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/dataset/Service.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileAutocompleteItem.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileAutocompleteRequest.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileListingModel.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileTableRequestItem.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/datasetwizard/DataManagentPlanListingModel.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/datasetwizard/DatasetProfileWizardAutocompleteRequest.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/datasetwizard/DatasetWizardAutocompleteRequest.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/datasetwizard/DatasetWizardModel.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/dmp/AssociatedProfile.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/dmp/DataManagementPlan.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/dmp/DataManagementPlanCriteriaRequest.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/dmp/DataManagementPlanNewVersionModel.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/dmp/DataManagementPlanTableRequest.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/dmp/Organisation.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/dmp/Researcher.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/errormodels/ValidationErrorContext.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/external/ExternalDatasetModel.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/external/ExternalItem.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/external/ExternalListingItem.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/external/ExternalSourcesItemModel.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/external/OrganisationsExternalSourcesModel.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/external/ProjectsExternalSourcesModel.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/external/RegistriesExternalSourcesModel.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/external/ResearchersExternalSourcesModel.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/external/ServiceExternalSourcesModel.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/externaldataset/ExternalDatasetListingModel.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/externaldataset/ExternalDatasetTableRequest.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/files/ContentFile.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/helpers/common/AutoCompleteLookupItem.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/helpers/common/ColumnOrderings.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/helpers/common/DataTableData.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/helpers/common/Ordering.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/helpers/common/SelectionFields.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/helpers/requests/RequestItem.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/helpers/requests/TableRequest.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/helpers/responses/ResponseItem.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/invitation/Invitation.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/listingmodels/DataManagementPlanListingModel.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/listingmodels/DatasetListingModel.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/login/Credentials.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/login/LoginInfo.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/loginprovider/LoginProviderUser.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/mail/SimpleMail.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/project/Project.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/project/ProjectCriteriaModel.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/project/ProjectCriteriaRequest.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/project/ProjectListingModel.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/project/ProjectTableRequest.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/properties/DatasetProfilePage.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/properties/Field.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/properties/FieldSet.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/properties/Group.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/properties/PropertiesGenerator.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/properties/PropertiesModel.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/properties/Section.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/researcher/Researcher.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/researcher/ResearcherCriteriaRequest.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/security/Principal.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/urls/DataManagementPlanUrlListing.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/urls/UrlListing.java (90%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/user/components/commons/Rule.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/user/components/datasetprofile/Field.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/user/components/datasetprofile/FieldSet.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/user/components/datasetprofile/Section.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/user/composite/DatasetProfile.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/user/composite/DatasetProfilePage.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/user/composite/PagedDatasetProfile.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/user/composite/PropertiesModelBuilder.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/userinfo/UserInfo.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/userinfo/UserInfoInvitationModel.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/userinfo/UserInfoRequestItem.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/userinfo/UserInfoTableRequestItem.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/models/userinfo/UserListingModel.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/proxy/Proxy.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/proxy/config/ExternalUrls.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/proxy/config/FetchStrategy.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/proxy/config/UrlConfig.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/proxy/config/configloaders/ConfigLoader.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/proxy/config/configloaders/DevelConfigLoader.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/proxy/config/configloaders/ProductionConfigLoader.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/proxy/config/entities/DatasetUrls.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/proxy/config/entities/OrganisationUrls.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/proxy/config/entities/ProjectUrls.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/proxy/config/entities/RegistryUrls.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/proxy/config/entities/RepositoryUrls.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/proxy/config/entities/ResearcherUrls.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/proxy/config/entities/ServiceUrls.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/proxy/config/exceptions/HugeResultSet.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/proxy/config/exceptions/NoURLFound.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/proxy/fetching/RemoteFetcher.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/security/CustomAuthenticationProvider.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/security/claims/ClaimedAuthorities.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/security/claims/ClaimedRights.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/security/customproviders/B2AccessCustomProvider.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/security/customproviders/B2AccessCustomProviderImpl.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/security/customproviders/B2AccessUser.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/security/validators/TokenValidator.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/security/validators/TokenValidatorFactory.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/security/validators/TokenValidatorFactoryImpl.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/security/validators/b2access/B2AccessTokenValidator.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/security/validators/b2access/helpers/B2AccessRequest.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/security/validators/b2access/helpers/B2AccessResponseToken.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/security/validators/facebook/FacebookTokenValidator.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/security/validators/google/GoogleTokenValidator.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/security/validators/linkedin/LinkedInTokenValidator.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/security/validators/twitter/TwitterTokenValidator.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/services/ApiContext.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/services/ApiContextImpl.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/services/forms/VisibilityContext.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/services/forms/VisibilityRule.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/services/forms/VisibilityRuleService.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/services/forms/VisibilityRuleServiceImpl.java (96%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/services/forms/VisibilityRuleSource.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/services/helpers/FileStorageService.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/services/helpers/FileStorageServiceImpl.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/services/helpers/HelpersService.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/services/helpers/HelpersServiceImpl.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/services/helpers/LoggerService.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/services/helpers/LoggerServiceImpl.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/services/operations/AuthenticationService.java (86%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/services/operations/AuthenticationServiceImpl.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/services/operations/DatabaseRepository.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/services/operations/DatabaseRepositoryImpl.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/services/operations/OperationsContext.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/services/operations/OperationsContextImpl.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/services/utilities/InvitationService.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/services/utilities/InvitationServiceImpl.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/services/utilities/MailService.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/services/utilities/MailServiceImpl.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/services/utilities/UtilitiesService.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/services/utilities/UtilitiesServiceImpl.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/typedefinition/DataType.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/typedefinition/DatabaseColumnType.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/typedefinition/PostgreSQLDatabaseColumnType.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/typedefinition/UUIDType.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/typedefinition/XMLType.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/types/ApiMessageCode.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/types/ApiResponseType.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/types/Authorities.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/types/Rights.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/types/WarningLevel.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/utilities/builders/ModelBuilder.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/utilities/builders/XmlBuilder.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/utilities/helpers/LabelBuilder.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/utilities/helpers/LabelGenerator.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/utilities/helpers/ModelBuilderCollector.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/utilities/helpers/ModelSerializer.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/utilities/interfaces/Applier.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/utilities/interfaces/ApplierWithValue.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/utilities/interfaces/Cloneable.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/utilities/interfaces/DatabaseDefinition.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/utilities/interfaces/ModelDefinition.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/utilities/interfaces/ModelSerializer.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/utilities/interfaces/ViewStyleDefinition.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/utilities/interfaces/XmlSerializable.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/validators/DataManagementPlanNewVersionValidator.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/validators/DataManagementPlanTableRequestValidator.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/validators/DatasetProfileValidator.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/validators/ProjectModelValidator.java (100%) rename dmp-backend/{ => web}/src/main/java/eu/eudat/validators/ProjectTableRequestValidator.java (100%) rename dmp-backend/{ => web}/src/main/resources/ExternalUrls.xml (100%) rename dmp-backend/{ => web}/src/main/resources/META-INF/persistence.xml (100%) rename dmp-backend/{ => web}/src/main/resources/application.properties (100%) rename dmp-backend/{ => web}/src/main/resources/documents/h2020.docx (100%) rename dmp-backend/{ => web}/src/main/resources/images/default.png (100%) rename dmp-backend/{ => web}/src/main/resources/messages.properties (100%) rename dmp-backend/{ => web}/src/main/resources/messages_el.properties (100%) rename dmp-backend/{ => web}/src/test/resources/ExternalUrlsTEST.xml (100%) rename dmp-backend/{ => web}/src/test/resources/applicationContextTEST.xml (100%) rename dmp-backend/{ => web}/src/test/resources/dmpTEST.properties (100%) diff --git a/.gitignore b/.gitignore index 035749bb0..0d06a2439 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ dmp-backend/src/main/ui-resources/static/favicon.ico dmp-backend/src/main/ui-resources/static/assets/lang/en.json dmp-frontend/new 3.xml dmp-backend/src/main/ui-resources/static/ +dmp-backend/web/target/ diff --git a/dmp-backend/pom.xml b/dmp-backend/pom.xml index b12b9f203..cf86f0205 100644 --- a/dmp-backend/pom.xml +++ b/dmp-backend/pom.xml @@ -2,15 +2,21 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - dmp-backend + eu.eudat dmp-backend - 0.0.1-SNAPSHOT + 1.0.0-SNAPSHOT ${packaging.type} org.springframework.boot spring-boot-starter-parent 1.5.9.RELEASE + + + queryable + web + + 1.19.0 1.19.0 diff --git a/dmp-backend/queryable/pom.xml b/dmp-backend/queryable/pom.xml new file mode 100644 index 000000000..8e42110e0 --- /dev/null +++ b/dmp-backend/queryable/pom.xml @@ -0,0 +1,16 @@ + + + 4.0.0 + + dmp-backend + queryable + 1.0-SNAPSHOT + + + eu.eudat + dmp-backend + 1.0.0-SNAPSHOT + + \ No newline at end of file diff --git a/dmp-backend/src/main/java/eu/eudat/queryable/QueryableList.java b/dmp-backend/queryable/src/main/java/eu/eudat/queryable/QueryableList.java similarity index 87% rename from dmp-backend/src/main/java/eu/eudat/queryable/QueryableList.java rename to dmp-backend/queryable/src/main/java/eu/eudat/queryable/QueryableList.java index d73ef4744..164ac1b2d 100644 --- a/dmp-backend/src/main/java/eu/eudat/queryable/QueryableList.java +++ b/dmp-backend/queryable/src/main/java/eu/eudat/queryable/QueryableList.java @@ -1,11 +1,7 @@ package eu.eudat.queryable; - -import eu.eudat.entities.DataEntity; -import eu.eudat.queryable.predicates.NestedQuerySinglePredicate; -import eu.eudat.queryable.predicates.OrderByPredicate; -import eu.eudat.queryable.predicates.SelectPredicate; -import eu.eudat.queryable.predicates.SinglePredicate; +import eu.eudat.queryable.predicates.*; +import eu.eudat.queryable.queryableentity.DataEntity; import eu.eudat.queryable.types.SelectionField; import javax.persistence.criteria.Subquery; diff --git a/dmp-backend/src/main/java/eu/eudat/queryable/exceptions/NotSingleResultException.java b/dmp-backend/queryable/src/main/java/eu/eudat/queryable/exceptions/NotSingleResultException.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/queryable/exceptions/NotSingleResultException.java rename to dmp-backend/queryable/src/main/java/eu/eudat/queryable/exceptions/NotSingleResultException.java diff --git a/dmp-backend/src/main/java/eu/eudat/queryable/hibernatequeryablelist/QueryableHibernateList.java b/dmp-backend/queryable/src/main/java/eu/eudat/queryable/hibernatequeryablelist/QueryableHibernateList.java similarity index 98% rename from dmp-backend/src/main/java/eu/eudat/queryable/hibernatequeryablelist/QueryableHibernateList.java rename to dmp-backend/queryable/src/main/java/eu/eudat/queryable/hibernatequeryablelist/QueryableHibernateList.java index 778710728..c4ccb71e9 100644 --- a/dmp-backend/src/main/java/eu/eudat/queryable/hibernatequeryablelist/QueryableHibernateList.java +++ b/dmp-backend/queryable/src/main/java/eu/eudat/queryable/hibernatequeryablelist/QueryableHibernateList.java @@ -1,13 +1,9 @@ package eu.eudat.queryable.hibernatequeryablelist; - -import eu.eudat.entities.DataEntity; import eu.eudat.queryable.QueryableList; import eu.eudat.queryable.exceptions.NotSingleResultException; -import eu.eudat.queryable.predicates.NestedQuerySinglePredicate; -import eu.eudat.queryable.predicates.OrderByPredicate; -import eu.eudat.queryable.predicates.SelectPredicate; -import eu.eudat.queryable.predicates.SinglePredicate; +import eu.eudat.queryable.predicates.*; +import eu.eudat.queryable.queryableentity.DataEntity; import eu.eudat.queryable.types.FieldSelectionType; import eu.eudat.queryable.types.SelectionField; diff --git a/dmp-backend/src/main/java/eu/eudat/queryable/predicates/NestedQuerySinglePredicate.java b/dmp-backend/queryable/src/main/java/eu/eudat/queryable/predicates/NestedQuerySinglePredicate.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/queryable/predicates/NestedQuerySinglePredicate.java rename to dmp-backend/queryable/src/main/java/eu/eudat/queryable/predicates/NestedQuerySinglePredicate.java diff --git a/dmp-backend/src/main/java/eu/eudat/queryable/predicates/OrderByPredicate.java b/dmp-backend/queryable/src/main/java/eu/eudat/queryable/predicates/OrderByPredicate.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/queryable/predicates/OrderByPredicate.java rename to dmp-backend/queryable/src/main/java/eu/eudat/queryable/predicates/OrderByPredicate.java diff --git a/dmp-backend/src/main/java/eu/eudat/queryable/predicates/QueryablePredicate.java b/dmp-backend/queryable/src/main/java/eu/eudat/queryable/predicates/QueryablePredicate.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/queryable/predicates/QueryablePredicate.java rename to dmp-backend/queryable/src/main/java/eu/eudat/queryable/predicates/QueryablePredicate.java diff --git a/dmp-backend/src/main/java/eu/eudat/queryable/predicates/SelectPredicate.java b/dmp-backend/queryable/src/main/java/eu/eudat/queryable/predicates/SelectPredicate.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/queryable/predicates/SelectPredicate.java rename to dmp-backend/queryable/src/main/java/eu/eudat/queryable/predicates/SelectPredicate.java diff --git a/dmp-backend/src/main/java/eu/eudat/queryable/predicates/SinglePredicate.java b/dmp-backend/queryable/src/main/java/eu/eudat/queryable/predicates/SinglePredicate.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/queryable/predicates/SinglePredicate.java rename to dmp-backend/queryable/src/main/java/eu/eudat/queryable/predicates/SinglePredicate.java diff --git a/dmp-backend/src/main/java/eu/eudat/entities/DataEntity.java b/dmp-backend/queryable/src/main/java/eu/eudat/queryable/queryableentity/DataEntity.java similarity index 65% rename from dmp-backend/src/main/java/eu/eudat/entities/DataEntity.java rename to dmp-backend/queryable/src/main/java/eu/eudat/queryable/queryableentity/DataEntity.java index 6ebe0080e..2b99e290b 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/DataEntity.java +++ b/dmp-backend/queryable/src/main/java/eu/eudat/queryable/queryableentity/DataEntity.java @@ -1,4 +1,4 @@ -package eu.eudat.entities; +package eu.eudat.queryable.queryableentity; public interface DataEntity { void update(T entity); diff --git a/dmp-backend/src/main/java/eu/eudat/queryable/types/FieldSelectionType.java b/dmp-backend/queryable/src/main/java/eu/eudat/queryable/types/FieldSelectionType.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/queryable/types/FieldSelectionType.java rename to dmp-backend/queryable/src/main/java/eu/eudat/queryable/types/FieldSelectionType.java diff --git a/dmp-backend/src/main/java/eu/eudat/queryable/types/SelectionField.java b/dmp-backend/queryable/src/main/java/eu/eudat/queryable/types/SelectionField.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/queryable/types/SelectionField.java rename to dmp-backend/queryable/src/main/java/eu/eudat/queryable/types/SelectionField.java diff --git a/dmp-backend/queryable/target/classes/eu/eudat/queryable/QueryableList.class b/dmp-backend/queryable/target/classes/eu/eudat/queryable/QueryableList.class new file mode 100644 index 0000000000000000000000000000000000000000..8248c9bd4d442b355d44c18c0eed7cc52d12ba8d GIT binary patch literal 4557 zcmd5=M|0Ca6n+aSPC^YO^j;jA=p`106b#H50@xg224)m_aTbK^NGpP``~dy{cZNGR z4*URyJO75^?MhlJvJy$jz;H^wEw6m9?2~`|{`MUJF2lV+s0_kg0{x5g)S(1w#VYkQ z>NO0mEqK)F7;_fY+74|n)8N$AYRqn0^ijA_8c#a^IJ{Y9E-w)nskyC?S zub0Xh)cEHJ47k*yCMPhNsz@G;y7Jn1XJ{U0mKGS^(4S0H<*H@aO>K7WHHt2kb4nJb z)t^W&mTJ)DDuEH-=1I3>n*^Ta6p!R|#hNYK^c;uUT$^saZCjL!2v$5nK1Sl>-*ads z&3eQ_L9Oq284ViXEwMmgv>0_G;D4-VF%0wYBIENFMy-ZR;Bql0KSREt?g#N}ftfPa zHSS=l=Ssa1->&(zshG$`f$9fk71%2)t)+TT*h==6=zRhWq zI@uzrukL1;OnuyVgRQC1z)WPeXdcIs`HMHU@eId8C4()eL7k}%fqGhj&-y2$ttlax zabsTQ73*7;m?%qRhaMDM%I`6oW5r#HmQIcGY+5gHt zmsWK#WTfA0c|yHvUNUv7Eo>YFQseQEx|}v7)vJ0|=hFhdyn?);AC`^=<*H}z2a(59 zvLgCa!S&{((*$0nc@XENx6g~G@4eQhj*G=hZIf!I!#H)Aq1C*(1u==B&QCcN`TWGR z=}9e>ciLhslCuPB+44zJPkoAEVHz!@S+{&3OEDXRVIV~@GV*!#I{z&>8^d&&_G|6y ze{XnF(tk;_I+p4Gh~p$vH!z!Vtev1nuS7fKv}L$%wr2lae>xEzp2aw7IAR(V19W$& zmLm1~(|n^=m=q6;_XHMmlG{@>adR?P(a#l~On9`H|CCyD#N$qcoMz~d{!s!S(umB_ zh~nmC=JeMZI9=Yp|AF3$UdNJ1$O`#PiPGqu%gYfSgYQoQ!?l*@n6$zy99u_ap^Dq$ ztLdBwH-SS5T9%w6u%%mrzTg1@1lHjX0|0ya2&{)b#QliY!2sexC@4IHco;?$-hg-` zY*KhL;w`XM;ZelfV7tOQ5buOBg?Ay|9oZN9_r~`3#rF5Z0d@Z%o<9`BhvA6YKZ^Uu z;JCsk5TAsi!sCcf!D)rhAU+G{0Pyd6(A4^Q#1|rVTts{ce@F>=x+3vag|8vL4qbdh j;_mqg#3j(x`J0H#a7*Fa5>F~Tg|YA>G7U2_GI#y}PCCpF literal 0 HcmV?d00001 diff --git a/dmp-backend/queryable/target/classes/eu/eudat/queryable/exceptions/NotSingleResultException.class b/dmp-backend/queryable/target/classes/eu/eudat/queryable/exceptions/NotSingleResultException.class new file mode 100644 index 0000000000000000000000000000000000000000..d98d13f830df881d35140df584227c42d22459cc GIT binary patch literal 799 zcmbV~O;5r=5Qg7{Vi6RS4@HzjZwSU7G{ywu#b{zeJP7f=!UooqR{P<{&+v{#2s(f)mLjZ)W#s5W#^%S^WAdXCYV{%F)6@)g llZ~h=<3dM;amgbpvkJ3V#xyHOto$D=u8ZeWqy}SH`2bV2oJIfu literal 0 HcmV?d00001 diff --git a/dmp-backend/queryable/target/classes/eu/eudat/queryable/hibernatequeryablelist/QueryableHibernateList.class b/dmp-backend/queryable/target/classes/eu/eudat/queryable/hibernatequeryablelist/QueryableHibernateList.class new file mode 100644 index 0000000000000000000000000000000000000000..7087d1d3eba726440d2144cfcd496a3bc2524cbc GIT binary patch literal 24953 zcmc&-34B~t)j#KDl9wj0X&Sl^plw>xHqFw|Qd&sU(tUyMNvSOgOp|FdG@VJ43AEq` ziV7-%iXwtLB8!Tm0wqOUp~&KfC~klvf{F?XD$4f#&%O68GxKI9Q!4)W_2s>H?>)=^ zo_o%@=iP++Up?>*BAR2pse<Qxmql_}ESDv6St^%ha#=2y6>?cw zNj1ExhKScy@_OD-!5ev#+;!O8DIGRf@@c$9dcDc!t@3l5&8JuLoB1u3dcW236 zRC;fhOP5@_rE9DLcROl`IWBi+*Fd~@1@GpB&B=1^tK>c0FBAskl9F+Q((xQ2c&>2X zTgm(Qyc#Ou3uN4d()zXvemh?z^xq+m@3i?{HeW2ymsIk*`8{%Zug#ZM(tLiO&6icu z0>0el_gB)%`~jOkX!8})`9m`J!@}uGx%-IRT~)y!<*S9~HFEiwTs~ey5&oof`BV*+ z^0npsS&{5IY5Sbb*Vj-P-y{S-Z}S(*`HK~_nQyKkn{TS2atwsnU#aA;^4EmHt)l2{ za(8`AnsI24nsEm>NU+cJ;?ovHp0pb*Z`8D19+#L`QsQBAOcPk1@3ldtiHK=lq2j zU6xwf8yy&68m)%5_C^ysTh%Kxj>~-Kj*9drlc{i>JUKU^3usKsCzAAWX^u+7086)0 zOWre;4-9TMh)m5#rNeXsx9Wj-VrOq`Lw~G0-W5&7pjfq5VlWl&ZCwN8(Q8G{c*ok0;`(g-j%fjN>$%5EGa4^K)GX1 z)Jxxs09vASU*UzV4#h5>OeiNeV;JmQ^hRJdbwp>{Y)}Y<(@?pK^%{{B90k&f?St`N zIC7@u5WnZ?;-(5qbZ^YgnOSma>0iHaE(&ACBgf$f)0PU;m@Llo#m&@ay*2`ga~{|g z?_-)5?6TSfm{5V!SVG(OLmTO;5=ljO0qoLqdt#DYbu@&zxZG*N@RslhkAS3aMdcyT za87X}T+QB6q$*}k!kDFD?$SS_5dGX)&+t%d3lqgda-cO2eWsHSd9bTr&!OvAER<#1 z|1m8t#8Z1NFS7%XDsS`L9?Yenfhp(blfdFDfK>)l(XMloa-H4no7w_7*ZS>e!;Q~h zSfmyn!Ax!14Vy}h&*Fi7i7uwCMUqbgsVkZ28tm_nB~q4@ zU&C3%fElOfqv=TlH7okOO*m6gX`D|5@UxSt)gkWq^U3YkGBN-u#4C5K(l)-Z;1rm( zFl<;SxYMsI4p~O9EfcPS63id|oQ}#U(V)I*^ADM>%w$>!w;bh?;my(T<@LbQ^OObF z`I&MT2CI;WMWA^wlY1f54wtnR(xF(J^jwm1^xpD?OFAu6#lisRpIyZP-lZxj#W0T* zYM|;xpgIQbbFx-*b{*G^6|I`GIQ%Ozg)THNYG{D<;avM#EGhOTWh0O3R$BNlwTzOu zRR1buhpDTuOcO(9xzlThn!1FSzLoYnXdP_+5!3iAj=GVlQVV6G;NrA?`J!NUUL+N5 z!G6TfSV}twrdgmDvZ>l5#dFE-knEuZ-?}WCit4>P#+NqCKpG4C@aP!fT8A&3DX-Uf zB-ZyYi|vRG_5yvoKQ@3HfIT+TxXdst2BU#D%!n{jNxsFaTpgEbXC|Y~H6>8Xam`gC zmd!u*s;8}f4A(hQE+X#KNrB$vM>`5-pc&p;ui*k5T|rv|75>bDq3cR)c%W79O;E~F zg&<`bdB3c(du7RXlins*WsI`M_vb}x#fG^=6@LAb);~P5M%vNdnX}wOS@(>FFDz74A46i_rTR#uw zAoDsg*xOq_muYF}(#k_QSi>@vReUeO36b47ioAJfq5PF5W&H{Grf=T(1*-Zv-uIMr ze7rEaH0@wYP(o8>bHNByZ0nC_+8C<5U->b4oVQQQawdkA=NIA3O9cuf*l9q|X6i4R zS8+2Q)Y_XD7hbJ*{Ve4D244L}f2XX++DTjV<_v@;nFI3;(NvG9yF)(OGVN~fM8qjh zWke36u+d$w;%8icP|=Yb?C*-Lh|7_QqrEO^XB}pWH*n}m{s}$;20cS!SFBrz zIdl=d!=ZP{1Ig`8B4N5aSKHg7mb= zv8t?5s0`;HlsoRr_-dw^`NwCLW@OZ8rn)>LWYsy=WNS(|%(+7ZSRPwVuL_fTxlCo68vv(I9ZJpp)bFF!f zbs|=Zb&`ef%x$*S=2-KscJQFLLyQHEwGb<%%sSb&7CF{peuQaJ2*aYzbHI%$U!>Nr zcD=Bw5UQSI6?ci_p?M6?4Z_}stcGE9R`gL7RMMz0x*BIqqp2hgm}rwqJGSZ<_?RZ; zAushMtbsf|+=>fRNrRjQDT7OoMUlfComOenZ(9)%(Kx@tT4F85!BSKC3ZUm^d%;&Y zFKjJCgpBs}_2NruG&BJyYT8^b3aA}}IF<>MZ(U(-5RJ$CIHpMsEq6!z;I4u-yKDl% zbS7;)NFSX=dTFv(&POHtk?l+jL(S`e;dYnq?d8onF*aQMo}p<>$W-f+sdr3Js-0N| zIMWD~BSL2Mhmeth_<2YtU=gb!aVojEzdwqZYiQ8URPTsPreX^HY41<~M%@@X4a$L8 z9Mw>mDVxw0fxJ%Hi|_e2$Fi44X{p=q&a^3P`_Sc{+xC0r&FEY_)S3hum0d7;bDD~2 zLAEwUQH$*8PhxqwXZr%6-^&%Yq^QHBg9SOIc)K&p<* zAeKI~y+PB@u>zLw1v~=-a^x`YBn0}&VYIwf>?c`yNoE?`DR~7=?;S?ij|{+KlvgFt zNr0RIG}D&ppjWDc2O*KKILDkX6Au$!dp~c&I|gABadmnfMahEp;dM7kDdQ|)A3ETx zp31GkX_rL@bXcDn>fp5Z@(o`GbayZA?e))2sz&3yl@;N41j>;~nFv14MP2oCBReL@ z?uibpi|vKM!q;L#E;d0a8LMC!C? z?;s*~6%InLi1!bq+;u;>VRab&G;c8ygYX4F50T0ZyoY{})gf_U6|&7VQ}!0_3ODzX zZb%v~3=KlB+m{67)#~K-AM)u~Cr2w~>*b&CSDvp!{}xRcCV@e+LIH~Y4TWXemW6;f`jJDnM6S6X7=>Uf$kJykAikeGRqH~-E-%34y) zNHF2Rs2|sZPA=aP40;h9+s?CC13@(mJkKv>E}7=xWwq`Kb5s7|CS2~u2sVI>>M+P3 zAXpCDR3*pEfNZ7=W``bP52z(W&5*F1Qs37V5ihNk0T8#Ti0;^ytysN$4Yp@3MRF*rIXs;k9G)t7 zQ&9ZiMroMCsLD_A{cb#QPI6bQb&dKSgBoabM^rX}2oIIJ{U_U!P4${&a@QdCozCh6 zPJOC9ko;oggF!3|JzY&*6-{*a#s=#3!1;Os20d5cP1-OCvLoxtgZX0&Fp<{s71UiZ)(j@%XNOg1qO{X?$pp$6^U5#FK znm1iTAHx%*P}s7%6ErRQIPS;cr?g!|pTJMK+ed=0M*fq~=Tr1)Jc~XX@l$%+TC`hm ztHr`E;N!lTN~uM$)5!Z6fqK7)7H(r3fiR5oU^nFThpbFh(FV5L_W zo9oc_IlA7kIUPSeZJaDNbHQd_4mNu7efV5$M6VCf6=0+Fx&e1L(oJCu%d;4^gW-Z4 z47D|eGrW}E=P~>|SfQeA7~TkqqTz3_G~+yJ#(B~>S<*-^EsgZ@rMUyr48hNYtj~!7K=k_T zggI;uOi^%sid)OQaPCCg*TdON%3`w(Y);R?M!aZ#Hh0lCj5bmH6zd%cY$KTWx^&ai zI-Nd;tsw|$;rg=)6&+`Z1d5PzxR)VJr z35^kng+4Pq!+T&({feRQ(j}mYYW^ExqZJY-@8H3}g+D7(MrF!(UF7+NHBB|sl<$HQ!%N?7-AZLw)5PW`yqr)o zeTW(?tmqkX5np=)jnPd*)abrz7T*_<{`gmle@*+Td5BtMeZYz1cBXV~W!V2Tfit3V zhlvPI1m97C-028pOOxpWcTR>t)RX1Gx$ZEP(hDJkdXyFr1TQl zb=%L;_6s~YWW7R5ZTh86zpBQ_U(=&zDqc01oF_u6Nb?3^(tH3h2=Q)KCKeY1i%TH? zyMe`ffW>=(#ih{nvH%w6d06y$SnSNgLV9T|q%9l^Z6}Wb4V(=ynEVyST?W*anB=gn zw6?Udsd+!mzJrb*!rwTeEqKw=TpQU>Cj?&AmYVoH*Tm;}{<6{0?+Rp!A3}ckVWebN zDt#7ePDUT_l#?KsA-R)mTD;E^l^;vgU7|AT2&kMyzeT@NwFZ0|dR+^RcX~7=57#s< zR@N^xE`arE8c%?R#^878heHn<1CF4FV9;qWScheb<6&))+Q<-{#E`vF?%Kqh=eL!% z01(%JVCwCXmDI^fdF`Q=mM~Pb^^XI00&2p!pSubxu>lwhBOW+ELL*RANnM)J1mXD% zrs`U3BR&gguA^m0mIWS}^yx6Ar|51qQCmHDwwmn}MD$E(t1_GtP}-n?ig<>jY24${ z&_D@|iY~@gN)RLN?n#_Gf^F;~WOEVvOnJEMr;}W=xCC5?kWC z4{c00VM;#_!}$Ub`XUg!In9`!r5}4Hp*LWi^qg66`HksWddM5;8q;%dPO?b&M%LNMrC0dkWRD z9Q)f95_=HIs$>uhZKa7u@~8rmY%(Suq|p-SCf-h~hG@0!GReH0q+Xt)UsfKZc`)`< zCB4PIeHvM}{n=#e@pcx0t%!IUHLWKOy0#V+O{=c6Pq=M@*Lg*A&Kfz&6 zL?*q6z5`^x3uNyG688YvgFyCPg{IEEZ}u=eAqzuk(-=ydi(wU&1~D`cz6=Oop;tA8 z^q7HgS3wAKS?mZI>Dec&uC}RWJ>JRt$|2eyiPXjt+5)>$`P3%gw2lIE!XlrDw-dc0oe%kU)NTnmFF3tT8&^!rfeh+A#0yIwpnm4dwQBF0=^CJByX0#;M% zSsr40P{5j+4_Aldc-Bn9xY+cHu4x=?n@KSJjmKKE1w$!mT?-J=yRo)NOKrq#!LZ&>m$m<99gbWNJf=k) zwJqtm9}Pz!)54BRva(R$QCsRmpsnO(Y&>2;A?Q_XJYFN5fkX_$-xa~!pM`lnmrE5K zI@xwNAcRttL?ryuFbd|fEwex&rnVv_ptF_Bk;F$(4LM4|rW5u?ypfR_Hr-!}R=U3= z=eqxk$T%c&RS~~RoqGFb^9XHAT!GbC$=KSdGVs$FB~;G@6nY~!L~qe`!y!5YkTx1j z&y>PkQ;S4=ue1nYRmy%AfR%1d-l~e;PTS4)w@VrYG+ka+=@x`Ik}GK%#8|{5!LUk! zq!m2V*bIb1r9sL*awk<&3wixY>~P->TC%A8{$fYEzm$Shf6z7kLA}H%KT0WIZIpio zK#B5Qo>E09FB^6MpwjZ<0XPBxi~#^+X&H~h-%A}I0HDhQpbG#<0SY2|0Gyfyfb`b@ zNPj6xss084^bY_q8UWOIv;VvSKw@rS_NBT}?A-fC5oQFc-VtgE$Iv*QK=nM47V;#D zb6o%kH{KHM@+@JO0b(4=pP826#$erFTLStkAXI-o!n1@i3JBK{{$+qj77s+29ULkc zQvt>_fH9qxa0BgT{qaYedD63rq-PaL4~(r@U`T&$71Cc@1^OE>&_4jiSb#AOHmH08 ze*$30)>(EJ0jq##gi*9bu!Bbf+^lv9wUL}YA!rHRU!~afG+T|$56=$q)nY3*(Dn=p zJFlnp`6$%%+)nY5*~;?-hi+F55j31F#61qR5#O7u9GGWf23lz<9|y-Yi#m8VUBt)Z zS8(RgZ+WgVO(_%j`v|#noz##*gr6=!+V}%CFM8kXkJR%bBejuYq?#8sl55?O zd=%W1c=AfJUZ#s|KKdm(!+5e|)RavyQx-G!`v7KUSK54Jnr9FeJtuQyj5pP|33cNh zW;alG1`W*0#{4vjofo0z&x}e`c>zu4g*1mxrWh}xy}XzXvi?Y=*T)0i`gp)w9}jpl z@_?BUKWs>UJrB}fuMhM$^ML+p9t8bzvR9%N(*QSnCfQFQ7BdXqe7ZOy>%8_BUj~{*PB%adz2P;5@or6_O4Ss!RC=IqV7kisJ=Ev!!#DT)u?2q6n~4VG9B%Po zrI`~kB8`T;k(m%PDJ8}x7aHQ&iII4g(NN&P;c?+;1>m?ZfUC{T+(LxmIL

;X@(A zEjbcnhOY-Ru}t+j7&>QsNzgN`Cq`GvwN6K5X(?}@C1k^)8$(>a^a$|@Agn(|C$eWC zQ(^tFNwb*%zlsbPL~%mL5S?v^;=IHVC9N#Lg5%2-U@{)ZfrdF=e_+%6-SL*3DKg{T zLlKp*Fi{NOZ$yP4Qj0yy5V!1}$Ef6!GEOTG^UrVPuhu>1@u*#gpGDLN6)3ReYsQ813|i!_u=m&vudMA~(EV!k{?}VZ>gr&!iI% ujY!T6i|YG;wfMW9aME=63DhAFTHz%CY7_R*4)K17TId8@c@YklneHbhHNU3- literal 0 HcmV?d00001 diff --git a/dmp-backend/queryable/target/classes/eu/eudat/queryable/predicates/OrderByPredicate.class b/dmp-backend/queryable/target/classes/eu/eudat/queryable/predicates/OrderByPredicate.class new file mode 100644 index 0000000000000000000000000000000000000000..04dd720925b7467f2b3f40da4e91853757f12099 GIT binary patch literal 476 zcmb_Z!A=4}41Gmp1IKj4L4Jh_AeCZ0?%us<-&He|?TcbT0b@@pRa06)q&yJ|F= z5Dpxgv@dPn>+9S5%PW9eTqGDII44}Hs`YA=Nr*3Niw zM)CbuG7ZM&;?jM+^Ro2m&AyJAYjzO&3$rSe4=(a=kIFyJvUGBoh~YT9YsIov#foRk zwP>GC{zHVpq6|*UgRxQYb$iA1$HP(MA7LbcCFIKUCWzaqr4_EeeXjZM6yd6w`%T^> b5IXT+0Cfo`=*IdqRvq+Wd}ayGTBQF0s6LqC literal 0 HcmV?d00001 diff --git a/dmp-backend/queryable/target/classes/eu/eudat/queryable/predicates/QueryablePredicate.class b/dmp-backend/queryable/target/classes/eu/eudat/queryable/predicates/QueryablePredicate.class new file mode 100644 index 0000000000000000000000000000000000000000..018236f71b26d56575e700b61583111f835aa2ba GIT binary patch literal 210 zcmX^0Z`VEs1_l!bPId-%b_Nbc2F~Ej^t{B9(xOyG1`V4KE1#^yvPAuy#JqHU|D>$c zg_W$iT?J1avhBFflNLNfriHFwF)4?mau! literal 0 HcmV?d00001 diff --git a/dmp-backend/queryable/target/classes/eu/eudat/queryable/predicates/SelectPredicate.class b/dmp-backend/queryable/target/classes/eu/eudat/queryable/predicates/SelectPredicate.class new file mode 100644 index 0000000000000000000000000000000000000000..91ff6db664e2fdfcd51d9bad0d5e24a761970776 GIT binary patch literal 309 zcmZvYJqp4=5QX3P7mXqooW^2Oq$P5~o#* zC=?GK0)Ik&@+EnFdwv0Mj)M%N4Euyb-L`Hy^HN%)gAn5QW}zSSBe&u^+XbnOu<p#8k(K1E54mC z!~`|{T_TL~CVC^+)+OlU+}4$o%}!^lGZIcEvcysczK`OUdhUeVuXA_&!$de**}jh+ c5D2~WHGukr9rRPao3b7TDLzz&y>(^y4i&zeX8-^I literal 0 HcmV?d00001 diff --git a/dmp-backend/queryable/target/classes/eu/eudat/queryable/queryableentity/DataEntity.class b/dmp-backend/queryable/target/classes/eu/eudat/queryable/queryableentity/DataEntity.class new file mode 100644 index 0000000000000000000000000000000000000000..7db165f4d183068027c10aa5ca0f417f3717fe88 GIT binary patch literal 334 zcmZuty-tKc5dP+bMer00eFrFXo2w3DrPp9$am0SX34svwaMy%av+x0YDC2^OBw{z; zU*?kzx5aNqZ9kP5tPNDRgVY$RZi-!#-us(&nb>`GOZUtv2yloX- z?lo-g@p|Ak{R*9B8AkKv-8W@>r&4&|ixA6~_xCCc(cSI04BEoMc4@z0GpxKDFtmE= zcp+~ytfta~`YQQmgA==w>+`+vxW-!*Q3>&pLCYT)wo|1e=hU%0$3L{}pym39+4O)E z6QyR|@eZ7pE28&OD86${nG!d{GpIS&cY{ra>HlQkNgpsM!AF;Bj@#~`?*w6sB1Kce zpy%pd&-qnf=z<>}=LVv^N!MoB&9GJHMOXA>=H|_=h}M{x7V|V?Vgt_^mIjy%6G^-< z@c{EC#*r{FA+|}eO(DTBa@BfK0L@?BYx=}xGL`Ntu3S5!X(PTH{q4$oPP?7$gZ;a` z>rt~?Yc$_u^pV82W(5s^Br%ba$Vf?ifU!AID?35*gPJr3cV5OUVnU zU!=J|-IcqBhk`m5BxVsh9$~RZpr0cy6+@BAkW|c=REDK8qDo~{ w`$0rpN#yS|bt7-?M_Boi~)NO%5q=_p1gH(F!@_39CokfuT3lO^s(f|Me literal 0 HcmV?d00001 diff --git a/dmp-backend/queryable/target/classes/eu/eudat/queryable/types/SelectionField.class b/dmp-backend/queryable/target/classes/eu/eudat/queryable/types/SelectionField.class new file mode 100644 index 0000000000000000000000000000000000000000..bfc18fb373db9b0dd32585e0f4e2cdaa7d453b26 GIT binary patch literal 1185 zcmb7@-EY!R7{;GNOA8$i#x~q^D)`AdwO)9q*@Yh@CPZUcc3tz&iLxrY|mW`VNW^(*d z3Owk_)RXDZPrOg5jF0_(C_S|`@j8JFhdmj}K@yCk1Fk(0D85sx0`=~Z|JnCKKN@+x zBo3kxH?5~Z6eRlso9&C+yN5J=J|5Dv+6^N4I{na>@qsc_a^ry?9{O>h=Gmf|ybmS< zyZMMSI?YOgXYKsMOX^upX^&*0$`$b1|1e*oCty!bb07U5ifT`Z##&WigU(AjT%vq- z!s(6Ecpy80>ficeCmyQQ3RZB-#_bC3pj3gaLK%+0z1%BbR1v71A-w4y@gWEpZAH45 zD{-+ad^DX`FS{?$;`_7sG7J2XMvn-@uLVKa3gact-s%&;n)?I7{f5E`40rDY=2xAv z%2K1dh=SsI`NLGdf);x%L9%N@J$oA}77C`3iVhYkENGk{A^bW4* H(y#snQg7$f literal 0 HcmV?d00001 diff --git a/dmp-backend/web/pom.xml b/dmp-backend/web/pom.xml new file mode 100644 index 000000000..84ef62e93 --- /dev/null +++ b/dmp-backend/web/pom.xml @@ -0,0 +1,24 @@ + + + 4.0.0 + + dmp-backend + web + 1.0-SNAPSHOT + + + eu.eudat + dmp-backend + 1.0.0-SNAPSHOT + + + + + dmp-backend + queryable + 1.0-SNAPSHOT + + + \ No newline at end of file diff --git a/dmp-backend/src/main/java/eu/eudat/EuDatApplication.java b/dmp-backend/web/src/main/java/eu/eudat/EuDatApplication.java similarity index 81% rename from dmp-backend/src/main/java/eu/eudat/EuDatApplication.java rename to dmp-backend/web/src/main/java/eu/eudat/EuDatApplication.java index 5f55cd672..7a674710f 100644 --- a/dmp-backend/src/main/java/eu/eudat/EuDatApplication.java +++ b/dmp-backend/web/src/main/java/eu/eudat/EuDatApplication.java @@ -1,14 +1,11 @@ package eu.eudat; -import eu.eudat.services.helpers.FileStorageService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.support.SpringBootServletInitializer; -import org.springframework.web.context.WebApplicationContext; @SpringBootApplication public class EuDatApplication extends SpringBootServletInitializer { diff --git a/dmp-backend/src/main/java/eu/eudat/builders/Builder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/Builder.java similarity index 73% rename from dmp-backend/src/main/java/eu/eudat/builders/Builder.java rename to dmp-backend/web/src/main/java/eu/eudat/builders/Builder.java index 50d3718b4..09eab8aac 100644 --- a/dmp-backend/src/main/java/eu/eudat/builders/Builder.java +++ b/dmp-backend/web/src/main/java/eu/eudat/builders/Builder.java @@ -1,7 +1,5 @@ package eu.eudat.builders; -import eu.eudat.builders.helpers.BuilderApplier; - /** * Created by ikalyvas on 2/15/2018. */ diff --git a/dmp-backend/src/main/java/eu/eudat/builders/BuilderFactory.java b/dmp-backend/web/src/main/java/eu/eudat/builders/BuilderFactory.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/builders/BuilderFactory.java rename to dmp-backend/web/src/main/java/eu/eudat/builders/BuilderFactory.java diff --git a/dmp-backend/src/main/java/eu/eudat/builders/BuilderFactoryImpl.java b/dmp-backend/web/src/main/java/eu/eudat/builders/BuilderFactoryImpl.java similarity index 96% rename from dmp-backend/src/main/java/eu/eudat/builders/BuilderFactoryImpl.java rename to dmp-backend/web/src/main/java/eu/eudat/builders/BuilderFactoryImpl.java index 8951695e9..f1f1e188f 100644 --- a/dmp-backend/src/main/java/eu/eudat/builders/BuilderFactoryImpl.java +++ b/dmp-backend/web/src/main/java/eu/eudat/builders/BuilderFactoryImpl.java @@ -5,7 +5,6 @@ import eu.eudat.builders.model.criteria.DataRepositoryCriteriaBuilder; import eu.eudat.builders.model.criteria.ExternalDatasetCriteriaBuilder; import eu.eudat.builders.model.criteria.RegistryCriteriaBuilder; import eu.eudat.builders.model.models.*; -import eu.eudat.models.dashboard.recent.RecentActivityData; import org.springframework.stereotype.Service; /** diff --git a/dmp-backend/src/main/java/eu/eudat/builders/entity/ContentBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/entity/ContentBuilder.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/builders/entity/ContentBuilder.java rename to dmp-backend/web/src/main/java/eu/eudat/builders/entity/ContentBuilder.java diff --git a/dmp-backend/src/main/java/eu/eudat/builders/entity/CredentialBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/entity/CredentialBuilder.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/builders/entity/CredentialBuilder.java rename to dmp-backend/web/src/main/java/eu/eudat/builders/entity/CredentialBuilder.java diff --git a/dmp-backend/src/main/java/eu/eudat/builders/entity/DatasetProfileBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/entity/DatasetProfileBuilder.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/builders/entity/DatasetProfileBuilder.java rename to dmp-backend/web/src/main/java/eu/eudat/builders/entity/DatasetProfileBuilder.java diff --git a/dmp-backend/src/main/java/eu/eudat/builders/entity/UserInfoBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/entity/UserInfoBuilder.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/builders/entity/UserInfoBuilder.java rename to dmp-backend/web/src/main/java/eu/eudat/builders/entity/UserInfoBuilder.java diff --git a/dmp-backend/src/main/java/eu/eudat/builders/entity/UserRoleBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/entity/UserRoleBuilder.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/builders/entity/UserRoleBuilder.java rename to dmp-backend/web/src/main/java/eu/eudat/builders/entity/UserRoleBuilder.java diff --git a/dmp-backend/src/main/java/eu/eudat/builders/entity/UserTokenBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/entity/UserTokenBuilder.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/builders/entity/UserTokenBuilder.java rename to dmp-backend/web/src/main/java/eu/eudat/builders/entity/UserTokenBuilder.java diff --git a/dmp-backend/src/main/java/eu/eudat/builders/helpers/BuilderApplier.java b/dmp-backend/web/src/main/java/eu/eudat/builders/helpers/BuilderApplier.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/builders/helpers/BuilderApplier.java rename to dmp-backend/web/src/main/java/eu/eudat/builders/helpers/BuilderApplier.java diff --git a/dmp-backend/src/main/java/eu/eudat/builders/model/criteria/DataRepositoryCriteriaBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/model/criteria/DataRepositoryCriteriaBuilder.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/builders/model/criteria/DataRepositoryCriteriaBuilder.java rename to dmp-backend/web/src/main/java/eu/eudat/builders/model/criteria/DataRepositoryCriteriaBuilder.java diff --git a/dmp-backend/src/main/java/eu/eudat/builders/model/criteria/ExternalDatasetCriteriaBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/model/criteria/ExternalDatasetCriteriaBuilder.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/builders/model/criteria/ExternalDatasetCriteriaBuilder.java rename to dmp-backend/web/src/main/java/eu/eudat/builders/model/criteria/ExternalDatasetCriteriaBuilder.java diff --git a/dmp-backend/src/main/java/eu/eudat/builders/model/criteria/RegistryCriteriaBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/model/criteria/RegistryCriteriaBuilder.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/builders/model/criteria/RegistryCriteriaBuilder.java rename to dmp-backend/web/src/main/java/eu/eudat/builders/model/criteria/RegistryCriteriaBuilder.java diff --git a/dmp-backend/src/main/java/eu/eudat/builders/model/criteria/ServiceCriteriaBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/model/criteria/ServiceCriteriaBuilder.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/builders/model/criteria/ServiceCriteriaBuilder.java rename to dmp-backend/web/src/main/java/eu/eudat/builders/model/criteria/ServiceCriteriaBuilder.java diff --git a/dmp-backend/src/main/java/eu/eudat/builders/model/models/DataTableDataBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/model/models/DataTableDataBuilder.java similarity index 94% rename from dmp-backend/src/main/java/eu/eudat/builders/model/models/DataTableDataBuilder.java rename to dmp-backend/web/src/main/java/eu/eudat/builders/model/models/DataTableDataBuilder.java index b68490577..378242d60 100644 --- a/dmp-backend/src/main/java/eu/eudat/builders/model/models/DataTableDataBuilder.java +++ b/dmp-backend/web/src/main/java/eu/eudat/builders/model/models/DataTableDataBuilder.java @@ -1,7 +1,6 @@ package eu.eudat.builders.model.models; import eu.eudat.builders.Builder; -import eu.eudat.builders.helpers.BuilderApplier; import eu.eudat.models.helpers.common.DataTableData; import java.util.List; diff --git a/dmp-backend/src/main/java/eu/eudat/builders/model/models/PrincipalBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/model/models/PrincipalBuilder.java similarity index 96% rename from dmp-backend/src/main/java/eu/eudat/builders/model/models/PrincipalBuilder.java rename to dmp-backend/web/src/main/java/eu/eudat/builders/model/models/PrincipalBuilder.java index b3fa67333..a53d1558e 100644 --- a/dmp-backend/src/main/java/eu/eudat/builders/model/models/PrincipalBuilder.java +++ b/dmp-backend/web/src/main/java/eu/eudat/builders/model/models/PrincipalBuilder.java @@ -1,7 +1,6 @@ package eu.eudat.builders.model.models; import eu.eudat.builders.Builder; -import eu.eudat.builders.helpers.BuilderApplier; import eu.eudat.models.security.Principal; import eu.eudat.types.Authorities; diff --git a/dmp-backend/src/main/java/eu/eudat/builders/model/models/ProjectBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/model/models/ProjectBuilder.java similarity index 98% rename from dmp-backend/src/main/java/eu/eudat/builders/model/models/ProjectBuilder.java rename to dmp-backend/web/src/main/java/eu/eudat/builders/model/models/ProjectBuilder.java index b8881804c..87d2ed01c 100644 --- a/dmp-backend/src/main/java/eu/eudat/builders/model/models/ProjectBuilder.java +++ b/dmp-backend/web/src/main/java/eu/eudat/builders/model/models/ProjectBuilder.java @@ -1,7 +1,6 @@ package eu.eudat.builders.model.models; import eu.eudat.builders.Builder; -import eu.eudat.builders.helpers.BuilderApplier; import eu.eudat.entities.UserInfo; import eu.eudat.models.dmp.DataManagementPlan; import eu.eudat.models.project.Project; diff --git a/dmp-backend/src/main/java/eu/eudat/builders/model/models/RecentActivityDataBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/model/models/RecentActivityDataBuilder.java similarity index 96% rename from dmp-backend/src/main/java/eu/eudat/builders/model/models/RecentActivityDataBuilder.java rename to dmp-backend/web/src/main/java/eu/eudat/builders/model/models/RecentActivityDataBuilder.java index d4e14fd94..33b823027 100644 --- a/dmp-backend/src/main/java/eu/eudat/builders/model/models/RecentActivityDataBuilder.java +++ b/dmp-backend/web/src/main/java/eu/eudat/builders/model/models/RecentActivityDataBuilder.java @@ -1,7 +1,6 @@ package eu.eudat.builders.model.models; import eu.eudat.builders.Builder; -import eu.eudat.builders.helpers.BuilderApplier; import eu.eudat.models.dashboard.recent.RecentActivityData; import java.util.Date; diff --git a/dmp-backend/src/main/java/eu/eudat/builders/model/models/ResearcherBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/model/models/ResearcherBuilder.java similarity index 96% rename from dmp-backend/src/main/java/eu/eudat/builders/model/models/ResearcherBuilder.java rename to dmp-backend/web/src/main/java/eu/eudat/builders/model/models/ResearcherBuilder.java index e17aa3cd9..471629e4e 100644 --- a/dmp-backend/src/main/java/eu/eudat/builders/model/models/ResearcherBuilder.java +++ b/dmp-backend/web/src/main/java/eu/eudat/builders/model/models/ResearcherBuilder.java @@ -1,7 +1,6 @@ package eu.eudat.builders.model.models; import eu.eudat.builders.Builder; -import eu.eudat.builders.helpers.BuilderApplier; import eu.eudat.models.dmp.Researcher; /** diff --git a/dmp-backend/src/main/java/eu/eudat/cache/ResponsesCache.java b/dmp-backend/web/src/main/java/eu/eudat/cache/ResponsesCache.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/cache/ResponsesCache.java rename to dmp-backend/web/src/main/java/eu/eudat/cache/ResponsesCache.java diff --git a/dmp-backend/src/main/java/eu/eudat/configurations/DevelDatabaseConfiguration.java b/dmp-backend/web/src/main/java/eu/eudat/configurations/DevelDatabaseConfiguration.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/configurations/DevelDatabaseConfiguration.java rename to dmp-backend/web/src/main/java/eu/eudat/configurations/DevelDatabaseConfiguration.java diff --git a/dmp-backend/src/main/java/eu/eudat/configurations/ProductionDatabaseConfiguration.java b/dmp-backend/web/src/main/java/eu/eudat/configurations/ProductionDatabaseConfiguration.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/configurations/ProductionDatabaseConfiguration.java rename to dmp-backend/web/src/main/java/eu/eudat/configurations/ProductionDatabaseConfiguration.java diff --git a/dmp-backend/src/main/java/eu/eudat/configurations/WebMVCConfiguration.java b/dmp-backend/web/src/main/java/eu/eudat/configurations/WebMVCConfiguration.java similarity index 93% rename from dmp-backend/src/main/java/eu/eudat/configurations/WebMVCConfiguration.java rename to dmp-backend/web/src/main/java/eu/eudat/configurations/WebMVCConfiguration.java index db8889831..1186ab6ca 100644 --- a/dmp-backend/src/main/java/eu/eudat/configurations/WebMVCConfiguration.java +++ b/dmp-backend/web/src/main/java/eu/eudat/configurations/WebMVCConfiguration.java @@ -4,8 +4,6 @@ import eu.eudat.controllers.interceptors.RequestInterceptor; import eu.eudat.handlers.PrincipalArgumentResolver; import eu.eudat.services.ApiContext; import eu.eudat.services.operations.AuthenticationService; -import eu.eudat.services.operations.AuthenticationServiceImpl; -import eu.eudat.types.WarningLevel; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.annotation.EnableAsync; diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/Admin.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/controllers/Admin.java rename to dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/BaseController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/BaseController.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/controllers/BaseController.java rename to dmp-backend/web/src/main/java/eu/eudat/controllers/BaseController.java diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/DMPs.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/DMPs.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/controllers/DMPs.java rename to dmp-backend/web/src/main/java/eu/eudat/controllers/DMPs.java diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/DashBoardController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/DashBoardController.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/controllers/DashBoardController.java rename to dmp-backend/web/src/main/java/eu/eudat/controllers/DashBoardController.java diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/DataRepositories.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/DataRepositories.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/controllers/DataRepositories.java rename to dmp-backend/web/src/main/java/eu/eudat/controllers/DataRepositories.java diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/DatasetProfileController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetProfileController.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/controllers/DatasetProfileController.java rename to dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetProfileController.java diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/DatasetProfiles.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetProfiles.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/controllers/DatasetProfiles.java rename to dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetProfiles.java diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/DatasetWizardController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetWizardController.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/controllers/DatasetWizardController.java rename to dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetWizardController.java diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/Datasets.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Datasets.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/controllers/Datasets.java rename to dmp-backend/web/src/main/java/eu/eudat/controllers/Datasets.java diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/ExternalDatasets.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/ExternalDatasets.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/controllers/ExternalDatasets.java rename to dmp-backend/web/src/main/java/eu/eudat/controllers/ExternalDatasets.java diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/FileController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/FileController.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/controllers/FileController.java rename to dmp-backend/web/src/main/java/eu/eudat/controllers/FileController.java diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/Login.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/controllers/Login.java rename to dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/Organisations.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Organisations.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/controllers/Organisations.java rename to dmp-backend/web/src/main/java/eu/eudat/controllers/Organisations.java diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/Projects.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Projects.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/controllers/Projects.java rename to dmp-backend/web/src/main/java/eu/eudat/controllers/Projects.java diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/Registries.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Registries.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/controllers/Registries.java rename to dmp-backend/web/src/main/java/eu/eudat/controllers/Registries.java diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/Researchers.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Researchers.java similarity index 96% rename from dmp-backend/src/main/java/eu/eudat/controllers/Researchers.java rename to dmp-backend/web/src/main/java/eu/eudat/controllers/Researchers.java index 8c52c5b47..6c26a3686 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/Researchers.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Researchers.java @@ -1,13 +1,10 @@ package eu.eudat.controllers; import eu.eudat.exceptions.security.UnauthorisedException; -import eu.eudat.managers.ProjectManager; import eu.eudat.managers.ResearcherManager; -import eu.eudat.models.criteria.ResearcherCriteria; import eu.eudat.models.dmp.Researcher; import eu.eudat.models.external.ResearchersExternalSourcesModel; import eu.eudat.models.helpers.responses.ResponseItem; -import eu.eudat.models.project.ProjectCriteriaRequest; import eu.eudat.models.researcher.ResearcherCriteriaRequest; import eu.eudat.models.security.Principal; import eu.eudat.proxy.config.exceptions.HugeResultSet; diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/Services.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Services.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/controllers/Services.java rename to dmp-backend/web/src/main/java/eu/eudat/controllers/Services.java diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/UserInvitationController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/UserInvitationController.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/controllers/UserInvitationController.java rename to dmp-backend/web/src/main/java/eu/eudat/controllers/UserInvitationController.java diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/Users.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Users.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/controllers/Users.java rename to dmp-backend/web/src/main/java/eu/eudat/controllers/Users.java diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/controllerhandler/ControllerErrorHandler.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/controllerhandler/ControllerErrorHandler.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/controllers/controllerhandler/ControllerErrorHandler.java rename to dmp-backend/web/src/main/java/eu/eudat/controllers/controllerhandler/ControllerErrorHandler.java diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/interceptors/RequestInterceptor.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/interceptors/RequestInterceptor.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/controllers/interceptors/RequestInterceptor.java rename to dmp-backend/web/src/main/java/eu/eudat/controllers/interceptors/RequestInterceptor.java diff --git a/dmp-backend/src/main/java/eu/eudat/dao/DatabaseAccess.java b/dmp-backend/web/src/main/java/eu/eudat/dao/DatabaseAccess.java similarity index 88% rename from dmp-backend/src/main/java/eu/eudat/dao/DatabaseAccess.java rename to dmp-backend/web/src/main/java/eu/eudat/dao/DatabaseAccess.java index 94d45316c..f5860f8ae 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/DatabaseAccess.java +++ b/dmp-backend/web/src/main/java/eu/eudat/dao/DatabaseAccess.java @@ -1,7 +1,7 @@ package eu.eudat.dao; import eu.eudat.dao.databaselayer.service.DatabaseService; -import eu.eudat.entities.DataEntity; +import eu.eudat.queryable.queryableentity.DataEntity; public class DatabaseAccess { diff --git a/dmp-backend/src/main/java/eu/eudat/dao/DatabaseAccessLayer.java b/dmp-backend/web/src/main/java/eu/eudat/dao/DatabaseAccessLayer.java similarity index 84% rename from dmp-backend/src/main/java/eu/eudat/dao/DatabaseAccessLayer.java rename to dmp-backend/web/src/main/java/eu/eudat/dao/DatabaseAccessLayer.java index 0a5c4cd0a..d75965d74 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/DatabaseAccessLayer.java +++ b/dmp-backend/web/src/main/java/eu/eudat/dao/DatabaseAccessLayer.java @@ -1,9 +1,8 @@ package eu.eudat.dao; -import eu.eudat.entities.DataEntity; -import eu.eudat.entities.Dataset; import eu.eudat.queryable.QueryableList; +import eu.eudat.queryable.queryableentity.DataEntity; import java.util.concurrent.CompletableFuture; diff --git a/dmp-backend/src/main/java/eu/eudat/dao/databaselayer/context/DatabaseContext.java b/dmp-backend/web/src/main/java/eu/eudat/dao/databaselayer/context/DatabaseContext.java similarity index 96% rename from dmp-backend/src/main/java/eu/eudat/dao/databaselayer/context/DatabaseContext.java rename to dmp-backend/web/src/main/java/eu/eudat/dao/databaselayer/context/DatabaseContext.java index d9defe1ae..0c7531ab6 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/databaselayer/context/DatabaseContext.java +++ b/dmp-backend/web/src/main/java/eu/eudat/dao/databaselayer/context/DatabaseContext.java @@ -1,8 +1,8 @@ package eu.eudat.dao.databaselayer.context; -import eu.eudat.entities.DataEntity; import eu.eudat.queryable.QueryableList; import eu.eudat.queryable.hibernatequeryablelist.QueryableHibernateList; +import eu.eudat.queryable.queryableentity.DataEntity; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; diff --git a/dmp-backend/src/main/java/eu/eudat/dao/databaselayer/service/DatabaseService.java b/dmp-backend/web/src/main/java/eu/eudat/dao/databaselayer/service/DatabaseService.java similarity index 94% rename from dmp-backend/src/main/java/eu/eudat/dao/databaselayer/service/DatabaseService.java rename to dmp-backend/web/src/main/java/eu/eudat/dao/databaselayer/service/DatabaseService.java index 3146c49b8..6ef974399 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/databaselayer/service/DatabaseService.java +++ b/dmp-backend/web/src/main/java/eu/eudat/dao/databaselayer/service/DatabaseService.java @@ -2,8 +2,8 @@ package eu.eudat.dao.databaselayer.service; import eu.eudat.dao.databaselayer.context.DatabaseContext; -import eu.eudat.entities.DataEntity; import eu.eudat.queryable.QueryableList; +import eu.eudat.queryable.queryableentity.DataEntity; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/ContentDao.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ContentDao.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/dao/entities/ContentDao.java rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/ContentDao.java diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/ContentDaoImpl.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ContentDaoImpl.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/dao/entities/ContentDaoImpl.java rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/ContentDaoImpl.java diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/DMPDao.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/DMPDao.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/dao/entities/DMPDao.java rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/DMPDao.java diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/DMPDaoImpl.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/DMPDaoImpl.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/dao/entities/DMPDaoImpl.java rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/DMPDaoImpl.java diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/DataRepositoryDao.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/DataRepositoryDao.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/dao/entities/DataRepositoryDao.java rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/DataRepositoryDao.java diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/DataRepositoryDaoImpl.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/DataRepositoryDaoImpl.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/dao/entities/DataRepositoryDaoImpl.java rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/DataRepositoryDaoImpl.java diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetDao.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/DatasetDao.java similarity index 91% rename from dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetDao.java rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/DatasetDao.java index eb560faec..66f0ab285 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetDao.java +++ b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/DatasetDao.java @@ -7,7 +7,6 @@ import eu.eudat.models.criteria.DatasetCriteria; import eu.eudat.queryable.QueryableList; import java.util.UUID; -import java.util.concurrent.CompletableFuture; public interface DatasetDao extends DatabaseAccessLayer { diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetDaoImpl.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/DatasetDaoImpl.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetDaoImpl.java rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/DatasetDaoImpl.java diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetProfileDao.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/DatasetProfileDao.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetProfileDao.java rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/DatasetProfileDao.java diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetProfileDaoImpl.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/DatasetProfileDaoImpl.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetProfileDaoImpl.java rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/DatasetProfileDaoImpl.java diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/ExternalDatasetDao.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ExternalDatasetDao.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/dao/entities/ExternalDatasetDao.java rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/ExternalDatasetDao.java diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/ExternalDatasetDaoImpl.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ExternalDatasetDaoImpl.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/dao/entities/ExternalDatasetDaoImpl.java rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/ExternalDatasetDaoImpl.java diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/InvitationDao.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/InvitationDao.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/dao/entities/InvitationDao.java rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/InvitationDao.java diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/InvitationDaoImpl.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/InvitationDaoImpl.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/dao/entities/InvitationDaoImpl.java rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/InvitationDaoImpl.java diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/OrganisationDao.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/OrganisationDao.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/dao/entities/OrganisationDao.java rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/OrganisationDao.java diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/OrganisationDaoImpl.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/OrganisationDaoImpl.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/dao/entities/OrganisationDaoImpl.java rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/OrganisationDaoImpl.java diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/ProjectDao.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ProjectDao.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/dao/entities/ProjectDao.java rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/ProjectDao.java diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/ProjectDaoImpl.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ProjectDaoImpl.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/dao/entities/ProjectDaoImpl.java rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/ProjectDaoImpl.java diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/RegistryDao.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/RegistryDao.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/dao/entities/RegistryDao.java rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/RegistryDao.java diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/RegistryDaoImpl.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/RegistryDaoImpl.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/dao/entities/RegistryDaoImpl.java rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/RegistryDaoImpl.java diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/ResearcherDao.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ResearcherDao.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/dao/entities/ResearcherDao.java rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/ResearcherDao.java diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/ResearcherDaoImpl.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ResearcherDaoImpl.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/dao/entities/ResearcherDaoImpl.java rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/ResearcherDaoImpl.java diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/ServiceDao.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ServiceDao.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/dao/entities/ServiceDao.java rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/ServiceDao.java diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/ServiceDaoImpl.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ServiceDaoImpl.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/dao/entities/ServiceDaoImpl.java rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/ServiceDaoImpl.java diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/UserDmpDao.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserDmpDao.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/dao/entities/UserDmpDao.java rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserDmpDao.java diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/UserDmpDaoImpl.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserDmpDaoImpl.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/dao/entities/UserDmpDaoImpl.java rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserDmpDaoImpl.java diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/UserInfoDao.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserInfoDao.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/dao/entities/UserInfoDao.java rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserInfoDao.java diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/UserInfoDaoImpl.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserInfoDaoImpl.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/dao/entities/UserInfoDaoImpl.java rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserInfoDaoImpl.java diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/UserRoleDao.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserRoleDao.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/dao/entities/UserRoleDao.java rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserRoleDao.java diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/UserRoleDaoImpl.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserRoleDaoImpl.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/dao/entities/UserRoleDaoImpl.java rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserRoleDaoImpl.java diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/security/CredentialDao.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/security/CredentialDao.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/dao/entities/security/CredentialDao.java rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/security/CredentialDao.java diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/security/CredentialDaoImpl.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/security/CredentialDaoImpl.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/dao/entities/security/CredentialDaoImpl.java rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/security/CredentialDaoImpl.java diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/security/UserTokenDao.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/security/UserTokenDao.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/dao/entities/security/UserTokenDao.java rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/security/UserTokenDao.java diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/security/UserTokenDaoImpl.java b/dmp-backend/web/src/main/java/eu/eudat/dao/entities/security/UserTokenDaoImpl.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/dao/entities/security/UserTokenDaoImpl.java rename to dmp-backend/web/src/main/java/eu/eudat/dao/entities/security/UserTokenDaoImpl.java diff --git a/dmp-backend/src/main/java/eu/eudat/documents/helpers/FileEnvelope.java b/dmp-backend/web/src/main/java/eu/eudat/documents/helpers/FileEnvelope.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/documents/helpers/FileEnvelope.java rename to dmp-backend/web/src/main/java/eu/eudat/documents/helpers/FileEnvelope.java diff --git a/dmp-backend/src/main/java/eu/eudat/documents/types/ParagraphStyle.java b/dmp-backend/web/src/main/java/eu/eudat/documents/types/ParagraphStyle.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/documents/types/ParagraphStyle.java rename to dmp-backend/web/src/main/java/eu/eudat/documents/types/ParagraphStyle.java diff --git a/dmp-backend/src/main/java/eu/eudat/documents/types/TextStyle.java b/dmp-backend/web/src/main/java/eu/eudat/documents/types/TextStyle.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/documents/types/TextStyle.java rename to dmp-backend/web/src/main/java/eu/eudat/documents/types/TextStyle.java diff --git a/dmp-backend/src/main/java/eu/eudat/documents/word/WordBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/documents/word/WordBuilder.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/documents/word/WordBuilder.java rename to dmp-backend/web/src/main/java/eu/eudat/documents/word/WordBuilder.java diff --git a/dmp-backend/src/main/java/eu/eudat/documents/xml/ExportXmlBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/documents/xml/ExportXmlBuilder.java similarity index 99% rename from dmp-backend/src/main/java/eu/eudat/documents/xml/ExportXmlBuilder.java rename to dmp-backend/web/src/main/java/eu/eudat/documents/xml/ExportXmlBuilder.java index da81a9458..d77c740bf 100644 --- a/dmp-backend/src/main/java/eu/eudat/documents/xml/ExportXmlBuilder.java +++ b/dmp-backend/web/src/main/java/eu/eudat/documents/xml/ExportXmlBuilder.java @@ -9,7 +9,6 @@ import eu.eudat.services.forms.VisibilityRuleService; import eu.eudat.utilities.builders.XmlBuilder; import org.w3c.dom.Document; import org.w3c.dom.Element; -import org.w3c.dom.Text; import java.io.BufferedWriter; import java.io.File; diff --git a/dmp-backend/src/main/java/eu/eudat/entities/Content.java b/dmp-backend/web/src/main/java/eu/eudat/entities/Content.java similarity index 98% rename from dmp-backend/src/main/java/eu/eudat/entities/Content.java rename to dmp-backend/web/src/main/java/eu/eudat/entities/Content.java index 55aa8b8d8..e4d59f681 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/Content.java +++ b/dmp-backend/web/src/main/java/eu/eudat/entities/Content.java @@ -1,5 +1,6 @@ package eu.eudat.entities; +import eu.eudat.queryable.queryableentity.DataEntity; import org.hibernate.annotations.GenericGenerator; import javax.persistence.*; diff --git a/dmp-backend/src/main/java/eu/eudat/entities/Credential.java b/dmp-backend/web/src/main/java/eu/eudat/entities/Credential.java similarity index 98% rename from dmp-backend/src/main/java/eu/eudat/entities/Credential.java rename to dmp-backend/web/src/main/java/eu/eudat/entities/Credential.java index 070d39cb0..08d2e1d0e 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/Credential.java +++ b/dmp-backend/web/src/main/java/eu/eudat/entities/Credential.java @@ -1,5 +1,7 @@ package eu.eudat.entities; +import eu.eudat.queryable.queryableentity.DataEntity; + import javax.persistence.*; import java.util.Date; import java.util.UUID; diff --git a/dmp-backend/src/main/java/eu/eudat/entities/DMP.java b/dmp-backend/web/src/main/java/eu/eudat/entities/DMP.java similarity index 99% rename from dmp-backend/src/main/java/eu/eudat/entities/DMP.java rename to dmp-backend/web/src/main/java/eu/eudat/entities/DMP.java index 4fc6b7215..192142a32 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/DMP.java +++ b/dmp-backend/web/src/main/java/eu/eudat/entities/DMP.java @@ -1,6 +1,7 @@ package eu.eudat.entities; +import eu.eudat.queryable.queryableentity.DataEntity; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; diff --git a/dmp-backend/src/main/java/eu/eudat/entities/DMPOrganisation.java b/dmp-backend/web/src/main/java/eu/eudat/entities/DMPOrganisation.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/entities/DMPOrganisation.java rename to dmp-backend/web/src/main/java/eu/eudat/entities/DMPOrganisation.java diff --git a/dmp-backend/src/main/java/eu/eudat/entities/DMPProfile.java b/dmp-backend/web/src/main/java/eu/eudat/entities/DMPProfile.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/entities/DMPProfile.java rename to dmp-backend/web/src/main/java/eu/eudat/entities/DMPProfile.java diff --git a/dmp-backend/src/main/java/eu/eudat/entities/DMPResearcher.java b/dmp-backend/web/src/main/java/eu/eudat/entities/DMPResearcher.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/entities/DMPResearcher.java rename to dmp-backend/web/src/main/java/eu/eudat/entities/DMPResearcher.java diff --git a/dmp-backend/src/main/java/eu/eudat/entities/DataRepository.java b/dmp-backend/web/src/main/java/eu/eudat/entities/DataRepository.java similarity index 98% rename from dmp-backend/src/main/java/eu/eudat/entities/DataRepository.java rename to dmp-backend/web/src/main/java/eu/eudat/entities/DataRepository.java index 6407186b6..8724f3b2b 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/DataRepository.java +++ b/dmp-backend/web/src/main/java/eu/eudat/entities/DataRepository.java @@ -1,6 +1,7 @@ package eu.eudat.entities; +import eu.eudat.queryable.queryableentity.DataEntity; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; diff --git a/dmp-backend/src/main/java/eu/eudat/entities/Dataset.java b/dmp-backend/web/src/main/java/eu/eudat/entities/Dataset.java similarity index 98% rename from dmp-backend/src/main/java/eu/eudat/entities/Dataset.java rename to dmp-backend/web/src/main/java/eu/eudat/entities/Dataset.java index 519775f5a..070e24359 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/Dataset.java +++ b/dmp-backend/web/src/main/java/eu/eudat/entities/Dataset.java @@ -1,6 +1,7 @@ package eu.eudat.entities; +import eu.eudat.queryable.queryableentity.DataEntity; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; @@ -45,7 +46,7 @@ public class Dataset implements DataEntity { return value; } - public static Dataset.Status fromInteger(int value) { + public static Status fromInteger(int value) { switch (value) { case 0: return SAVED; diff --git a/dmp-backend/src/main/java/eu/eudat/entities/DatasetExternalDataset.java b/dmp-backend/web/src/main/java/eu/eudat/entities/DatasetExternalDataset.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/entities/DatasetExternalDataset.java rename to dmp-backend/web/src/main/java/eu/eudat/entities/DatasetExternalDataset.java diff --git a/dmp-backend/src/main/java/eu/eudat/entities/DatasetProfile.java b/dmp-backend/web/src/main/java/eu/eudat/entities/DatasetProfile.java similarity index 98% rename from dmp-backend/src/main/java/eu/eudat/entities/DatasetProfile.java rename to dmp-backend/web/src/main/java/eu/eudat/entities/DatasetProfile.java index 4ecafda14..748cf632a 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/DatasetProfile.java +++ b/dmp-backend/web/src/main/java/eu/eudat/entities/DatasetProfile.java @@ -1,11 +1,11 @@ package eu.eudat.entities; +import eu.eudat.queryable.queryableentity.DataEntity; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; import javax.persistence.*; -import java.io.Serializable; import java.util.Date; import java.util.Set; import java.util.UUID; diff --git a/dmp-backend/src/main/java/eu/eudat/entities/DatasetProfileRuleset.java b/dmp-backend/web/src/main/java/eu/eudat/entities/DatasetProfileRuleset.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/entities/DatasetProfileRuleset.java rename to dmp-backend/web/src/main/java/eu/eudat/entities/DatasetProfileRuleset.java diff --git a/dmp-backend/src/main/java/eu/eudat/entities/DatasetProfileViewstyle.java b/dmp-backend/web/src/main/java/eu/eudat/entities/DatasetProfileViewstyle.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/entities/DatasetProfileViewstyle.java rename to dmp-backend/web/src/main/java/eu/eudat/entities/DatasetProfileViewstyle.java diff --git a/dmp-backend/src/main/java/eu/eudat/entities/DatasetRegistry.java b/dmp-backend/web/src/main/java/eu/eudat/entities/DatasetRegistry.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/entities/DatasetRegistry.java rename to dmp-backend/web/src/main/java/eu/eudat/entities/DatasetRegistry.java diff --git a/dmp-backend/src/main/java/eu/eudat/entities/DatasetService.java b/dmp-backend/web/src/main/java/eu/eudat/entities/DatasetService.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/entities/DatasetService.java rename to dmp-backend/web/src/main/java/eu/eudat/entities/DatasetService.java diff --git a/dmp-backend/src/main/java/eu/eudat/entities/ExternalDataset.java b/dmp-backend/web/src/main/java/eu/eudat/entities/ExternalDataset.java similarity index 97% rename from dmp-backend/src/main/java/eu/eudat/entities/ExternalDataset.java rename to dmp-backend/web/src/main/java/eu/eudat/entities/ExternalDataset.java index ebe7e438e..41b0814f4 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/ExternalDataset.java +++ b/dmp-backend/web/src/main/java/eu/eudat/entities/ExternalDataset.java @@ -1,5 +1,6 @@ package eu.eudat.entities; +import eu.eudat.queryable.queryableentity.DataEntity; import org.hibernate.annotations.GenericGenerator; import javax.persistence.*; diff --git a/dmp-backend/src/main/java/eu/eudat/entities/Invitation.java b/dmp-backend/web/src/main/java/eu/eudat/entities/Invitation.java similarity index 97% rename from dmp-backend/src/main/java/eu/eudat/entities/Invitation.java rename to dmp-backend/web/src/main/java/eu/eudat/entities/Invitation.java index 04503cca6..c593c1572 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/Invitation.java +++ b/dmp-backend/web/src/main/java/eu/eudat/entities/Invitation.java @@ -1,5 +1,6 @@ package eu.eudat.entities; +import eu.eudat.queryable.queryableentity.DataEntity; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; diff --git a/dmp-backend/src/main/java/eu/eudat/entities/Organisation.java b/dmp-backend/web/src/main/java/eu/eudat/entities/Organisation.java similarity index 98% rename from dmp-backend/src/main/java/eu/eudat/entities/Organisation.java rename to dmp-backend/web/src/main/java/eu/eudat/entities/Organisation.java index 7916166f8..96d161591 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/Organisation.java +++ b/dmp-backend/web/src/main/java/eu/eudat/entities/Organisation.java @@ -1,6 +1,7 @@ package eu.eudat.entities; +import eu.eudat.queryable.queryableentity.DataEntity; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; diff --git a/dmp-backend/src/main/java/eu/eudat/entities/Project.java b/dmp-backend/web/src/main/java/eu/eudat/entities/Project.java similarity index 99% rename from dmp-backend/src/main/java/eu/eudat/entities/Project.java rename to dmp-backend/web/src/main/java/eu/eudat/entities/Project.java index d6d4b4b45..3cec84df1 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/Project.java +++ b/dmp-backend/web/src/main/java/eu/eudat/entities/Project.java @@ -1,9 +1,9 @@ package eu.eudat.entities; +import eu.eudat.queryable.queryableentity.DataEntity; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; -import org.hibernate.annotations.Where; import javax.persistence.*; import java.util.Date; diff --git a/dmp-backend/src/main/java/eu/eudat/entities/Registry.java b/dmp-backend/web/src/main/java/eu/eudat/entities/Registry.java similarity index 98% rename from dmp-backend/src/main/java/eu/eudat/entities/Registry.java rename to dmp-backend/web/src/main/java/eu/eudat/entities/Registry.java index 80e601592..e25d03710 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/Registry.java +++ b/dmp-backend/web/src/main/java/eu/eudat/entities/Registry.java @@ -1,6 +1,7 @@ package eu.eudat.entities; +import eu.eudat.queryable.queryableentity.DataEntity; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; diff --git a/dmp-backend/src/main/java/eu/eudat/entities/Researcher.java b/dmp-backend/web/src/main/java/eu/eudat/entities/Researcher.java similarity index 98% rename from dmp-backend/src/main/java/eu/eudat/entities/Researcher.java rename to dmp-backend/web/src/main/java/eu/eudat/entities/Researcher.java index f37a4a5b8..746d613aa 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/Researcher.java +++ b/dmp-backend/web/src/main/java/eu/eudat/entities/Researcher.java @@ -1,6 +1,7 @@ package eu.eudat.entities; +import eu.eudat.queryable.queryableentity.DataEntity; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; diff --git a/dmp-backend/src/main/java/eu/eudat/entities/Service.java b/dmp-backend/web/src/main/java/eu/eudat/entities/Service.java similarity index 98% rename from dmp-backend/src/main/java/eu/eudat/entities/Service.java rename to dmp-backend/web/src/main/java/eu/eudat/entities/Service.java index 0c03a245e..9106eb2c5 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/Service.java +++ b/dmp-backend/web/src/main/java/eu/eudat/entities/Service.java @@ -1,6 +1,7 @@ package eu.eudat.entities; +import eu.eudat.queryable.queryableentity.DataEntity; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; diff --git a/dmp-backend/src/main/java/eu/eudat/entities/UserDMP.java b/dmp-backend/web/src/main/java/eu/eudat/entities/UserDMP.java similarity index 97% rename from dmp-backend/src/main/java/eu/eudat/entities/UserDMP.java rename to dmp-backend/web/src/main/java/eu/eudat/entities/UserDMP.java index a2235a940..3468854eb 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/UserDMP.java +++ b/dmp-backend/web/src/main/java/eu/eudat/entities/UserDMP.java @@ -1,5 +1,6 @@ package eu.eudat.entities; +import eu.eudat.queryable.queryableentity.DataEntity; import org.hibernate.annotations.GenericGenerator; import javax.persistence.*; diff --git a/dmp-backend/src/main/java/eu/eudat/entities/UserInfo.java b/dmp-backend/web/src/main/java/eu/eudat/entities/UserInfo.java similarity index 98% rename from dmp-backend/src/main/java/eu/eudat/entities/UserInfo.java rename to dmp-backend/web/src/main/java/eu/eudat/entities/UserInfo.java index 07d98095f..847f3d646 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/UserInfo.java +++ b/dmp-backend/web/src/main/java/eu/eudat/entities/UserInfo.java @@ -1,5 +1,6 @@ package eu.eudat.entities; +import eu.eudat.queryable.queryableentity.DataEntity; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; diff --git a/dmp-backend/src/main/java/eu/eudat/entities/UserRole.java b/dmp-backend/web/src/main/java/eu/eudat/entities/UserRole.java similarity index 95% rename from dmp-backend/src/main/java/eu/eudat/entities/UserRole.java rename to dmp-backend/web/src/main/java/eu/eudat/entities/UserRole.java index 0f0f76668..38d8cd9ca 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/UserRole.java +++ b/dmp-backend/web/src/main/java/eu/eudat/entities/UserRole.java @@ -1,5 +1,6 @@ package eu.eudat.entities; +import eu.eudat.queryable.queryableentity.DataEntity; import org.hibernate.annotations.GenericGenerator; import javax.persistence.*; diff --git a/dmp-backend/src/main/java/eu/eudat/entities/UserToken.java b/dmp-backend/web/src/main/java/eu/eudat/entities/UserToken.java similarity index 96% rename from dmp-backend/src/main/java/eu/eudat/entities/UserToken.java rename to dmp-backend/web/src/main/java/eu/eudat/entities/UserToken.java index 940812b84..0c25e1f02 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/UserToken.java +++ b/dmp-backend/web/src/main/java/eu/eudat/entities/UserToken.java @@ -1,5 +1,7 @@ package eu.eudat.entities; +import eu.eudat.queryable.queryableentity.DataEntity; + import javax.persistence.*; import java.util.Date; import java.util.UUID; diff --git a/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/DatabaseViewStyleDefinition.java b/dmp-backend/web/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/DatabaseViewStyleDefinition.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/DatabaseViewStyleDefinition.java rename to dmp-backend/web/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/DatabaseViewStyleDefinition.java diff --git a/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Field.java b/dmp-backend/web/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Field.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Field.java rename to dmp-backend/web/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Field.java diff --git a/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/FieldSet.java b/dmp-backend/web/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/FieldSet.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/FieldSet.java rename to dmp-backend/web/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/FieldSet.java diff --git a/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Page.java b/dmp-backend/web/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Page.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Page.java rename to dmp-backend/web/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Page.java diff --git a/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Section.java b/dmp-backend/web/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Section.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Section.java rename to dmp-backend/web/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Section.java diff --git a/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/ViewStyleModel.java b/dmp-backend/web/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/ViewStyleModel.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/ViewStyleModel.java rename to dmp-backend/web/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/ViewStyleModel.java diff --git a/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/modeldefinition/DatabaseModelDefinition.java b/dmp-backend/web/src/main/java/eu/eudat/entities/xmlmodels/modeldefinition/DatabaseModelDefinition.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/modeldefinition/DatabaseModelDefinition.java rename to dmp-backend/web/src/main/java/eu/eudat/entities/xmlmodels/modeldefinition/DatabaseModelDefinition.java diff --git a/dmp-backend/src/main/java/eu/eudat/exceptions/datamanagementplan/DMPWithDatasetsException.java b/dmp-backend/web/src/main/java/eu/eudat/exceptions/datamanagementplan/DMPWithDatasetsException.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/exceptions/datamanagementplan/DMPWithDatasetsException.java rename to dmp-backend/web/src/main/java/eu/eudat/exceptions/datamanagementplan/DMPWithDatasetsException.java diff --git a/dmp-backend/src/main/java/eu/eudat/exceptions/files/TempFileNotFoundException.java b/dmp-backend/web/src/main/java/eu/eudat/exceptions/files/TempFileNotFoundException.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/exceptions/files/TempFileNotFoundException.java rename to dmp-backend/web/src/main/java/eu/eudat/exceptions/files/TempFileNotFoundException.java diff --git a/dmp-backend/src/main/java/eu/eudat/exceptions/security/NonValidTokenException.java b/dmp-backend/web/src/main/java/eu/eudat/exceptions/security/NonValidTokenException.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/exceptions/security/NonValidTokenException.java rename to dmp-backend/web/src/main/java/eu/eudat/exceptions/security/NonValidTokenException.java diff --git a/dmp-backend/src/main/java/eu/eudat/exceptions/security/UnauthorisedException.java b/dmp-backend/web/src/main/java/eu/eudat/exceptions/security/UnauthorisedException.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/exceptions/security/UnauthorisedException.java rename to dmp-backend/web/src/main/java/eu/eudat/exceptions/security/UnauthorisedException.java diff --git a/dmp-backend/src/main/java/eu/eudat/handlers/PrincipalArgumentResolver.java b/dmp-backend/web/src/main/java/eu/eudat/handlers/PrincipalArgumentResolver.java similarity index 97% rename from dmp-backend/src/main/java/eu/eudat/handlers/PrincipalArgumentResolver.java rename to dmp-backend/web/src/main/java/eu/eudat/handlers/PrincipalArgumentResolver.java index 7930fd947..5289f4e3b 100644 --- a/dmp-backend/src/main/java/eu/eudat/handlers/PrincipalArgumentResolver.java +++ b/dmp-backend/web/src/main/java/eu/eudat/handlers/PrincipalArgumentResolver.java @@ -4,7 +4,6 @@ import eu.eudat.exceptions.security.UnauthorisedException; import eu.eudat.models.security.Principal; import eu.eudat.security.claims.ClaimedAuthorities; import eu.eudat.services.operations.AuthenticationService; -import eu.eudat.services.operations.AuthenticationServiceImpl; import eu.eudat.types.Authorities; import org.springframework.core.MethodParameter; import org.springframework.web.bind.support.WebDataBinderFactory; diff --git a/dmp-backend/src/main/java/eu/eudat/managers/AdminManager.java b/dmp-backend/web/src/main/java/eu/eudat/managers/AdminManager.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/managers/AdminManager.java rename to dmp-backend/web/src/main/java/eu/eudat/managers/AdminManager.java diff --git a/dmp-backend/src/main/java/eu/eudat/managers/DashBoardManager.java b/dmp-backend/web/src/main/java/eu/eudat/managers/DashBoardManager.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/managers/DashBoardManager.java rename to dmp-backend/web/src/main/java/eu/eudat/managers/DashBoardManager.java diff --git a/dmp-backend/src/main/java/eu/eudat/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/managers/DataManagementPlanManager.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/managers/DataManagementPlanManager.java rename to dmp-backend/web/src/main/java/eu/eudat/managers/DataManagementPlanManager.java diff --git a/dmp-backend/src/main/java/eu/eudat/managers/DatasetManager.java b/dmp-backend/web/src/main/java/eu/eudat/managers/DatasetManager.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/managers/DatasetManager.java rename to dmp-backend/web/src/main/java/eu/eudat/managers/DatasetManager.java diff --git a/dmp-backend/src/main/java/eu/eudat/managers/DatasetProfileManager.java b/dmp-backend/web/src/main/java/eu/eudat/managers/DatasetProfileManager.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/managers/DatasetProfileManager.java rename to dmp-backend/web/src/main/java/eu/eudat/managers/DatasetProfileManager.java diff --git a/dmp-backend/src/main/java/eu/eudat/managers/DatasetWizardManager.java b/dmp-backend/web/src/main/java/eu/eudat/managers/DatasetWizardManager.java similarity index 98% rename from dmp-backend/src/main/java/eu/eudat/managers/DatasetWizardManager.java rename to dmp-backend/web/src/main/java/eu/eudat/managers/DatasetWizardManager.java index 40cb2cb7e..481224ff6 100644 --- a/dmp-backend/src/main/java/eu/eudat/managers/DatasetWizardManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/managers/DatasetWizardManager.java @@ -13,7 +13,6 @@ import eu.eudat.queryable.QueryableList; import java.util.LinkedList; import java.util.List; -import java.util.stream.Collectors; public class DatasetWizardManager { diff --git a/dmp-backend/src/main/java/eu/eudat/managers/ExternalDatasetManager.java b/dmp-backend/web/src/main/java/eu/eudat/managers/ExternalDatasetManager.java similarity index 98% rename from dmp-backend/src/main/java/eu/eudat/managers/ExternalDatasetManager.java rename to dmp-backend/web/src/main/java/eu/eudat/managers/ExternalDatasetManager.java index 456ce7eca..312d16239 100644 --- a/dmp-backend/src/main/java/eu/eudat/managers/ExternalDatasetManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/managers/ExternalDatasetManager.java @@ -16,7 +16,6 @@ import eu.eudat.services.ApiContext; import java.util.List; import java.util.UUID; -import java.util.stream.Collectors; public class ExternalDatasetManager { diff --git a/dmp-backend/src/main/java/eu/eudat/managers/FileManager.java b/dmp-backend/web/src/main/java/eu/eudat/managers/FileManager.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/managers/FileManager.java rename to dmp-backend/web/src/main/java/eu/eudat/managers/FileManager.java diff --git a/dmp-backend/src/main/java/eu/eudat/managers/InvitationsManager.java b/dmp-backend/web/src/main/java/eu/eudat/managers/InvitationsManager.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/managers/InvitationsManager.java rename to dmp-backend/web/src/main/java/eu/eudat/managers/InvitationsManager.java diff --git a/dmp-backend/src/main/java/eu/eudat/managers/PaginationManager.java b/dmp-backend/web/src/main/java/eu/eudat/managers/PaginationManager.java similarity index 98% rename from dmp-backend/src/main/java/eu/eudat/managers/PaginationManager.java rename to dmp-backend/web/src/main/java/eu/eudat/managers/PaginationManager.java index d7bce76ac..8fe5e98ef 100644 --- a/dmp-backend/src/main/java/eu/eudat/managers/PaginationManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/managers/PaginationManager.java @@ -1,10 +1,10 @@ package eu.eudat.managers; -import eu.eudat.entities.DataEntity; import eu.eudat.models.helpers.common.ColumnOrderings; import eu.eudat.models.helpers.common.Ordering; import eu.eudat.models.helpers.requests.TableRequest; import eu.eudat.queryable.QueryableList; +import eu.eudat.queryable.queryableentity.DataEntity; import java.util.Arrays; import java.util.Collection; diff --git a/dmp-backend/src/main/java/eu/eudat/managers/ProjectManager.java b/dmp-backend/web/src/main/java/eu/eudat/managers/ProjectManager.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/managers/ProjectManager.java rename to dmp-backend/web/src/main/java/eu/eudat/managers/ProjectManager.java diff --git a/dmp-backend/src/main/java/eu/eudat/managers/ResearcherManager.java b/dmp-backend/web/src/main/java/eu/eudat/managers/ResearcherManager.java similarity index 97% rename from dmp-backend/src/main/java/eu/eudat/managers/ResearcherManager.java rename to dmp-backend/web/src/main/java/eu/eudat/managers/ResearcherManager.java index 3b0a72193..23b7d5a85 100644 --- a/dmp-backend/src/main/java/eu/eudat/managers/ResearcherManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/managers/ResearcherManager.java @@ -3,7 +3,6 @@ package eu.eudat.managers; import eu.eudat.builders.model.models.ResearcherBuilder; import eu.eudat.entities.Researcher; import eu.eudat.models.external.ExternalSourcesItemModel; -import eu.eudat.models.external.ProjectsExternalSourcesModel; import eu.eudat.models.external.ResearchersExternalSourcesModel; import eu.eudat.models.researcher.ResearcherCriteriaRequest; import eu.eudat.proxy.config.exceptions.HugeResultSet; diff --git a/dmp-backend/src/main/java/eu/eudat/managers/UserManager.java b/dmp-backend/web/src/main/java/eu/eudat/managers/UserManager.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/managers/UserManager.java rename to dmp-backend/web/src/main/java/eu/eudat/managers/UserManager.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/DataModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/DataModel.java similarity index 77% rename from dmp-backend/src/main/java/eu/eudat/models/DataModel.java rename to dmp-backend/web/src/main/java/eu/eudat/models/DataModel.java index 25412ddc1..2333d33f8 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/DataModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/DataModel.java @@ -1,6 +1,7 @@ package eu.eudat.models; -import eu.eudat.entities.DataEntity; + +import eu.eudat.queryable.queryableentity.DataEntity; public interface DataModel { M fromDataModel(T entity); diff --git a/dmp-backend/src/main/java/eu/eudat/models/HintedModelFactory.java b/dmp-backend/web/src/main/java/eu/eudat/models/HintedModelFactory.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/HintedModelFactory.java rename to dmp-backend/web/src/main/java/eu/eudat/models/HintedModelFactory.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/admin/components/datasetprofile/Field.java b/dmp-backend/web/src/main/java/eu/eudat/models/admin/components/datasetprofile/Field.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/admin/components/datasetprofile/Field.java rename to dmp-backend/web/src/main/java/eu/eudat/models/admin/components/datasetprofile/Field.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/admin/components/datasetprofile/FieldSet.java b/dmp-backend/web/src/main/java/eu/eudat/models/admin/components/datasetprofile/FieldSet.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/admin/components/datasetprofile/FieldSet.java rename to dmp-backend/web/src/main/java/eu/eudat/models/admin/components/datasetprofile/FieldSet.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/admin/components/datasetprofile/Page.java b/dmp-backend/web/src/main/java/eu/eudat/models/admin/components/datasetprofile/Page.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/admin/components/datasetprofile/Page.java rename to dmp-backend/web/src/main/java/eu/eudat/models/admin/components/datasetprofile/Page.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/admin/components/datasetprofile/Section.java b/dmp-backend/web/src/main/java/eu/eudat/models/admin/components/datasetprofile/Section.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/admin/components/datasetprofile/Section.java rename to dmp-backend/web/src/main/java/eu/eudat/models/admin/components/datasetprofile/Section.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/admin/composite/DatasetProfile.java b/dmp-backend/web/src/main/java/eu/eudat/models/admin/composite/DatasetProfile.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/admin/composite/DatasetProfile.java rename to dmp-backend/web/src/main/java/eu/eudat/models/admin/composite/DatasetProfile.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/DefaultValue.java b/dmp-backend/web/src/main/java/eu/eudat/models/components/commons/DefaultValue.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/components/commons/DefaultValue.java rename to dmp-backend/web/src/main/java/eu/eudat/models/components/commons/DefaultValue.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/Multiplicity.java b/dmp-backend/web/src/main/java/eu/eudat/models/components/commons/Multiplicity.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/components/commons/Multiplicity.java rename to dmp-backend/web/src/main/java/eu/eudat/models/components/commons/Multiplicity.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/Rule.java b/dmp-backend/web/src/main/java/eu/eudat/models/components/commons/Rule.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/components/commons/Rule.java rename to dmp-backend/web/src/main/java/eu/eudat/models/components/commons/Rule.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/ViewStyle.java b/dmp-backend/web/src/main/java/eu/eudat/models/components/commons/ViewStyle.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/components/commons/ViewStyle.java rename to dmp-backend/web/src/main/java/eu/eudat/models/components/commons/ViewStyle.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/Visibility.java b/dmp-backend/web/src/main/java/eu/eudat/models/components/commons/Visibility.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/components/commons/Visibility.java rename to dmp-backend/web/src/main/java/eu/eudat/models/components/commons/Visibility.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/AutoCompleteData.java b/dmp-backend/web/src/main/java/eu/eudat/models/components/commons/datafield/AutoCompleteData.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/AutoCompleteData.java rename to dmp-backend/web/src/main/java/eu/eudat/models/components/commons/datafield/AutoCompleteData.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/BooleanDecisionData.java b/dmp-backend/web/src/main/java/eu/eudat/models/components/commons/datafield/BooleanDecisionData.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/BooleanDecisionData.java rename to dmp-backend/web/src/main/java/eu/eudat/models/components/commons/datafield/BooleanDecisionData.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/CheckBoxData.java b/dmp-backend/web/src/main/java/eu/eudat/models/components/commons/datafield/CheckBoxData.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/CheckBoxData.java rename to dmp-backend/web/src/main/java/eu/eudat/models/components/commons/datafield/CheckBoxData.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/ComboBoxData.java b/dmp-backend/web/src/main/java/eu/eudat/models/components/commons/datafield/ComboBoxData.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/ComboBoxData.java rename to dmp-backend/web/src/main/java/eu/eudat/models/components/commons/datafield/ComboBoxData.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/FieldData.java b/dmp-backend/web/src/main/java/eu/eudat/models/components/commons/datafield/FieldData.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/FieldData.java rename to dmp-backend/web/src/main/java/eu/eudat/models/components/commons/datafield/FieldData.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/FreeTextData.java b/dmp-backend/web/src/main/java/eu/eudat/models/components/commons/datafield/FreeTextData.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/FreeTextData.java rename to dmp-backend/web/src/main/java/eu/eudat/models/components/commons/datafield/FreeTextData.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/RadioBoxData.java b/dmp-backend/web/src/main/java/eu/eudat/models/components/commons/datafield/RadioBoxData.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/RadioBoxData.java rename to dmp-backend/web/src/main/java/eu/eudat/models/components/commons/datafield/RadioBoxData.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/TextAreaData.java b/dmp-backend/web/src/main/java/eu/eudat/models/components/commons/datafield/TextAreaData.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/TextAreaData.java rename to dmp-backend/web/src/main/java/eu/eudat/models/components/commons/datafield/TextAreaData.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/WordListData.java b/dmp-backend/web/src/main/java/eu/eudat/models/components/commons/datafield/WordListData.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/WordListData.java rename to dmp-backend/web/src/main/java/eu/eudat/models/components/commons/datafield/WordListData.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/Criteria.java b/dmp-backend/web/src/main/java/eu/eudat/models/criteria/Criteria.java similarity index 81% rename from dmp-backend/src/main/java/eu/eudat/models/criteria/Criteria.java rename to dmp-backend/web/src/main/java/eu/eudat/models/criteria/Criteria.java index bbf65f7ed..bc595b509 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/criteria/Criteria.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/criteria/Criteria.java @@ -1,6 +1,7 @@ package eu.eudat.models.criteria; -import eu.eudat.entities.DataEntity; + +import eu.eudat.queryable.queryableentity.DataEntity; public abstract class Criteria { private String like; diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/DataManagementPlanCriteria.java b/dmp-backend/web/src/main/java/eu/eudat/models/criteria/DataManagementPlanCriteria.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/criteria/DataManagementPlanCriteria.java rename to dmp-backend/web/src/main/java/eu/eudat/models/criteria/DataManagementPlanCriteria.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/DataRepositoryCriteria.java b/dmp-backend/web/src/main/java/eu/eudat/models/criteria/DataRepositoryCriteria.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/criteria/DataRepositoryCriteria.java rename to dmp-backend/web/src/main/java/eu/eudat/models/criteria/DataRepositoryCriteria.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/DatasetCriteria.java b/dmp-backend/web/src/main/java/eu/eudat/models/criteria/DatasetCriteria.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/criteria/DatasetCriteria.java rename to dmp-backend/web/src/main/java/eu/eudat/models/criteria/DatasetCriteria.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/DatasetProfileCriteria.java b/dmp-backend/web/src/main/java/eu/eudat/models/criteria/DatasetProfileCriteria.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/criteria/DatasetProfileCriteria.java rename to dmp-backend/web/src/main/java/eu/eudat/models/criteria/DatasetProfileCriteria.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/DatasetProfileWizardCriteria.java b/dmp-backend/web/src/main/java/eu/eudat/models/criteria/DatasetProfileWizardCriteria.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/criteria/DatasetProfileWizardCriteria.java rename to dmp-backend/web/src/main/java/eu/eudat/models/criteria/DatasetProfileWizardCriteria.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/DatasetWizardUserDmpCriteria.java b/dmp-backend/web/src/main/java/eu/eudat/models/criteria/DatasetWizardUserDmpCriteria.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/criteria/DatasetWizardUserDmpCriteria.java rename to dmp-backend/web/src/main/java/eu/eudat/models/criteria/DatasetWizardUserDmpCriteria.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/ExternalDatasetCriteria.java b/dmp-backend/web/src/main/java/eu/eudat/models/criteria/ExternalDatasetCriteria.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/criteria/ExternalDatasetCriteria.java rename to dmp-backend/web/src/main/java/eu/eudat/models/criteria/ExternalDatasetCriteria.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/InvitationCriteria.java b/dmp-backend/web/src/main/java/eu/eudat/models/criteria/InvitationCriteria.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/criteria/InvitationCriteria.java rename to dmp-backend/web/src/main/java/eu/eudat/models/criteria/InvitationCriteria.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/OrganisationCriteria.java b/dmp-backend/web/src/main/java/eu/eudat/models/criteria/OrganisationCriteria.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/criteria/OrganisationCriteria.java rename to dmp-backend/web/src/main/java/eu/eudat/models/criteria/OrganisationCriteria.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/ProjectCriteria.java b/dmp-backend/web/src/main/java/eu/eudat/models/criteria/ProjectCriteria.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/criteria/ProjectCriteria.java rename to dmp-backend/web/src/main/java/eu/eudat/models/criteria/ProjectCriteria.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/RegistryCriteria.java b/dmp-backend/web/src/main/java/eu/eudat/models/criteria/RegistryCriteria.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/criteria/RegistryCriteria.java rename to dmp-backend/web/src/main/java/eu/eudat/models/criteria/RegistryCriteria.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/ResearcherCriteria.java b/dmp-backend/web/src/main/java/eu/eudat/models/criteria/ResearcherCriteria.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/criteria/ResearcherCriteria.java rename to dmp-backend/web/src/main/java/eu/eudat/models/criteria/ResearcherCriteria.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/ServiceCriteria.java b/dmp-backend/web/src/main/java/eu/eudat/models/criteria/ServiceCriteria.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/criteria/ServiceCriteria.java rename to dmp-backend/web/src/main/java/eu/eudat/models/criteria/ServiceCriteria.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/UserInfoCriteria.java b/dmp-backend/web/src/main/java/eu/eudat/models/criteria/UserInfoCriteria.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/criteria/UserInfoCriteria.java rename to dmp-backend/web/src/main/java/eu/eudat/models/criteria/UserInfoCriteria.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/UserRoleCriteria.java b/dmp-backend/web/src/main/java/eu/eudat/models/criteria/UserRoleCriteria.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/criteria/UserRoleCriteria.java rename to dmp-backend/web/src/main/java/eu/eudat/models/criteria/UserRoleCriteria.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/dashboard/recent/RecentActivity.java b/dmp-backend/web/src/main/java/eu/eudat/models/dashboard/recent/RecentActivity.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/dashboard/recent/RecentActivity.java rename to dmp-backend/web/src/main/java/eu/eudat/models/dashboard/recent/RecentActivity.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/dashboard/recent/RecentActivityData.java b/dmp-backend/web/src/main/java/eu/eudat/models/dashboard/recent/RecentActivityData.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/dashboard/recent/RecentActivityData.java rename to dmp-backend/web/src/main/java/eu/eudat/models/dashboard/recent/RecentActivityData.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/dashboard/statistics/DashBoardStatistics.java b/dmp-backend/web/src/main/java/eu/eudat/models/dashboard/statistics/DashBoardStatistics.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/dashboard/statistics/DashBoardStatistics.java rename to dmp-backend/web/src/main/java/eu/eudat/models/dashboard/statistics/DashBoardStatistics.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/dataset/DataRepository.java b/dmp-backend/web/src/main/java/eu/eudat/models/dataset/DataRepository.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/dataset/DataRepository.java rename to dmp-backend/web/src/main/java/eu/eudat/models/dataset/DataRepository.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/dataset/Dataset.java b/dmp-backend/web/src/main/java/eu/eudat/models/dataset/Dataset.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/dataset/Dataset.java rename to dmp-backend/web/src/main/java/eu/eudat/models/dataset/Dataset.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/dataset/DatasetTableRequest.java b/dmp-backend/web/src/main/java/eu/eudat/models/dataset/DatasetTableRequest.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/dataset/DatasetTableRequest.java rename to dmp-backend/web/src/main/java/eu/eudat/models/dataset/DatasetTableRequest.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/dataset/Registry.java b/dmp-backend/web/src/main/java/eu/eudat/models/dataset/Registry.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/dataset/Registry.java rename to dmp-backend/web/src/main/java/eu/eudat/models/dataset/Registry.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/dataset/Service.java b/dmp-backend/web/src/main/java/eu/eudat/models/dataset/Service.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/dataset/Service.java rename to dmp-backend/web/src/main/java/eu/eudat/models/dataset/Service.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileAutocompleteItem.java b/dmp-backend/web/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileAutocompleteItem.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileAutocompleteItem.java rename to dmp-backend/web/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileAutocompleteItem.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileAutocompleteRequest.java b/dmp-backend/web/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileAutocompleteRequest.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileAutocompleteRequest.java rename to dmp-backend/web/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileAutocompleteRequest.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileListingModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileListingModel.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileListingModel.java rename to dmp-backend/web/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileListingModel.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileTableRequestItem.java b/dmp-backend/web/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileTableRequestItem.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileTableRequestItem.java rename to dmp-backend/web/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileTableRequestItem.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/datasetwizard/DataManagentPlanListingModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/datasetwizard/DataManagentPlanListingModel.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/datasetwizard/DataManagentPlanListingModel.java rename to dmp-backend/web/src/main/java/eu/eudat/models/datasetwizard/DataManagentPlanListingModel.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/datasetwizard/DatasetProfileWizardAutocompleteRequest.java b/dmp-backend/web/src/main/java/eu/eudat/models/datasetwizard/DatasetProfileWizardAutocompleteRequest.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/datasetwizard/DatasetProfileWizardAutocompleteRequest.java rename to dmp-backend/web/src/main/java/eu/eudat/models/datasetwizard/DatasetProfileWizardAutocompleteRequest.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/datasetwizard/DatasetWizardAutocompleteRequest.java b/dmp-backend/web/src/main/java/eu/eudat/models/datasetwizard/DatasetWizardAutocompleteRequest.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/datasetwizard/DatasetWizardAutocompleteRequest.java rename to dmp-backend/web/src/main/java/eu/eudat/models/datasetwizard/DatasetWizardAutocompleteRequest.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/datasetwizard/DatasetWizardModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/datasetwizard/DatasetWizardModel.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/datasetwizard/DatasetWizardModel.java rename to dmp-backend/web/src/main/java/eu/eudat/models/datasetwizard/DatasetWizardModel.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/dmp/AssociatedProfile.java b/dmp-backend/web/src/main/java/eu/eudat/models/dmp/AssociatedProfile.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/dmp/AssociatedProfile.java rename to dmp-backend/web/src/main/java/eu/eudat/models/dmp/AssociatedProfile.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/dmp/DataManagementPlan.java b/dmp-backend/web/src/main/java/eu/eudat/models/dmp/DataManagementPlan.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/dmp/DataManagementPlan.java rename to dmp-backend/web/src/main/java/eu/eudat/models/dmp/DataManagementPlan.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/dmp/DataManagementPlanCriteriaRequest.java b/dmp-backend/web/src/main/java/eu/eudat/models/dmp/DataManagementPlanCriteriaRequest.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/dmp/DataManagementPlanCriteriaRequest.java rename to dmp-backend/web/src/main/java/eu/eudat/models/dmp/DataManagementPlanCriteriaRequest.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/dmp/DataManagementPlanNewVersionModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/dmp/DataManagementPlanNewVersionModel.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/dmp/DataManagementPlanNewVersionModel.java rename to dmp-backend/web/src/main/java/eu/eudat/models/dmp/DataManagementPlanNewVersionModel.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/dmp/DataManagementPlanTableRequest.java b/dmp-backend/web/src/main/java/eu/eudat/models/dmp/DataManagementPlanTableRequest.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/dmp/DataManagementPlanTableRequest.java rename to dmp-backend/web/src/main/java/eu/eudat/models/dmp/DataManagementPlanTableRequest.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/dmp/Organisation.java b/dmp-backend/web/src/main/java/eu/eudat/models/dmp/Organisation.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/dmp/Organisation.java rename to dmp-backend/web/src/main/java/eu/eudat/models/dmp/Organisation.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/dmp/Researcher.java b/dmp-backend/web/src/main/java/eu/eudat/models/dmp/Researcher.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/dmp/Researcher.java rename to dmp-backend/web/src/main/java/eu/eudat/models/dmp/Researcher.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/errormodels/ValidationErrorContext.java b/dmp-backend/web/src/main/java/eu/eudat/models/errormodels/ValidationErrorContext.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/errormodels/ValidationErrorContext.java rename to dmp-backend/web/src/main/java/eu/eudat/models/errormodels/ValidationErrorContext.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/external/ExternalDatasetModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/external/ExternalDatasetModel.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/external/ExternalDatasetModel.java rename to dmp-backend/web/src/main/java/eu/eudat/models/external/ExternalDatasetModel.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/external/ExternalItem.java b/dmp-backend/web/src/main/java/eu/eudat/models/external/ExternalItem.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/external/ExternalItem.java rename to dmp-backend/web/src/main/java/eu/eudat/models/external/ExternalItem.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/external/ExternalListingItem.java b/dmp-backend/web/src/main/java/eu/eudat/models/external/ExternalListingItem.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/external/ExternalListingItem.java rename to dmp-backend/web/src/main/java/eu/eudat/models/external/ExternalListingItem.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/external/ExternalSourcesItemModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/external/ExternalSourcesItemModel.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/external/ExternalSourcesItemModel.java rename to dmp-backend/web/src/main/java/eu/eudat/models/external/ExternalSourcesItemModel.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/external/OrganisationsExternalSourcesModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/external/OrganisationsExternalSourcesModel.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/external/OrganisationsExternalSourcesModel.java rename to dmp-backend/web/src/main/java/eu/eudat/models/external/OrganisationsExternalSourcesModel.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/external/ProjectsExternalSourcesModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/external/ProjectsExternalSourcesModel.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/external/ProjectsExternalSourcesModel.java rename to dmp-backend/web/src/main/java/eu/eudat/models/external/ProjectsExternalSourcesModel.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/external/RegistriesExternalSourcesModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/external/RegistriesExternalSourcesModel.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/external/RegistriesExternalSourcesModel.java rename to dmp-backend/web/src/main/java/eu/eudat/models/external/RegistriesExternalSourcesModel.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/external/ResearchersExternalSourcesModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/external/ResearchersExternalSourcesModel.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/external/ResearchersExternalSourcesModel.java rename to dmp-backend/web/src/main/java/eu/eudat/models/external/ResearchersExternalSourcesModel.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/external/ServiceExternalSourcesModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/external/ServiceExternalSourcesModel.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/external/ServiceExternalSourcesModel.java rename to dmp-backend/web/src/main/java/eu/eudat/models/external/ServiceExternalSourcesModel.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/externaldataset/ExternalDatasetListingModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/externaldataset/ExternalDatasetListingModel.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/externaldataset/ExternalDatasetListingModel.java rename to dmp-backend/web/src/main/java/eu/eudat/models/externaldataset/ExternalDatasetListingModel.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/externaldataset/ExternalDatasetTableRequest.java b/dmp-backend/web/src/main/java/eu/eudat/models/externaldataset/ExternalDatasetTableRequest.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/externaldataset/ExternalDatasetTableRequest.java rename to dmp-backend/web/src/main/java/eu/eudat/models/externaldataset/ExternalDatasetTableRequest.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/files/ContentFile.java b/dmp-backend/web/src/main/java/eu/eudat/models/files/ContentFile.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/files/ContentFile.java rename to dmp-backend/web/src/main/java/eu/eudat/models/files/ContentFile.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/helpers/common/AutoCompleteLookupItem.java b/dmp-backend/web/src/main/java/eu/eudat/models/helpers/common/AutoCompleteLookupItem.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/helpers/common/AutoCompleteLookupItem.java rename to dmp-backend/web/src/main/java/eu/eudat/models/helpers/common/AutoCompleteLookupItem.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/helpers/common/ColumnOrderings.java b/dmp-backend/web/src/main/java/eu/eudat/models/helpers/common/ColumnOrderings.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/helpers/common/ColumnOrderings.java rename to dmp-backend/web/src/main/java/eu/eudat/models/helpers/common/ColumnOrderings.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/helpers/common/DataTableData.java b/dmp-backend/web/src/main/java/eu/eudat/models/helpers/common/DataTableData.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/helpers/common/DataTableData.java rename to dmp-backend/web/src/main/java/eu/eudat/models/helpers/common/DataTableData.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/helpers/common/Ordering.java b/dmp-backend/web/src/main/java/eu/eudat/models/helpers/common/Ordering.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/helpers/common/Ordering.java rename to dmp-backend/web/src/main/java/eu/eudat/models/helpers/common/Ordering.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/helpers/common/SelectionFields.java b/dmp-backend/web/src/main/java/eu/eudat/models/helpers/common/SelectionFields.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/helpers/common/SelectionFields.java rename to dmp-backend/web/src/main/java/eu/eudat/models/helpers/common/SelectionFields.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/helpers/requests/RequestItem.java b/dmp-backend/web/src/main/java/eu/eudat/models/helpers/requests/RequestItem.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/helpers/requests/RequestItem.java rename to dmp-backend/web/src/main/java/eu/eudat/models/helpers/requests/RequestItem.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/helpers/requests/TableRequest.java b/dmp-backend/web/src/main/java/eu/eudat/models/helpers/requests/TableRequest.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/helpers/requests/TableRequest.java rename to dmp-backend/web/src/main/java/eu/eudat/models/helpers/requests/TableRequest.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/helpers/responses/ResponseItem.java b/dmp-backend/web/src/main/java/eu/eudat/models/helpers/responses/ResponseItem.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/helpers/responses/ResponseItem.java rename to dmp-backend/web/src/main/java/eu/eudat/models/helpers/responses/ResponseItem.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/invitation/Invitation.java b/dmp-backend/web/src/main/java/eu/eudat/models/invitation/Invitation.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/invitation/Invitation.java rename to dmp-backend/web/src/main/java/eu/eudat/models/invitation/Invitation.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/listingmodels/DataManagementPlanListingModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/listingmodels/DataManagementPlanListingModel.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/listingmodels/DataManagementPlanListingModel.java rename to dmp-backend/web/src/main/java/eu/eudat/models/listingmodels/DataManagementPlanListingModel.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/listingmodels/DatasetListingModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/listingmodels/DatasetListingModel.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/listingmodels/DatasetListingModel.java rename to dmp-backend/web/src/main/java/eu/eudat/models/listingmodels/DatasetListingModel.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/login/Credentials.java b/dmp-backend/web/src/main/java/eu/eudat/models/login/Credentials.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/login/Credentials.java rename to dmp-backend/web/src/main/java/eu/eudat/models/login/Credentials.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/login/LoginInfo.java b/dmp-backend/web/src/main/java/eu/eudat/models/login/LoginInfo.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/login/LoginInfo.java rename to dmp-backend/web/src/main/java/eu/eudat/models/login/LoginInfo.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/loginprovider/LoginProviderUser.java b/dmp-backend/web/src/main/java/eu/eudat/models/loginprovider/LoginProviderUser.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/loginprovider/LoginProviderUser.java rename to dmp-backend/web/src/main/java/eu/eudat/models/loginprovider/LoginProviderUser.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/mail/SimpleMail.java b/dmp-backend/web/src/main/java/eu/eudat/models/mail/SimpleMail.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/mail/SimpleMail.java rename to dmp-backend/web/src/main/java/eu/eudat/models/mail/SimpleMail.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/project/Project.java b/dmp-backend/web/src/main/java/eu/eudat/models/project/Project.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/project/Project.java rename to dmp-backend/web/src/main/java/eu/eudat/models/project/Project.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/project/ProjectCriteriaModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/project/ProjectCriteriaModel.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/project/ProjectCriteriaModel.java rename to dmp-backend/web/src/main/java/eu/eudat/models/project/ProjectCriteriaModel.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/project/ProjectCriteriaRequest.java b/dmp-backend/web/src/main/java/eu/eudat/models/project/ProjectCriteriaRequest.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/project/ProjectCriteriaRequest.java rename to dmp-backend/web/src/main/java/eu/eudat/models/project/ProjectCriteriaRequest.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/project/ProjectListingModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/project/ProjectListingModel.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/project/ProjectListingModel.java rename to dmp-backend/web/src/main/java/eu/eudat/models/project/ProjectListingModel.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/project/ProjectTableRequest.java b/dmp-backend/web/src/main/java/eu/eudat/models/project/ProjectTableRequest.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/project/ProjectTableRequest.java rename to dmp-backend/web/src/main/java/eu/eudat/models/project/ProjectTableRequest.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/properties/DatasetProfilePage.java b/dmp-backend/web/src/main/java/eu/eudat/models/properties/DatasetProfilePage.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/properties/DatasetProfilePage.java rename to dmp-backend/web/src/main/java/eu/eudat/models/properties/DatasetProfilePage.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/properties/Field.java b/dmp-backend/web/src/main/java/eu/eudat/models/properties/Field.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/properties/Field.java rename to dmp-backend/web/src/main/java/eu/eudat/models/properties/Field.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/properties/FieldSet.java b/dmp-backend/web/src/main/java/eu/eudat/models/properties/FieldSet.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/properties/FieldSet.java rename to dmp-backend/web/src/main/java/eu/eudat/models/properties/FieldSet.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/properties/Group.java b/dmp-backend/web/src/main/java/eu/eudat/models/properties/Group.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/properties/Group.java rename to dmp-backend/web/src/main/java/eu/eudat/models/properties/Group.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/properties/PropertiesGenerator.java b/dmp-backend/web/src/main/java/eu/eudat/models/properties/PropertiesGenerator.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/properties/PropertiesGenerator.java rename to dmp-backend/web/src/main/java/eu/eudat/models/properties/PropertiesGenerator.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/properties/PropertiesModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/properties/PropertiesModel.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/properties/PropertiesModel.java rename to dmp-backend/web/src/main/java/eu/eudat/models/properties/PropertiesModel.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/properties/Section.java b/dmp-backend/web/src/main/java/eu/eudat/models/properties/Section.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/properties/Section.java rename to dmp-backend/web/src/main/java/eu/eudat/models/properties/Section.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/researcher/Researcher.java b/dmp-backend/web/src/main/java/eu/eudat/models/researcher/Researcher.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/researcher/Researcher.java rename to dmp-backend/web/src/main/java/eu/eudat/models/researcher/Researcher.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/researcher/ResearcherCriteriaRequest.java b/dmp-backend/web/src/main/java/eu/eudat/models/researcher/ResearcherCriteriaRequest.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/researcher/ResearcherCriteriaRequest.java rename to dmp-backend/web/src/main/java/eu/eudat/models/researcher/ResearcherCriteriaRequest.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/security/Principal.java b/dmp-backend/web/src/main/java/eu/eudat/models/security/Principal.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/security/Principal.java rename to dmp-backend/web/src/main/java/eu/eudat/models/security/Principal.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/urls/DataManagementPlanUrlListing.java b/dmp-backend/web/src/main/java/eu/eudat/models/urls/DataManagementPlanUrlListing.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/urls/DataManagementPlanUrlListing.java rename to dmp-backend/web/src/main/java/eu/eudat/models/urls/DataManagementPlanUrlListing.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/urls/UrlListing.java b/dmp-backend/web/src/main/java/eu/eudat/models/urls/UrlListing.java similarity index 90% rename from dmp-backend/src/main/java/eu/eudat/models/urls/UrlListing.java rename to dmp-backend/web/src/main/java/eu/eudat/models/urls/UrlListing.java index c28b744cb..826d54afd 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/urls/UrlListing.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/urls/UrlListing.java @@ -1,7 +1,6 @@ package eu.eudat.models.urls; - -import eu.eudat.entities.DataEntity; import eu.eudat.models.DataModel; +import eu.eudat.queryable.queryableentity.DataEntity; /** * Created by ikalyvas on 3/19/2018. diff --git a/dmp-backend/src/main/java/eu/eudat/models/user/components/commons/Rule.java b/dmp-backend/web/src/main/java/eu/eudat/models/user/components/commons/Rule.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/user/components/commons/Rule.java rename to dmp-backend/web/src/main/java/eu/eudat/models/user/components/commons/Rule.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/user/components/datasetprofile/Field.java b/dmp-backend/web/src/main/java/eu/eudat/models/user/components/datasetprofile/Field.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/user/components/datasetprofile/Field.java rename to dmp-backend/web/src/main/java/eu/eudat/models/user/components/datasetprofile/Field.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/user/components/datasetprofile/FieldSet.java b/dmp-backend/web/src/main/java/eu/eudat/models/user/components/datasetprofile/FieldSet.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/user/components/datasetprofile/FieldSet.java rename to dmp-backend/web/src/main/java/eu/eudat/models/user/components/datasetprofile/FieldSet.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/user/components/datasetprofile/Section.java b/dmp-backend/web/src/main/java/eu/eudat/models/user/components/datasetprofile/Section.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/user/components/datasetprofile/Section.java rename to dmp-backend/web/src/main/java/eu/eudat/models/user/components/datasetprofile/Section.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/user/composite/DatasetProfile.java b/dmp-backend/web/src/main/java/eu/eudat/models/user/composite/DatasetProfile.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/user/composite/DatasetProfile.java rename to dmp-backend/web/src/main/java/eu/eudat/models/user/composite/DatasetProfile.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/user/composite/DatasetProfilePage.java b/dmp-backend/web/src/main/java/eu/eudat/models/user/composite/DatasetProfilePage.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/user/composite/DatasetProfilePage.java rename to dmp-backend/web/src/main/java/eu/eudat/models/user/composite/DatasetProfilePage.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/user/composite/PagedDatasetProfile.java b/dmp-backend/web/src/main/java/eu/eudat/models/user/composite/PagedDatasetProfile.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/user/composite/PagedDatasetProfile.java rename to dmp-backend/web/src/main/java/eu/eudat/models/user/composite/PagedDatasetProfile.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/user/composite/PropertiesModelBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/models/user/composite/PropertiesModelBuilder.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/user/composite/PropertiesModelBuilder.java rename to dmp-backend/web/src/main/java/eu/eudat/models/user/composite/PropertiesModelBuilder.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/userinfo/UserInfo.java b/dmp-backend/web/src/main/java/eu/eudat/models/userinfo/UserInfo.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/userinfo/UserInfo.java rename to dmp-backend/web/src/main/java/eu/eudat/models/userinfo/UserInfo.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/userinfo/UserInfoInvitationModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/userinfo/UserInfoInvitationModel.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/userinfo/UserInfoInvitationModel.java rename to dmp-backend/web/src/main/java/eu/eudat/models/userinfo/UserInfoInvitationModel.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/userinfo/UserInfoRequestItem.java b/dmp-backend/web/src/main/java/eu/eudat/models/userinfo/UserInfoRequestItem.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/userinfo/UserInfoRequestItem.java rename to dmp-backend/web/src/main/java/eu/eudat/models/userinfo/UserInfoRequestItem.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/userinfo/UserInfoTableRequestItem.java b/dmp-backend/web/src/main/java/eu/eudat/models/userinfo/UserInfoTableRequestItem.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/userinfo/UserInfoTableRequestItem.java rename to dmp-backend/web/src/main/java/eu/eudat/models/userinfo/UserInfoTableRequestItem.java diff --git a/dmp-backend/src/main/java/eu/eudat/models/userinfo/UserListingModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/userinfo/UserListingModel.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/models/userinfo/UserListingModel.java rename to dmp-backend/web/src/main/java/eu/eudat/models/userinfo/UserListingModel.java diff --git a/dmp-backend/src/main/java/eu/eudat/proxy/Proxy.java b/dmp-backend/web/src/main/java/eu/eudat/proxy/Proxy.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/proxy/Proxy.java rename to dmp-backend/web/src/main/java/eu/eudat/proxy/Proxy.java diff --git a/dmp-backend/src/main/java/eu/eudat/proxy/config/ExternalUrls.java b/dmp-backend/web/src/main/java/eu/eudat/proxy/config/ExternalUrls.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/proxy/config/ExternalUrls.java rename to dmp-backend/web/src/main/java/eu/eudat/proxy/config/ExternalUrls.java diff --git a/dmp-backend/src/main/java/eu/eudat/proxy/config/FetchStrategy.java b/dmp-backend/web/src/main/java/eu/eudat/proxy/config/FetchStrategy.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/proxy/config/FetchStrategy.java rename to dmp-backend/web/src/main/java/eu/eudat/proxy/config/FetchStrategy.java diff --git a/dmp-backend/src/main/java/eu/eudat/proxy/config/UrlConfig.java b/dmp-backend/web/src/main/java/eu/eudat/proxy/config/UrlConfig.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/proxy/config/UrlConfig.java rename to dmp-backend/web/src/main/java/eu/eudat/proxy/config/UrlConfig.java diff --git a/dmp-backend/src/main/java/eu/eudat/proxy/config/configloaders/ConfigLoader.java b/dmp-backend/web/src/main/java/eu/eudat/proxy/config/configloaders/ConfigLoader.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/proxy/config/configloaders/ConfigLoader.java rename to dmp-backend/web/src/main/java/eu/eudat/proxy/config/configloaders/ConfigLoader.java diff --git a/dmp-backend/src/main/java/eu/eudat/proxy/config/configloaders/DevelConfigLoader.java b/dmp-backend/web/src/main/java/eu/eudat/proxy/config/configloaders/DevelConfigLoader.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/proxy/config/configloaders/DevelConfigLoader.java rename to dmp-backend/web/src/main/java/eu/eudat/proxy/config/configloaders/DevelConfigLoader.java diff --git a/dmp-backend/src/main/java/eu/eudat/proxy/config/configloaders/ProductionConfigLoader.java b/dmp-backend/web/src/main/java/eu/eudat/proxy/config/configloaders/ProductionConfigLoader.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/proxy/config/configloaders/ProductionConfigLoader.java rename to dmp-backend/web/src/main/java/eu/eudat/proxy/config/configloaders/ProductionConfigLoader.java diff --git a/dmp-backend/src/main/java/eu/eudat/proxy/config/entities/DatasetUrls.java b/dmp-backend/web/src/main/java/eu/eudat/proxy/config/entities/DatasetUrls.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/proxy/config/entities/DatasetUrls.java rename to dmp-backend/web/src/main/java/eu/eudat/proxy/config/entities/DatasetUrls.java diff --git a/dmp-backend/src/main/java/eu/eudat/proxy/config/entities/OrganisationUrls.java b/dmp-backend/web/src/main/java/eu/eudat/proxy/config/entities/OrganisationUrls.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/proxy/config/entities/OrganisationUrls.java rename to dmp-backend/web/src/main/java/eu/eudat/proxy/config/entities/OrganisationUrls.java diff --git a/dmp-backend/src/main/java/eu/eudat/proxy/config/entities/ProjectUrls.java b/dmp-backend/web/src/main/java/eu/eudat/proxy/config/entities/ProjectUrls.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/proxy/config/entities/ProjectUrls.java rename to dmp-backend/web/src/main/java/eu/eudat/proxy/config/entities/ProjectUrls.java diff --git a/dmp-backend/src/main/java/eu/eudat/proxy/config/entities/RegistryUrls.java b/dmp-backend/web/src/main/java/eu/eudat/proxy/config/entities/RegistryUrls.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/proxy/config/entities/RegistryUrls.java rename to dmp-backend/web/src/main/java/eu/eudat/proxy/config/entities/RegistryUrls.java diff --git a/dmp-backend/src/main/java/eu/eudat/proxy/config/entities/RepositoryUrls.java b/dmp-backend/web/src/main/java/eu/eudat/proxy/config/entities/RepositoryUrls.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/proxy/config/entities/RepositoryUrls.java rename to dmp-backend/web/src/main/java/eu/eudat/proxy/config/entities/RepositoryUrls.java diff --git a/dmp-backend/src/main/java/eu/eudat/proxy/config/entities/ResearcherUrls.java b/dmp-backend/web/src/main/java/eu/eudat/proxy/config/entities/ResearcherUrls.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/proxy/config/entities/ResearcherUrls.java rename to dmp-backend/web/src/main/java/eu/eudat/proxy/config/entities/ResearcherUrls.java diff --git a/dmp-backend/src/main/java/eu/eudat/proxy/config/entities/ServiceUrls.java b/dmp-backend/web/src/main/java/eu/eudat/proxy/config/entities/ServiceUrls.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/proxy/config/entities/ServiceUrls.java rename to dmp-backend/web/src/main/java/eu/eudat/proxy/config/entities/ServiceUrls.java diff --git a/dmp-backend/src/main/java/eu/eudat/proxy/config/exceptions/HugeResultSet.java b/dmp-backend/web/src/main/java/eu/eudat/proxy/config/exceptions/HugeResultSet.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/proxy/config/exceptions/HugeResultSet.java rename to dmp-backend/web/src/main/java/eu/eudat/proxy/config/exceptions/HugeResultSet.java diff --git a/dmp-backend/src/main/java/eu/eudat/proxy/config/exceptions/NoURLFound.java b/dmp-backend/web/src/main/java/eu/eudat/proxy/config/exceptions/NoURLFound.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/proxy/config/exceptions/NoURLFound.java rename to dmp-backend/web/src/main/java/eu/eudat/proxy/config/exceptions/NoURLFound.java diff --git a/dmp-backend/src/main/java/eu/eudat/proxy/fetching/RemoteFetcher.java b/dmp-backend/web/src/main/java/eu/eudat/proxy/fetching/RemoteFetcher.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/proxy/fetching/RemoteFetcher.java rename to dmp-backend/web/src/main/java/eu/eudat/proxy/fetching/RemoteFetcher.java diff --git a/dmp-backend/src/main/java/eu/eudat/security/CustomAuthenticationProvider.java b/dmp-backend/web/src/main/java/eu/eudat/security/CustomAuthenticationProvider.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/security/CustomAuthenticationProvider.java rename to dmp-backend/web/src/main/java/eu/eudat/security/CustomAuthenticationProvider.java diff --git a/dmp-backend/src/main/java/eu/eudat/security/claims/ClaimedAuthorities.java b/dmp-backend/web/src/main/java/eu/eudat/security/claims/ClaimedAuthorities.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/security/claims/ClaimedAuthorities.java rename to dmp-backend/web/src/main/java/eu/eudat/security/claims/ClaimedAuthorities.java diff --git a/dmp-backend/src/main/java/eu/eudat/security/claims/ClaimedRights.java b/dmp-backend/web/src/main/java/eu/eudat/security/claims/ClaimedRights.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/security/claims/ClaimedRights.java rename to dmp-backend/web/src/main/java/eu/eudat/security/claims/ClaimedRights.java diff --git a/dmp-backend/src/main/java/eu/eudat/security/customproviders/B2AccessCustomProvider.java b/dmp-backend/web/src/main/java/eu/eudat/security/customproviders/B2AccessCustomProvider.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/security/customproviders/B2AccessCustomProvider.java rename to dmp-backend/web/src/main/java/eu/eudat/security/customproviders/B2AccessCustomProvider.java diff --git a/dmp-backend/src/main/java/eu/eudat/security/customproviders/B2AccessCustomProviderImpl.java b/dmp-backend/web/src/main/java/eu/eudat/security/customproviders/B2AccessCustomProviderImpl.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/security/customproviders/B2AccessCustomProviderImpl.java rename to dmp-backend/web/src/main/java/eu/eudat/security/customproviders/B2AccessCustomProviderImpl.java diff --git a/dmp-backend/src/main/java/eu/eudat/security/customproviders/B2AccessUser.java b/dmp-backend/web/src/main/java/eu/eudat/security/customproviders/B2AccessUser.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/security/customproviders/B2AccessUser.java rename to dmp-backend/web/src/main/java/eu/eudat/security/customproviders/B2AccessUser.java diff --git a/dmp-backend/src/main/java/eu/eudat/security/validators/TokenValidator.java b/dmp-backend/web/src/main/java/eu/eudat/security/validators/TokenValidator.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/security/validators/TokenValidator.java rename to dmp-backend/web/src/main/java/eu/eudat/security/validators/TokenValidator.java diff --git a/dmp-backend/src/main/java/eu/eudat/security/validators/TokenValidatorFactory.java b/dmp-backend/web/src/main/java/eu/eudat/security/validators/TokenValidatorFactory.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/security/validators/TokenValidatorFactory.java rename to dmp-backend/web/src/main/java/eu/eudat/security/validators/TokenValidatorFactory.java diff --git a/dmp-backend/src/main/java/eu/eudat/security/validators/TokenValidatorFactoryImpl.java b/dmp-backend/web/src/main/java/eu/eudat/security/validators/TokenValidatorFactoryImpl.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/security/validators/TokenValidatorFactoryImpl.java rename to dmp-backend/web/src/main/java/eu/eudat/security/validators/TokenValidatorFactoryImpl.java diff --git a/dmp-backend/src/main/java/eu/eudat/security/validators/b2access/B2AccessTokenValidator.java b/dmp-backend/web/src/main/java/eu/eudat/security/validators/b2access/B2AccessTokenValidator.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/security/validators/b2access/B2AccessTokenValidator.java rename to dmp-backend/web/src/main/java/eu/eudat/security/validators/b2access/B2AccessTokenValidator.java diff --git a/dmp-backend/src/main/java/eu/eudat/security/validators/b2access/helpers/B2AccessRequest.java b/dmp-backend/web/src/main/java/eu/eudat/security/validators/b2access/helpers/B2AccessRequest.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/security/validators/b2access/helpers/B2AccessRequest.java rename to dmp-backend/web/src/main/java/eu/eudat/security/validators/b2access/helpers/B2AccessRequest.java diff --git a/dmp-backend/src/main/java/eu/eudat/security/validators/b2access/helpers/B2AccessResponseToken.java b/dmp-backend/web/src/main/java/eu/eudat/security/validators/b2access/helpers/B2AccessResponseToken.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/security/validators/b2access/helpers/B2AccessResponseToken.java rename to dmp-backend/web/src/main/java/eu/eudat/security/validators/b2access/helpers/B2AccessResponseToken.java diff --git a/dmp-backend/src/main/java/eu/eudat/security/validators/facebook/FacebookTokenValidator.java b/dmp-backend/web/src/main/java/eu/eudat/security/validators/facebook/FacebookTokenValidator.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/security/validators/facebook/FacebookTokenValidator.java rename to dmp-backend/web/src/main/java/eu/eudat/security/validators/facebook/FacebookTokenValidator.java diff --git a/dmp-backend/src/main/java/eu/eudat/security/validators/google/GoogleTokenValidator.java b/dmp-backend/web/src/main/java/eu/eudat/security/validators/google/GoogleTokenValidator.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/security/validators/google/GoogleTokenValidator.java rename to dmp-backend/web/src/main/java/eu/eudat/security/validators/google/GoogleTokenValidator.java diff --git a/dmp-backend/src/main/java/eu/eudat/security/validators/linkedin/LinkedInTokenValidator.java b/dmp-backend/web/src/main/java/eu/eudat/security/validators/linkedin/LinkedInTokenValidator.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/security/validators/linkedin/LinkedInTokenValidator.java rename to dmp-backend/web/src/main/java/eu/eudat/security/validators/linkedin/LinkedInTokenValidator.java diff --git a/dmp-backend/src/main/java/eu/eudat/security/validators/twitter/TwitterTokenValidator.java b/dmp-backend/web/src/main/java/eu/eudat/security/validators/twitter/TwitterTokenValidator.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/security/validators/twitter/TwitterTokenValidator.java rename to dmp-backend/web/src/main/java/eu/eudat/security/validators/twitter/TwitterTokenValidator.java diff --git a/dmp-backend/src/main/java/eu/eudat/services/ApiContext.java b/dmp-backend/web/src/main/java/eu/eudat/services/ApiContext.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/services/ApiContext.java rename to dmp-backend/web/src/main/java/eu/eudat/services/ApiContext.java diff --git a/dmp-backend/src/main/java/eu/eudat/services/ApiContextImpl.java b/dmp-backend/web/src/main/java/eu/eudat/services/ApiContextImpl.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/services/ApiContextImpl.java rename to dmp-backend/web/src/main/java/eu/eudat/services/ApiContextImpl.java diff --git a/dmp-backend/src/main/java/eu/eudat/services/forms/VisibilityContext.java b/dmp-backend/web/src/main/java/eu/eudat/services/forms/VisibilityContext.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/services/forms/VisibilityContext.java rename to dmp-backend/web/src/main/java/eu/eudat/services/forms/VisibilityContext.java diff --git a/dmp-backend/src/main/java/eu/eudat/services/forms/VisibilityRule.java b/dmp-backend/web/src/main/java/eu/eudat/services/forms/VisibilityRule.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/services/forms/VisibilityRule.java rename to dmp-backend/web/src/main/java/eu/eudat/services/forms/VisibilityRule.java diff --git a/dmp-backend/src/main/java/eu/eudat/services/forms/VisibilityRuleService.java b/dmp-backend/web/src/main/java/eu/eudat/services/forms/VisibilityRuleService.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/services/forms/VisibilityRuleService.java rename to dmp-backend/web/src/main/java/eu/eudat/services/forms/VisibilityRuleService.java diff --git a/dmp-backend/src/main/java/eu/eudat/services/forms/VisibilityRuleServiceImpl.java b/dmp-backend/web/src/main/java/eu/eudat/services/forms/VisibilityRuleServiceImpl.java similarity index 96% rename from dmp-backend/src/main/java/eu/eudat/services/forms/VisibilityRuleServiceImpl.java rename to dmp-backend/web/src/main/java/eu/eudat/services/forms/VisibilityRuleServiceImpl.java index e821616b9..2ec1a51a3 100644 --- a/dmp-backend/src/main/java/eu/eudat/services/forms/VisibilityRuleServiceImpl.java +++ b/dmp-backend/web/src/main/java/eu/eudat/services/forms/VisibilityRuleServiceImpl.java @@ -1,7 +1,6 @@ package eu.eudat.services.forms; import eu.eudat.models.user.components.commons.Rule; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.HashMap; diff --git a/dmp-backend/src/main/java/eu/eudat/services/forms/VisibilityRuleSource.java b/dmp-backend/web/src/main/java/eu/eudat/services/forms/VisibilityRuleSource.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/services/forms/VisibilityRuleSource.java rename to dmp-backend/web/src/main/java/eu/eudat/services/forms/VisibilityRuleSource.java diff --git a/dmp-backend/src/main/java/eu/eudat/services/helpers/FileStorageService.java b/dmp-backend/web/src/main/java/eu/eudat/services/helpers/FileStorageService.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/services/helpers/FileStorageService.java rename to dmp-backend/web/src/main/java/eu/eudat/services/helpers/FileStorageService.java diff --git a/dmp-backend/src/main/java/eu/eudat/services/helpers/FileStorageServiceImpl.java b/dmp-backend/web/src/main/java/eu/eudat/services/helpers/FileStorageServiceImpl.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/services/helpers/FileStorageServiceImpl.java rename to dmp-backend/web/src/main/java/eu/eudat/services/helpers/FileStorageServiceImpl.java diff --git a/dmp-backend/src/main/java/eu/eudat/services/helpers/HelpersService.java b/dmp-backend/web/src/main/java/eu/eudat/services/helpers/HelpersService.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/services/helpers/HelpersService.java rename to dmp-backend/web/src/main/java/eu/eudat/services/helpers/HelpersService.java diff --git a/dmp-backend/src/main/java/eu/eudat/services/helpers/HelpersServiceImpl.java b/dmp-backend/web/src/main/java/eu/eudat/services/helpers/HelpersServiceImpl.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/services/helpers/HelpersServiceImpl.java rename to dmp-backend/web/src/main/java/eu/eudat/services/helpers/HelpersServiceImpl.java diff --git a/dmp-backend/src/main/java/eu/eudat/services/helpers/LoggerService.java b/dmp-backend/web/src/main/java/eu/eudat/services/helpers/LoggerService.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/services/helpers/LoggerService.java rename to dmp-backend/web/src/main/java/eu/eudat/services/helpers/LoggerService.java diff --git a/dmp-backend/src/main/java/eu/eudat/services/helpers/LoggerServiceImpl.java b/dmp-backend/web/src/main/java/eu/eudat/services/helpers/LoggerServiceImpl.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/services/helpers/LoggerServiceImpl.java rename to dmp-backend/web/src/main/java/eu/eudat/services/helpers/LoggerServiceImpl.java diff --git a/dmp-backend/src/main/java/eu/eudat/services/operations/AuthenticationService.java b/dmp-backend/web/src/main/java/eu/eudat/services/operations/AuthenticationService.java similarity index 86% rename from dmp-backend/src/main/java/eu/eudat/services/operations/AuthenticationService.java rename to dmp-backend/web/src/main/java/eu/eudat/services/operations/AuthenticationService.java index 7a025b22a..af4583de7 100644 --- a/dmp-backend/src/main/java/eu/eudat/services/operations/AuthenticationService.java +++ b/dmp-backend/web/src/main/java/eu/eudat/services/operations/AuthenticationService.java @@ -1,7 +1,5 @@ package eu.eudat.services.operations; -import eu.eudat.entities.Credential; -import eu.eudat.entities.UserToken; import eu.eudat.models.login.Credentials; import eu.eudat.models.loginprovider.LoginProviderUser; import eu.eudat.models.security.Principal; diff --git a/dmp-backend/src/main/java/eu/eudat/services/operations/AuthenticationServiceImpl.java b/dmp-backend/web/src/main/java/eu/eudat/services/operations/AuthenticationServiceImpl.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/services/operations/AuthenticationServiceImpl.java rename to dmp-backend/web/src/main/java/eu/eudat/services/operations/AuthenticationServiceImpl.java diff --git a/dmp-backend/src/main/java/eu/eudat/services/operations/DatabaseRepository.java b/dmp-backend/web/src/main/java/eu/eudat/services/operations/DatabaseRepository.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/services/operations/DatabaseRepository.java rename to dmp-backend/web/src/main/java/eu/eudat/services/operations/DatabaseRepository.java diff --git a/dmp-backend/src/main/java/eu/eudat/services/operations/DatabaseRepositoryImpl.java b/dmp-backend/web/src/main/java/eu/eudat/services/operations/DatabaseRepositoryImpl.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/services/operations/DatabaseRepositoryImpl.java rename to dmp-backend/web/src/main/java/eu/eudat/services/operations/DatabaseRepositoryImpl.java diff --git a/dmp-backend/src/main/java/eu/eudat/services/operations/OperationsContext.java b/dmp-backend/web/src/main/java/eu/eudat/services/operations/OperationsContext.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/services/operations/OperationsContext.java rename to dmp-backend/web/src/main/java/eu/eudat/services/operations/OperationsContext.java diff --git a/dmp-backend/src/main/java/eu/eudat/services/operations/OperationsContextImpl.java b/dmp-backend/web/src/main/java/eu/eudat/services/operations/OperationsContextImpl.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/services/operations/OperationsContextImpl.java rename to dmp-backend/web/src/main/java/eu/eudat/services/operations/OperationsContextImpl.java diff --git a/dmp-backend/src/main/java/eu/eudat/services/utilities/InvitationService.java b/dmp-backend/web/src/main/java/eu/eudat/services/utilities/InvitationService.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/services/utilities/InvitationService.java rename to dmp-backend/web/src/main/java/eu/eudat/services/utilities/InvitationService.java diff --git a/dmp-backend/src/main/java/eu/eudat/services/utilities/InvitationServiceImpl.java b/dmp-backend/web/src/main/java/eu/eudat/services/utilities/InvitationServiceImpl.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/services/utilities/InvitationServiceImpl.java rename to dmp-backend/web/src/main/java/eu/eudat/services/utilities/InvitationServiceImpl.java diff --git a/dmp-backend/src/main/java/eu/eudat/services/utilities/MailService.java b/dmp-backend/web/src/main/java/eu/eudat/services/utilities/MailService.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/services/utilities/MailService.java rename to dmp-backend/web/src/main/java/eu/eudat/services/utilities/MailService.java diff --git a/dmp-backend/src/main/java/eu/eudat/services/utilities/MailServiceImpl.java b/dmp-backend/web/src/main/java/eu/eudat/services/utilities/MailServiceImpl.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/services/utilities/MailServiceImpl.java rename to dmp-backend/web/src/main/java/eu/eudat/services/utilities/MailServiceImpl.java diff --git a/dmp-backend/src/main/java/eu/eudat/services/utilities/UtilitiesService.java b/dmp-backend/web/src/main/java/eu/eudat/services/utilities/UtilitiesService.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/services/utilities/UtilitiesService.java rename to dmp-backend/web/src/main/java/eu/eudat/services/utilities/UtilitiesService.java diff --git a/dmp-backend/src/main/java/eu/eudat/services/utilities/UtilitiesServiceImpl.java b/dmp-backend/web/src/main/java/eu/eudat/services/utilities/UtilitiesServiceImpl.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/services/utilities/UtilitiesServiceImpl.java rename to dmp-backend/web/src/main/java/eu/eudat/services/utilities/UtilitiesServiceImpl.java diff --git a/dmp-backend/src/main/java/eu/eudat/typedefinition/DataType.java b/dmp-backend/web/src/main/java/eu/eudat/typedefinition/DataType.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/typedefinition/DataType.java rename to dmp-backend/web/src/main/java/eu/eudat/typedefinition/DataType.java diff --git a/dmp-backend/src/main/java/eu/eudat/typedefinition/DatabaseColumnType.java b/dmp-backend/web/src/main/java/eu/eudat/typedefinition/DatabaseColumnType.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/typedefinition/DatabaseColumnType.java rename to dmp-backend/web/src/main/java/eu/eudat/typedefinition/DatabaseColumnType.java diff --git a/dmp-backend/src/main/java/eu/eudat/typedefinition/PostgreSQLDatabaseColumnType.java b/dmp-backend/web/src/main/java/eu/eudat/typedefinition/PostgreSQLDatabaseColumnType.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/typedefinition/PostgreSQLDatabaseColumnType.java rename to dmp-backend/web/src/main/java/eu/eudat/typedefinition/PostgreSQLDatabaseColumnType.java diff --git a/dmp-backend/src/main/java/eu/eudat/typedefinition/UUIDType.java b/dmp-backend/web/src/main/java/eu/eudat/typedefinition/UUIDType.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/typedefinition/UUIDType.java rename to dmp-backend/web/src/main/java/eu/eudat/typedefinition/UUIDType.java diff --git a/dmp-backend/src/main/java/eu/eudat/typedefinition/XMLType.java b/dmp-backend/web/src/main/java/eu/eudat/typedefinition/XMLType.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/typedefinition/XMLType.java rename to dmp-backend/web/src/main/java/eu/eudat/typedefinition/XMLType.java diff --git a/dmp-backend/src/main/java/eu/eudat/types/ApiMessageCode.java b/dmp-backend/web/src/main/java/eu/eudat/types/ApiMessageCode.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/types/ApiMessageCode.java rename to dmp-backend/web/src/main/java/eu/eudat/types/ApiMessageCode.java diff --git a/dmp-backend/src/main/java/eu/eudat/types/ApiResponseType.java b/dmp-backend/web/src/main/java/eu/eudat/types/ApiResponseType.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/types/ApiResponseType.java rename to dmp-backend/web/src/main/java/eu/eudat/types/ApiResponseType.java diff --git a/dmp-backend/src/main/java/eu/eudat/types/Authorities.java b/dmp-backend/web/src/main/java/eu/eudat/types/Authorities.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/types/Authorities.java rename to dmp-backend/web/src/main/java/eu/eudat/types/Authorities.java diff --git a/dmp-backend/src/main/java/eu/eudat/types/Rights.java b/dmp-backend/web/src/main/java/eu/eudat/types/Rights.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/types/Rights.java rename to dmp-backend/web/src/main/java/eu/eudat/types/Rights.java diff --git a/dmp-backend/src/main/java/eu/eudat/types/WarningLevel.java b/dmp-backend/web/src/main/java/eu/eudat/types/WarningLevel.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/types/WarningLevel.java rename to dmp-backend/web/src/main/java/eu/eudat/types/WarningLevel.java diff --git a/dmp-backend/src/main/java/eu/eudat/utilities/builders/ModelBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/utilities/builders/ModelBuilder.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/utilities/builders/ModelBuilder.java rename to dmp-backend/web/src/main/java/eu/eudat/utilities/builders/ModelBuilder.java diff --git a/dmp-backend/src/main/java/eu/eudat/utilities/builders/XmlBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/utilities/builders/XmlBuilder.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/utilities/builders/XmlBuilder.java rename to dmp-backend/web/src/main/java/eu/eudat/utilities/builders/XmlBuilder.java diff --git a/dmp-backend/src/main/java/eu/eudat/utilities/helpers/LabelBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/utilities/helpers/LabelBuilder.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/utilities/helpers/LabelBuilder.java rename to dmp-backend/web/src/main/java/eu/eudat/utilities/helpers/LabelBuilder.java diff --git a/dmp-backend/src/main/java/eu/eudat/utilities/helpers/LabelGenerator.java b/dmp-backend/web/src/main/java/eu/eudat/utilities/helpers/LabelGenerator.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/utilities/helpers/LabelGenerator.java rename to dmp-backend/web/src/main/java/eu/eudat/utilities/helpers/LabelGenerator.java diff --git a/dmp-backend/src/main/java/eu/eudat/utilities/helpers/ModelBuilderCollector.java b/dmp-backend/web/src/main/java/eu/eudat/utilities/helpers/ModelBuilderCollector.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/utilities/helpers/ModelBuilderCollector.java rename to dmp-backend/web/src/main/java/eu/eudat/utilities/helpers/ModelBuilderCollector.java diff --git a/dmp-backend/src/main/java/eu/eudat/utilities/helpers/ModelSerializer.java b/dmp-backend/web/src/main/java/eu/eudat/utilities/helpers/ModelSerializer.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/utilities/helpers/ModelSerializer.java rename to dmp-backend/web/src/main/java/eu/eudat/utilities/helpers/ModelSerializer.java diff --git a/dmp-backend/src/main/java/eu/eudat/utilities/interfaces/Applier.java b/dmp-backend/web/src/main/java/eu/eudat/utilities/interfaces/Applier.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/utilities/interfaces/Applier.java rename to dmp-backend/web/src/main/java/eu/eudat/utilities/interfaces/Applier.java diff --git a/dmp-backend/src/main/java/eu/eudat/utilities/interfaces/ApplierWithValue.java b/dmp-backend/web/src/main/java/eu/eudat/utilities/interfaces/ApplierWithValue.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/utilities/interfaces/ApplierWithValue.java rename to dmp-backend/web/src/main/java/eu/eudat/utilities/interfaces/ApplierWithValue.java diff --git a/dmp-backend/src/main/java/eu/eudat/utilities/interfaces/Cloneable.java b/dmp-backend/web/src/main/java/eu/eudat/utilities/interfaces/Cloneable.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/utilities/interfaces/Cloneable.java rename to dmp-backend/web/src/main/java/eu/eudat/utilities/interfaces/Cloneable.java diff --git a/dmp-backend/src/main/java/eu/eudat/utilities/interfaces/DatabaseDefinition.java b/dmp-backend/web/src/main/java/eu/eudat/utilities/interfaces/DatabaseDefinition.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/utilities/interfaces/DatabaseDefinition.java rename to dmp-backend/web/src/main/java/eu/eudat/utilities/interfaces/DatabaseDefinition.java diff --git a/dmp-backend/src/main/java/eu/eudat/utilities/interfaces/ModelDefinition.java b/dmp-backend/web/src/main/java/eu/eudat/utilities/interfaces/ModelDefinition.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/utilities/interfaces/ModelDefinition.java rename to dmp-backend/web/src/main/java/eu/eudat/utilities/interfaces/ModelDefinition.java diff --git a/dmp-backend/src/main/java/eu/eudat/utilities/interfaces/ModelSerializer.java b/dmp-backend/web/src/main/java/eu/eudat/utilities/interfaces/ModelSerializer.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/utilities/interfaces/ModelSerializer.java rename to dmp-backend/web/src/main/java/eu/eudat/utilities/interfaces/ModelSerializer.java diff --git a/dmp-backend/src/main/java/eu/eudat/utilities/interfaces/ViewStyleDefinition.java b/dmp-backend/web/src/main/java/eu/eudat/utilities/interfaces/ViewStyleDefinition.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/utilities/interfaces/ViewStyleDefinition.java rename to dmp-backend/web/src/main/java/eu/eudat/utilities/interfaces/ViewStyleDefinition.java diff --git a/dmp-backend/src/main/java/eu/eudat/utilities/interfaces/XmlSerializable.java b/dmp-backend/web/src/main/java/eu/eudat/utilities/interfaces/XmlSerializable.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/utilities/interfaces/XmlSerializable.java rename to dmp-backend/web/src/main/java/eu/eudat/utilities/interfaces/XmlSerializable.java diff --git a/dmp-backend/src/main/java/eu/eudat/validators/DataManagementPlanNewVersionValidator.java b/dmp-backend/web/src/main/java/eu/eudat/validators/DataManagementPlanNewVersionValidator.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/validators/DataManagementPlanNewVersionValidator.java rename to dmp-backend/web/src/main/java/eu/eudat/validators/DataManagementPlanNewVersionValidator.java diff --git a/dmp-backend/src/main/java/eu/eudat/validators/DataManagementPlanTableRequestValidator.java b/dmp-backend/web/src/main/java/eu/eudat/validators/DataManagementPlanTableRequestValidator.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/validators/DataManagementPlanTableRequestValidator.java rename to dmp-backend/web/src/main/java/eu/eudat/validators/DataManagementPlanTableRequestValidator.java diff --git a/dmp-backend/src/main/java/eu/eudat/validators/DatasetProfileValidator.java b/dmp-backend/web/src/main/java/eu/eudat/validators/DatasetProfileValidator.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/validators/DatasetProfileValidator.java rename to dmp-backend/web/src/main/java/eu/eudat/validators/DatasetProfileValidator.java diff --git a/dmp-backend/src/main/java/eu/eudat/validators/ProjectModelValidator.java b/dmp-backend/web/src/main/java/eu/eudat/validators/ProjectModelValidator.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/validators/ProjectModelValidator.java rename to dmp-backend/web/src/main/java/eu/eudat/validators/ProjectModelValidator.java diff --git a/dmp-backend/src/main/java/eu/eudat/validators/ProjectTableRequestValidator.java b/dmp-backend/web/src/main/java/eu/eudat/validators/ProjectTableRequestValidator.java similarity index 100% rename from dmp-backend/src/main/java/eu/eudat/validators/ProjectTableRequestValidator.java rename to dmp-backend/web/src/main/java/eu/eudat/validators/ProjectTableRequestValidator.java diff --git a/dmp-backend/src/main/resources/ExternalUrls.xml b/dmp-backend/web/src/main/resources/ExternalUrls.xml similarity index 100% rename from dmp-backend/src/main/resources/ExternalUrls.xml rename to dmp-backend/web/src/main/resources/ExternalUrls.xml diff --git a/dmp-backend/src/main/resources/META-INF/persistence.xml b/dmp-backend/web/src/main/resources/META-INF/persistence.xml similarity index 100% rename from dmp-backend/src/main/resources/META-INF/persistence.xml rename to dmp-backend/web/src/main/resources/META-INF/persistence.xml diff --git a/dmp-backend/src/main/resources/application.properties b/dmp-backend/web/src/main/resources/application.properties similarity index 100% rename from dmp-backend/src/main/resources/application.properties rename to dmp-backend/web/src/main/resources/application.properties diff --git a/dmp-backend/src/main/resources/documents/h2020.docx b/dmp-backend/web/src/main/resources/documents/h2020.docx similarity index 100% rename from dmp-backend/src/main/resources/documents/h2020.docx rename to dmp-backend/web/src/main/resources/documents/h2020.docx diff --git a/dmp-backend/src/main/resources/images/default.png b/dmp-backend/web/src/main/resources/images/default.png similarity index 100% rename from dmp-backend/src/main/resources/images/default.png rename to dmp-backend/web/src/main/resources/images/default.png diff --git a/dmp-backend/src/main/resources/messages.properties b/dmp-backend/web/src/main/resources/messages.properties similarity index 100% rename from dmp-backend/src/main/resources/messages.properties rename to dmp-backend/web/src/main/resources/messages.properties diff --git a/dmp-backend/src/main/resources/messages_el.properties b/dmp-backend/web/src/main/resources/messages_el.properties similarity index 100% rename from dmp-backend/src/main/resources/messages_el.properties rename to dmp-backend/web/src/main/resources/messages_el.properties diff --git a/dmp-backend/src/test/resources/ExternalUrlsTEST.xml b/dmp-backend/web/src/test/resources/ExternalUrlsTEST.xml similarity index 100% rename from dmp-backend/src/test/resources/ExternalUrlsTEST.xml rename to dmp-backend/web/src/test/resources/ExternalUrlsTEST.xml diff --git a/dmp-backend/src/test/resources/applicationContextTEST.xml b/dmp-backend/web/src/test/resources/applicationContextTEST.xml similarity index 100% rename from dmp-backend/src/test/resources/applicationContextTEST.xml rename to dmp-backend/web/src/test/resources/applicationContextTEST.xml diff --git a/dmp-backend/src/test/resources/dmpTEST.properties b/dmp-backend/web/src/test/resources/dmpTEST.properties similarity index 100% rename from dmp-backend/src/test/resources/dmpTEST.properties rename to dmp-backend/web/src/test/resources/dmpTEST.properties