From 6bc2765db8cf859f82d9a3f639aac33842c462f8 Mon Sep 17 00:00:00 2001 From: Sonia Zorba Date: Wed, 17 Aug 2016 10:33:05 +0200 Subject: [PATCH] Packages renaming, added Tomcat support, added README --- README.md | 42 ++++++++++++ .../pom.xml | 3 +- .../api}/ChildEntityImpl.java | 10 +-- .../ia2/tapschemamanager/api}/ColumnImpl.java | 16 ++--- .../tapschemamanager/api}/Credentials.java | 3 +- .../ia2/tapschemamanager/api}/DBWrapper.java | 3 +- .../oats/ia2/tapschemamanager/api}/Dao.java | 57 ++++++++-------- .../ia2/tapschemamanager/api}/DaoColumn.java | 19 +++--- .../ia2/tapschemamanager/api}/DaoKey.java | 35 +++++----- .../ia2/tapschemamanager/api}/DaoSchema.java | 13 ++-- .../ia2/tapschemamanager/api}/DaoTable.java | 25 +++---- .../api}/EditableProperty.java | 2 +- .../tapschemamanager/api}/EntityProperty.java | 2 +- .../api}/EntityPropertyInfo.java | 20 +++--- .../api}/FixedEntityProperty.java | 2 +- .../api}/InconsistentTapSchemaException.java | 2 +- .../api}/InsertQueryBuilder.java | 11 ++-- .../tapschemamanager/api}/KeyColumnImpl.java | 8 +-- .../ia2/tapschemamanager/api}/KeyImpl.java | 8 +-- .../ia2/tapschemamanager/api}/SchemaImpl.java | 18 +++--- .../api}/SelectQueryBuilder.java | 13 ++-- .../ia2/tapschemamanager/api/TSMUtil.java | 33 +++++----- .../ia2/tapschemamanager/api}/TableImpl.java | 22 +++---- .../api}/TapSchemaEntityImpl.java | 14 ++-- .../api}/TapSchemaFactory.java | 6 +- .../tapschemamanager/api}/TapSchemaImpl.java | 42 ++++++++---- .../api}/UpdateOperations.java | 18 +++--- .../api}/UpdateQueryBuilder.java | 11 ++-- .../api}/contract/ChildEntity.java | 2 +- .../api}/contract/Column.java | 2 +- .../api/contract}/DatabaseType.java | 2 +- .../api}/contract/EntitiesContainer.java | 2 +- .../tapschemamanager/api}/contract/Key.java | 2 +- .../api}/contract/KeyColumn.java | 2 +- .../api}/contract/Schema.java | 2 +- .../api}/contract/Status.java | 2 +- .../tapschemamanager/api}/contract/Table.java | 2 +- .../api}/contract/TapSchema.java | 2 +- .../api}/contract/TapSchemaEntity.java | 2 +- .../api}/contract/TapSchemaVersion.java | 2 +- .../src/main/resources/log4j.properties | 0 .../ia2/tapschemamanager/api}/TestAll.java | 24 ++++--- .../main/resources/META-INF/persistence.xml | 17 ----- .../pom.xml | 61 +++++++++++++++++- .../webapp/CredentialsBean.java | 4 +- .../webapp/CredentialsConfiguration.java | 2 +- .../webapp/CustomPartialResponseWriter.java | 0 .../CustomPartialViewContextFactory.java | 0 .../CustomPartialViewContextWrapper.java | 0 .../webapp/JSUpdateHandler.java | 0 .../tapschemamanager/webapp/ParsedUCD.java | 0 .../webapp/SchemaSelectionBean.java | 12 ++-- .../tapschemamanager/webapp/SearchUCD.java | 0 .../webapp/SearchUCDDialog.java | 0 .../webapp/SeparateCredentials.java | 2 +- .../webapp/TapSchemaEditingBean.java | 22 +++---- .../ia2/tapschemamanager/webapp/UCDInfo.java | 0 .../webapp/UCDServiceException.java | 0 .../webapp/WebAppConfigurationBean.java | 0 .../src/main/resources/log4j.properties | 0 .../src/main/resources/webapp.properties | 0 .../src/main/webapp/WEB-INF/beans.xml | 0 .../src/main/webapp/WEB-INF/faces-config.xml | 0 .../webapp/WEB-INF/templates/master.xhtml | 0 .../src/main/webapp/WEB-INF/web.xml | 4 ++ .../src/main/webapp/expired.xhtml | 0 .../src/main/webapp/index.xhtml | 0 .../main/webapp/resources/css/animation.css | 0 .../resources/css/bootstrap-theme.min.css | 0 .../main/webapp/resources/css/bootstrap.css | 0 .../main/webapp/resources/css/fontello.css | 0 .../src/main/webapp/resources/css/style.css | 0 .../main/webapp/resources/fonts/fontello.eot | Bin .../main/webapp/resources/fonts/fontello.svg | 0 .../main/webapp/resources/fonts/fontello.ttf | Bin .../main/webapp/resources/fonts/fontello.woff | Bin .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../fonts/glyphicons-halflings-regular.woff2 | Bin .../main/webapp/resources/js/credentials.js | 0 .../webapp/resources/js/edit-tapschema.js | 0 .../webapp/resources/js/lib/bootstrap.min.js | 0 .../resources/js/lib/jquery-1.11.3.min.js | 0 .../src/main/webapp/schemaSelection.xhtml | 0 .../src/main/webapp/tapSchemaEditing.xhtml | 0 .../src/test/java/TapSchemaMangerTest.java | 2 +- 88 files changed, 374 insertions(+), 258 deletions(-) create mode 100644 README.md rename {TapSchemaManagerDL => TapSchemaManagerAPI}/pom.xml (95%) rename {TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer => TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api}/ChildEntityImpl.java (72%) rename {TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer => TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api}/ColumnImpl.java (94%) rename {TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer => TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api}/Credentials.java (96%) rename {TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer => TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api}/DBWrapper.java (98%) rename {TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer => TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api}/Dao.java (94%) rename {TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer => TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api}/DaoColumn.java (93%) rename {TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer => TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api}/DaoKey.java (94%) rename {TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer => TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api}/DaoSchema.java (90%) rename {TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer => TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api}/DaoTable.java (87%) rename {TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer => TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api}/EditableProperty.java (97%) rename {TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer => TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api}/EntityProperty.java (87%) rename {TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer => TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api}/EntityPropertyInfo.java (93%) rename {TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer => TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api}/FixedEntityProperty.java (93%) rename {TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer => TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api}/InconsistentTapSchemaException.java (85%) rename {TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer => TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api}/InsertQueryBuilder.java (86%) rename {TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer => TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api}/KeyColumnImpl.java (92%) rename {TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer => TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api}/KeyImpl.java (96%) rename {TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer => TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api}/SchemaImpl.java (93%) rename {TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer => TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api}/SelectQueryBuilder.java (85%) rename TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/DLUtil.java => TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/TSMUtil.java (90%) rename {TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer => TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api}/TableImpl.java (93%) rename {TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer => TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api}/TapSchemaEntityImpl.java (87%) rename {TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer => TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api}/TapSchemaFactory.java (75%) rename {TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer => TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api}/TapSchemaImpl.java (90%) rename {TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer => TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api}/UpdateOperations.java (93%) rename {TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer => TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api}/UpdateQueryBuilder.java (85%) rename {TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager => TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api}/contract/ChildEntity.java (92%) rename {TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager => TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api}/contract/Column.java (98%) rename {TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer => TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/contract}/DatabaseType.java (74%) rename {TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager => TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api}/contract/EntitiesContainer.java (97%) rename {TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager => TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api}/contract/Key.java (97%) rename {TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager => TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api}/contract/KeyColumn.java (94%) rename {TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager => TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api}/contract/Schema.java (93%) rename {TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager => TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api}/contract/Status.java (94%) rename {TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager => TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api}/contract/Table.java (97%) rename {TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager => TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api}/contract/TapSchema.java (94%) rename {TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager => TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api}/contract/TapSchemaEntity.java (96%) rename {TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager => TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api}/contract/TapSchemaVersion.java (89%) rename {TapSchemaManager => TapSchemaManagerAPI}/src/main/resources/log4j.properties (100%) rename {TapSchemaManagerDL/src/test/java/it/inaf/oats/ia2/tapschemamanager/datalayer => TapSchemaManagerAPI/src/test/java/it/inaf/oats/ia2/tapschemamanager/api}/TestAll.java (97%) delete mode 100644 TapSchemaManagerDL/src/main/resources/META-INF/persistence.xml rename {TapSchemaManager => TapSchemaManagerWebApp}/pom.xml (64%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/CredentialsBean.java (97%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/CredentialsConfiguration.java (94%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/CustomPartialResponseWriter.java (100%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/CustomPartialViewContextFactory.java (100%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/CustomPartialViewContextWrapper.java (100%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/JSUpdateHandler.java (100%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/ParsedUCD.java (100%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/SchemaSelectionBean.java (94%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/SearchUCD.java (100%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/SearchUCDDialog.java (100%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/SeparateCredentials.java (94%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/TapSchemaEditingBean.java (93%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/UCDInfo.java (100%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/UCDServiceException.java (100%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/WebAppConfigurationBean.java (100%) rename {TapSchemaManagerDL => TapSchemaManagerWebApp}/src/main/resources/log4j.properties (100%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/resources/webapp.properties (100%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/webapp/WEB-INF/beans.xml (100%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/webapp/WEB-INF/faces-config.xml (100%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/webapp/WEB-INF/templates/master.xhtml (100%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/webapp/WEB-INF/web.xml (93%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/webapp/expired.xhtml (100%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/webapp/index.xhtml (100%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/webapp/resources/css/animation.css (100%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/webapp/resources/css/bootstrap-theme.min.css (100%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/webapp/resources/css/bootstrap.css (100%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/webapp/resources/css/fontello.css (100%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/webapp/resources/css/style.css (100%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/webapp/resources/fonts/fontello.eot (100%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/webapp/resources/fonts/fontello.svg (100%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/webapp/resources/fonts/fontello.ttf (100%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/webapp/resources/fonts/fontello.woff (100%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/webapp/resources/fonts/glyphicons-halflings-regular.eot (100%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/webapp/resources/fonts/glyphicons-halflings-regular.svg (100%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/webapp/resources/fonts/glyphicons-halflings-regular.ttf (100%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/webapp/resources/fonts/glyphicons-halflings-regular.woff (100%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/webapp/resources/fonts/glyphicons-halflings-regular.woff2 (100%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/webapp/resources/js/credentials.js (100%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/webapp/resources/js/edit-tapschema.js (100%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/webapp/resources/js/lib/bootstrap.min.js (100%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/webapp/resources/js/lib/jquery-1.11.3.min.js (100%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/webapp/schemaSelection.xhtml (100%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/main/webapp/tapSchemaEditing.xhtml (100%) rename {TapSchemaManager => TapSchemaManagerWebApp}/src/test/java/TapSchemaMangerTest.java (96%) diff --git a/README.md b/README.md new file mode 100644 index 0000000..821f424 --- /dev/null +++ b/README.md @@ -0,0 +1,42 @@ + +# TAP_SCHEMA Manager + +## Build + +### Build the API + + cd TapSchemaManagerAPI + mvn install + +### Build the Web application + + cd TapSchemaManagerWebApp + +Edit configuration properties file (`src/main/resources/webapp.properties`): + + ucd_service_url= + credentials_config_path= + password= + +IA2 UCD service is at http://ia2-vo.oats.inaf.it:8080/ucd/ + +If the UCD web service is unreachable the web app will work anyway, but without the UCD search functionality. + +Then build the web application: + +* GlassFish war package (default): + + mvn install + +* Tomcat war package: + + mvn -P Tomcat install + +## Supported application servers + +The web app was tested with: + +* GlassFish 4.1 +* Tomcat 8.0.33 + +The web app relies on specific JSF and EL versions, so it could not work in different application servers without a proper configuration. diff --git a/TapSchemaManagerDL/pom.xml b/TapSchemaManagerAPI/pom.xml similarity index 95% rename from TapSchemaManagerDL/pom.xml rename to TapSchemaManagerAPI/pom.xml index ac98f02..1e5d5d4 100644 --- a/TapSchemaManagerDL/pom.xml +++ b/TapSchemaManagerAPI/pom.xml @@ -2,7 +2,7 @@ 4.0.0 it.inaf.oats.ia2 - TapSchemaManagerDL + TapSchemaManagerAPI 1.0-SNAPSHOT jar @@ -46,4 +46,5 @@ + TapSchemaManagerAPI \ No newline at end of file diff --git a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/ChildEntityImpl.java b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/ChildEntityImpl.java similarity index 72% rename from TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/ChildEntityImpl.java rename to TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/ChildEntityImpl.java index 831e302..ce162e0 100644 --- a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/ChildEntityImpl.java +++ b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/ChildEntityImpl.java @@ -1,9 +1,9 @@ -package it.inaf.oats.ia2.tapschemamanager.datalayer; +package it.inaf.oats.ia2.tapschemamanager.api; -import it.inaf.oats.ia2.tapschemamanager.contract.ChildEntity; -import it.inaf.oats.ia2.tapschemamanager.contract.EntitiesContainer; -import it.inaf.oats.ia2.tapschemamanager.contract.Status; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchema; +import it.inaf.oats.ia2.tapschemamanager.api.contract.ChildEntity; +import it.inaf.oats.ia2.tapschemamanager.api.contract.EntitiesContainer; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Status; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchema; /** * The main implementation of {@link ChildEntity}. diff --git a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/ColumnImpl.java b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/ColumnImpl.java similarity index 94% rename from TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/ColumnImpl.java rename to TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/ColumnImpl.java index 9029780..f8710ca 100644 --- a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/ColumnImpl.java +++ b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/ColumnImpl.java @@ -1,11 +1,11 @@ -package it.inaf.oats.ia2.tapschemamanager.datalayer; - -import it.inaf.oats.ia2.tapschemamanager.contract.Column; -import it.inaf.oats.ia2.tapschemamanager.contract.Key; -import it.inaf.oats.ia2.tapschemamanager.contract.KeyColumn; -import it.inaf.oats.ia2.tapschemamanager.contract.Status; -import it.inaf.oats.ia2.tapschemamanager.contract.Table; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchema; +package it.inaf.oats.ia2.tapschemamanager.api; + +import it.inaf.oats.ia2.tapschemamanager.api.contract.Column; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Key; +import it.inaf.oats.ia2.tapschemamanager.api.contract.KeyColumn; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Status; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Table; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchema; import java.util.Objects; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/Credentials.java b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/Credentials.java similarity index 96% rename from TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/Credentials.java rename to TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/Credentials.java index 8dd6fce..ac8d965 100644 --- a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/Credentials.java +++ b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/Credentials.java @@ -1,5 +1,6 @@ -package it.inaf.oats.ia2.tapschemamanager.datalayer; +package it.inaf.oats.ia2.tapschemamanager.api; +import it.inaf.oats.ia2.tapschemamanager.api.contract.DatabaseType; import java.io.Serializable; import javax.xml.bind.annotation.XmlAttribute; import org.slf4j.Logger; diff --git a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/DBWrapper.java b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/DBWrapper.java similarity index 98% rename from TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/DBWrapper.java rename to TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/DBWrapper.java index 2bf4617..ff6d5e6 100644 --- a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/DBWrapper.java +++ b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/DBWrapper.java @@ -1,5 +1,6 @@ -package it.inaf.oats.ia2.tapschemamanager.datalayer; +package it.inaf.oats.ia2.tapschemamanager.api; +import it.inaf.oats.ia2.tapschemamanager.api.contract.DatabaseType; import com.mysql.jdbc.jdbc2.optional.MysqlDataSource; import java.io.Serializable; import java.sql.Connection; diff --git a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/Dao.java b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/Dao.java similarity index 94% rename from TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/Dao.java rename to TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/Dao.java index 9943584..d5d7daf 100644 --- a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/Dao.java +++ b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/Dao.java @@ -1,13 +1,14 @@ -package it.inaf.oats.ia2.tapschemamanager.datalayer; - -import it.inaf.oats.ia2.tapschemamanager.contract.Column; -import it.inaf.oats.ia2.tapschemamanager.contract.Key; -import it.inaf.oats.ia2.tapschemamanager.contract.KeyColumn; -import it.inaf.oats.ia2.tapschemamanager.contract.Schema; -import it.inaf.oats.ia2.tapschemamanager.contract.Status; -import it.inaf.oats.ia2.tapschemamanager.contract.Table; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchema; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchemaVersion; +package it.inaf.oats.ia2.tapschemamanager.api; + +import it.inaf.oats.ia2.tapschemamanager.api.contract.DatabaseType; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Column; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Key; +import it.inaf.oats.ia2.tapschemamanager.api.contract.KeyColumn; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Schema; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Status; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Table; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchema; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchemaVersion; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -57,7 +58,7 @@ public class Dao { querySb.append("schema_name varchar(64),\n"); querySb.append("utype varchar(512) NULL,\n"); querySb.append("description varchar(512) NULL,\n"); - if (DLUtil.isIA2(version)) { + if (TSMUtil.isIA2(version)) { querySb.append("schemaID bigint,\n"); } querySb.append("PRIMARY KEY (schema_name))"); @@ -79,7 +80,7 @@ public class Dao { querySb.append("table_type varchar(8),\n"); querySb.append("utype varchar(512) NULL,\n"); querySb.append("description varchar(512) NULL,\n"); - if (DLUtil.isIA2(version)) { + if (TSMUtil.isIA2(version)) { querySb.append("tableID bigint,\n"); } querySb.append("PRIMARY KEY (table_name),\n"); @@ -110,7 +111,7 @@ public class Dao { querySb.append("principal integer NOT NULL,\n"); querySb.append("indexed integer NOT NULL,\n"); querySb.append("std integer NOT NULL,\n"); - if (DLUtil.isIA2(version)) { + if (TSMUtil.isIA2(version)) { querySb.append("columnID bigint,\n"); } querySb.append("PRIMARY KEY (table_name, column_name),\n"); @@ -135,7 +136,7 @@ public class Dao { querySb.append("target_table varchar(128) NOT NULL,\n"); querySb.append("utype varchar(512) NULL,\n"); querySb.append("description varchar(512) NULL,\n"); - if (DLUtil.isIA2(version)) { + if (TSMUtil.isIA2(version)) { querySb.append("keyID bigint,\n"); } querySb.append("PRIMARY KEY (key_id),\n"); @@ -161,7 +162,7 @@ public class Dao { querySb.append("key_id varchar(64),\n"); querySb.append("from_column varchar(64) NOT NULL,\n"); querySb.append("target_column varchar(64) NOT NULL,\n"); - if (DLUtil.isIA2(version)) { + if (TSMUtil.isIA2(version)) { querySb.append("key_columnID bigint,\n"); } querySb.append("FOREIGN KEY (key_id) REFERENCES `"); @@ -175,7 +176,7 @@ public class Dao { } } else if (dbType == DatabaseType.POSTGRES) { try (Statement statement = conn.createStatement()) { - String tapSchemaNameEscaped = DLUtil.escapeName(tapSchemaName, dbType); + String tapSchemaNameEscaped = TSMUtil.escapeName(tapSchemaName, dbType); statement.executeUpdate("CREATE SCHEMA IF NOT EXISTS " + tapSchemaNameEscaped); @@ -189,7 +190,7 @@ public class Dao { querySb.append(".schemas (\n"); querySb.append("schema_name character varying(64) NOT NULL,\n"); querySb.append("description character varying(512),\n"); - if (DLUtil.isIA2(version)) { + if (TSMUtil.isIA2(version)) { querySb.append("schemaid bigint,\n"); } querySb.append("utype character varying(512))"); @@ -217,7 +218,7 @@ public class Dao { querySb.append("table_name character varying(128) NOT NULL,\n"); querySb.append("description character varying(512),\n"); querySb.append("schema_name character varying(64),\n"); - if (DLUtil.isIA2(version)) { + if (TSMUtil.isIA2(version)) { querySb.append("tableid bigint,\n"); } querySb.append("table_type character varying(8),\n"); @@ -248,7 +249,7 @@ public class Dao { querySb.append(".columns (\n"); querySb.append("table_name character varying(128) NOT NULL,\n"); querySb.append("column_name character varying(64) NOT NULL,\n"); - if (DLUtil.isIA2(version)) { + if (TSMUtil.isIA2(version)) { querySb.append("columnid bigint,\n"); } querySb.append("datatype character varying(64),\n"); @@ -288,7 +289,7 @@ public class Dao { querySb.append("key_id character varying(64) NOT NULL,\n"); querySb.append("description character varying(512),\n"); querySb.append("from_table character varying(128),\n"); - if (DLUtil.isIA2(version)) { + if (TSMUtil.isIA2(version)) { querySb.append("keyid bigint,\n"); } querySb.append("target_table character varying(128),\n"); @@ -322,7 +323,7 @@ public class Dao { querySb.append(".key_columns (\n"); querySb.append("from_column character varying(64) NOT NULL,\n"); querySb.append("target_column character varying(64) NOT NULL,\n"); - if (DLUtil.isIA2(version)) { + if (TSMUtil.isIA2(version)) { querySb.append("key_columnid bigint,\n"); } querySb.append("key_id character varying(64) NOT NULL)"); @@ -371,20 +372,20 @@ public class Dao { connection.setAutoCommit(false); // start transaction transactionStarted = true; - String tapSchemaNameEscaped = DLUtil.escapeName(tapSchema.getName(), dbType); + String tapSchemaNameEscaped = TSMUtil.escapeName(tapSchema.getName(), dbType); // REMOVE ELEMENTS if (tapSchema.exists()) { for (Key key : operations.getKeysToRemove()) { String keyId = key.getId(); - String query = String.format("DELETE FROM %s.%s WHERE key_id = ?", tapSchemaNameEscaped, DLUtil.escapeName("key_columns", dbType)); + String query = String.format("DELETE FROM %s.%s WHERE key_id = ?", tapSchemaNameEscaped, TSMUtil.escapeName("key_columns", dbType)); statement = connection.prepareStatement(query); statement.setString(1, keyId); log.debug("Executing query {} [key_id={}]", query, keyId); statement.executeUpdate(); - query = String.format("DELETE FROM %s.%s WHERE key_id = ?", tapSchemaNameEscaped, DLUtil.escapeName("keys", dbType)); + query = String.format("DELETE FROM %s.%s WHERE key_id = ?", tapSchemaNameEscaped, TSMUtil.escapeName("keys", dbType)); statement = connection.prepareStatement(query); statement.setString(1, keyId); log.debug("Executing query {} [key_id={}]", query, keyId); @@ -392,7 +393,7 @@ public class Dao { } for (Column column : operations.getColumnsToRemove()) { - String query = String.format("DELETE FROM %s.%s WHERE table_name = ? AND column_name = ?", tapSchemaNameEscaped, DLUtil.escapeName("columns", dbType)); + String query = String.format("DELETE FROM %s.%s WHERE table_name = ? AND column_name = ?", tapSchemaNameEscaped, TSMUtil.escapeName("columns", dbType)); statement = connection.prepareStatement(query); String tableName = column.getTableCompleteName(); String columnName = column.getName(); @@ -403,7 +404,7 @@ public class Dao { } for (Table table : operations.getTablesToRemove()) { - String query = String.format("DELETE FROM %s.%s WHERE table_name = ?", tapSchemaNameEscaped, DLUtil.escapeName("tables", dbType)); + String query = String.format("DELETE FROM %s.%s WHERE table_name = ?", tapSchemaNameEscaped, TSMUtil.escapeName("tables", dbType)); statement = connection.prepareStatement(query); String tableCompleteName = table.getCompleteName(); statement.setString(1, tableCompleteName); @@ -412,7 +413,7 @@ public class Dao { } for (Schema schema : operations.getSchemasToRemove()) { - String query = String.format("DELETE FROM %s.%s WHERE schema_name = ?", tapSchemaNameEscaped, DLUtil.escapeName("schemas", dbType)); + String query = String.format("DELETE FROM %s.%s WHERE schema_name = ?", tapSchemaNameEscaped, TSMUtil.escapeName("schemas", dbType)); statement = connection.prepareStatement(query); String schemaName = schema.getName(); statement.setString(1, schemaName); @@ -625,7 +626,7 @@ public class Dao { log.debug("{} TAP_SCHEMA schemas found", allTAPSchemas.size()); - return DLUtil.sortStringsList(allTAPSchemas); + return TSMUtil.sortStringsList(allTAPSchemas); } /** diff --git a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/DaoColumn.java b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/DaoColumn.java similarity index 93% rename from TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/DaoColumn.java rename to TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/DaoColumn.java index e5d47f8..af58bd4 100644 --- a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/DaoColumn.java +++ b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/DaoColumn.java @@ -1,10 +1,11 @@ -package it.inaf.oats.ia2.tapschemamanager.datalayer; - -import it.inaf.oats.ia2.tapschemamanager.contract.Column; -import it.inaf.oats.ia2.tapschemamanager.contract.Status; -import it.inaf.oats.ia2.tapschemamanager.contract.Table; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchema; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchemaEntity; +package it.inaf.oats.ia2.tapschemamanager.api; + +import it.inaf.oats.ia2.tapschemamanager.api.contract.DatabaseType; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Column; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Status; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Table; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchema; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchemaEntity; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -45,8 +46,8 @@ public class DaoColumn { String tableSimpleName = table.getName(); final List allColumns = new ArrayList<>(); - DataSource dataSource = DLUtil.getSchemaDataSource(dbWrapper, tapSchema, schemaName); - DatabaseType dbType = DLUtil.getSchemaDatabaseType(dbWrapper, tapSchema, schemaName); + DataSource dataSource = TSMUtil.getSchemaDataSource(dbWrapper, tapSchema, schemaName); + DatabaseType dbType = TSMUtil.getSchemaDatabaseType(dbWrapper, tapSchema, schemaName); String query; if (dbType == DatabaseType.MYSQL) { diff --git a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/DaoKey.java b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/DaoKey.java similarity index 94% rename from TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/DaoKey.java rename to TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/DaoKey.java index 05627b3..04dcda2 100644 --- a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/DaoKey.java +++ b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/DaoKey.java @@ -1,11 +1,12 @@ -package it.inaf.oats.ia2.tapschemamanager.datalayer; - -import it.inaf.oats.ia2.tapschemamanager.contract.Key; -import it.inaf.oats.ia2.tapschemamanager.contract.KeyColumn; -import it.inaf.oats.ia2.tapschemamanager.contract.Schema; -import it.inaf.oats.ia2.tapschemamanager.contract.Table; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchema; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchemaEntity; +package it.inaf.oats.ia2.tapschemamanager.api; + +import it.inaf.oats.ia2.tapschemamanager.api.contract.DatabaseType; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Key; +import it.inaf.oats.ia2.tapschemamanager.api.contract.KeyColumn; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Schema; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Table; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchema; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchemaEntity; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -41,8 +42,8 @@ public class DaoKey { log.debug("getSchemaKeys"); - DataSource dataSource = DLUtil.getSchemaDataSource(dbWrapper, tapSchema, schemaName); - DatabaseType dbType = DLUtil.getSchemaDatabaseType(dbWrapper, tapSchema, schemaName); + DataSource dataSource = TSMUtil.getSchemaDataSource(dbWrapper, tapSchema, schemaName); + DatabaseType dbType = TSMUtil.getSchemaDatabaseType(dbWrapper, tapSchema, schemaName); if (dbType == DatabaseType.MYSQL) { @@ -211,7 +212,7 @@ public class DaoKey { }; String queryKeyColumns = String.format("%s WHERE %s = ?", keyColumnsSelect.getQuery(), - DLUtil.escapeName(KeyColumn.KEY_ID_KEY, dbWrapper.getTapSchemaDatabaseType())); + TSMUtil.escapeName(KeyColumn.KEY_ID_KEY, dbWrapper.getTapSchemaDatabaseType())); boolean supportKeyID = EntityPropertyInfo.getEntityPropertyInfo(TapSchema.KEYS_TABLE, Key.KEY_ID_KEY).acceptVersion(tapSchema.getVersion()); boolean supportKeyColumnID = EntityPropertyInfo.getEntityPropertyInfo(TapSchema.KEY_COLUMNS_TABLE, KeyColumn.KEY_COLUMN_ID_KEY).acceptVersion(tapSchema.getVersion()); @@ -282,7 +283,7 @@ public class DaoKey { fromKey.initProperty(Key.DESCRIPTION_KEY, keyDescription); fromKey.initProperty(Key.UTYPE_KEY, keyUtype); if (supportKeyID) { - fromKey.initProperty(Key.KEY_ID_KEY, DLUtil.getObject(rsKeys, Key.KEY_ID_KEY, Long.class)); + fromKey.initProperty(Key.KEY_ID_KEY, TSMUtil.getObject(rsKeys, Key.KEY_ID_KEY, Long.class)); } ((KeyImpl) fromKey).setVisible(true); @@ -296,7 +297,7 @@ public class DaoKey { && keyColumn.getTargetColumn().equals(targetColumn)) { keyColumn.initProperty(KeyColumn.KEY_ID_KEY, keyId); if (supportKeyColumnID) { - keyColumn.initProperty(KeyColumn.KEY_COLUMN_ID_KEY, DLUtil.getObject(rsKeyColumns, KeyColumn.KEY_COLUMN_ID_KEY, Long.class)); + keyColumn.initProperty(KeyColumn.KEY_COLUMN_ID_KEY, TSMUtil.getObject(rsKeyColumns, KeyColumn.KEY_COLUMN_ID_KEY, Long.class)); } break; } @@ -329,7 +330,7 @@ public class DaoKey { KeyImpl key = new KeyImpl(dbWrapper, tapSchema, fromTableCompleteName, targetTableCompleteName); key.initProperty(Key.ID_KEY, keyId); if (supportKeyID) { - key.initProperty(Key.KEY_ID_KEY, DLUtil.getObject(rsKeys, Key.KEY_ID_KEY, Long.class)); + key.initProperty(Key.KEY_ID_KEY, TSMUtil.getObject(rsKeys, Key.KEY_ID_KEY, Long.class)); } key.setVisible(true); fictitiousKeys.add(key); @@ -362,7 +363,7 @@ public class DaoKey { KeyColumnImpl keyColumn = new KeyColumnImpl(dbWrapper, tapSchema, key, fromColumn, targetColumn); if (supportKeyColumnID) { - keyColumn.initProperty(KeyColumn.KEY_COLUMN_ID_KEY, DLUtil.getObject(rsKeyColumns, KeyColumn.KEY_COLUMN_ID_KEY, Long.class)); + keyColumn.initProperty(KeyColumn.KEY_COLUMN_ID_KEY, TSMUtil.getObject(rsKeyColumns, KeyColumn.KEY_COLUMN_ID_KEY, Long.class)); } } } @@ -415,8 +416,8 @@ public class DaoKey { if (keyIdChanged) { // Deleting key columns to avoid problem with foreign key constraint failures - String tapSchemaNameEscaped = DLUtil.escapeName(tapSchema.getName(), dbType); - String keyColumnsNameEscaped = DLUtil.escapeName("key_columns", dbType); + String tapSchemaNameEscaped = TSMUtil.escapeName(tapSchema.getName(), dbType); + String keyColumnsNameEscaped = TSMUtil.escapeName("key_columns", dbType); String query = String.format("DELETE FROM %s.%s WHERE key_id = ?", tapSchemaNameEscaped, keyColumnsNameEscaped); diff --git a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/DaoSchema.java b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/DaoSchema.java similarity index 90% rename from TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/DaoSchema.java rename to TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/DaoSchema.java index d74629a..ade5587 100644 --- a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/DaoSchema.java +++ b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/DaoSchema.java @@ -1,9 +1,10 @@ -package it.inaf.oats.ia2.tapschemamanager.datalayer; +package it.inaf.oats.ia2.tapschemamanager.api; -import it.inaf.oats.ia2.tapschemamanager.contract.Schema; -import it.inaf.oats.ia2.tapschemamanager.contract.Status; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchema; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchemaEntity; +import it.inaf.oats.ia2.tapschemamanager.api.contract.DatabaseType; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Schema; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Status; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchema; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchemaEntity; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -59,7 +60,7 @@ public class DaoSchema { log.debug("{} schemas found", allSchemas.size()); - return DLUtil.sortStringsList(allSchemas); + return TSMUtil.sortStringsList(allSchemas); } /** diff --git a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/DaoTable.java b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/DaoTable.java similarity index 87% rename from TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/DaoTable.java rename to TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/DaoTable.java index 0de8b5f..34dbac5 100644 --- a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/DaoTable.java +++ b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/DaoTable.java @@ -1,10 +1,11 @@ -package it.inaf.oats.ia2.tapschemamanager.datalayer; - -import it.inaf.oats.ia2.tapschemamanager.contract.Schema; -import it.inaf.oats.ia2.tapschemamanager.contract.Status; -import it.inaf.oats.ia2.tapschemamanager.contract.Table; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchema; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchemaEntity; +package it.inaf.oats.ia2.tapschemamanager.api; + +import it.inaf.oats.ia2.tapschemamanager.api.contract.DatabaseType; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Schema; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Status; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Table; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchema; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchemaEntity; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -38,8 +39,8 @@ public class DaoTable { */ protected static List getAllTablesNames(DBWrapper dbWrapper, TapSchema tapSchema, String schemaName) throws SQLException { - DataSource dataSource = DLUtil.getSchemaDataSource(dbWrapper, tapSchema, schemaName); - DatabaseType dbType = DLUtil.getSchemaDatabaseType(dbWrapper, tapSchema, schemaName); + DataSource dataSource = TSMUtil.getSchemaDataSource(dbWrapper, tapSchema, schemaName); + DatabaseType dbType = TSMUtil.getSchemaDatabaseType(dbWrapper, tapSchema, schemaName); String query; if (dbType == DatabaseType.MYSQL) { @@ -61,7 +62,7 @@ public class DaoTable { } } - return DLUtil.sortStringsList(allTables); + return TSMUtil.sortStringsList(allTables); } /** @@ -78,8 +79,8 @@ public class DaoTable { final Map tablesTypes = new HashMap<>(); - DataSource dataSource = DLUtil.getSchemaDataSource(dbWrapper, tapSchema, schemaName); - DatabaseType dbType = DLUtil.getSchemaDatabaseType(dbWrapper, tapSchema, schemaName); + DataSource dataSource = TSMUtil.getSchemaDataSource(dbWrapper, tapSchema, schemaName); + DatabaseType dbType = TSMUtil.getSchemaDatabaseType(dbWrapper, tapSchema, schemaName); String query; if (dbType == DatabaseType.MYSQL) { diff --git a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/EditableProperty.java b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/EditableProperty.java similarity index 97% rename from TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/EditableProperty.java rename to TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/EditableProperty.java index 83c8d78..4de1459 100644 --- a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/EditableProperty.java +++ b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/EditableProperty.java @@ -1,4 +1,4 @@ -package it.inaf.oats.ia2.tapschemamanager.datalayer; +package it.inaf.oats.ia2.tapschemamanager.api; import java.io.Serializable; import org.slf4j.Logger; diff --git a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/EntityProperty.java b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/EntityProperty.java similarity index 87% rename from TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/EntityProperty.java rename to TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/EntityProperty.java index e8dcbee..c92a3c4 100644 --- a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/EntityProperty.java +++ b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/EntityProperty.java @@ -1,4 +1,4 @@ -package it.inaf.oats.ia2.tapschemamanager.datalayer; +package it.inaf.oats.ia2.tapschemamanager.api; /** * Store the value of an entity property (that corresponds to a column of the diff --git a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/EntityPropertyInfo.java b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/EntityPropertyInfo.java similarity index 93% rename from TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/EntityPropertyInfo.java rename to TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/EntityPropertyInfo.java index f73bdc2..0accd9e 100644 --- a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/EntityPropertyInfo.java +++ b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/EntityPropertyInfo.java @@ -1,12 +1,12 @@ -package it.inaf.oats.ia2.tapschemamanager.datalayer; - -import it.inaf.oats.ia2.tapschemamanager.contract.Column; -import it.inaf.oats.ia2.tapschemamanager.contract.Key; -import it.inaf.oats.ia2.tapschemamanager.contract.KeyColumn; -import it.inaf.oats.ia2.tapschemamanager.contract.Schema; -import it.inaf.oats.ia2.tapschemamanager.contract.Table; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchema; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchemaVersion; +package it.inaf.oats.ia2.tapschemamanager.api; + +import it.inaf.oats.ia2.tapschemamanager.api.contract.Column; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Key; +import it.inaf.oats.ia2.tapschemamanager.api.contract.KeyColumn; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Schema; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Table; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchema; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchemaVersion; import java.sql.Types; import java.util.ArrayList; import java.util.HashMap; @@ -17,7 +17,7 @@ import org.slf4j.LoggerFactory; /** * Describes the mapping between the - * {@link it.inaf.oats.ia2.tapschemamanager.contract.TapSchemaEntity} instances + * {@link it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchemaEntity} instances * and their related table columns. * * @author Sonia Zorba {@literal } diff --git a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/FixedEntityProperty.java b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/FixedEntityProperty.java similarity index 93% rename from TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/FixedEntityProperty.java rename to TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/FixedEntityProperty.java index 07664be..1146cb3 100644 --- a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/FixedEntityProperty.java +++ b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/FixedEntityProperty.java @@ -1,4 +1,4 @@ -package it.inaf.oats.ia2.tapschemamanager.datalayer; +package it.inaf.oats.ia2.tapschemamanager.api; import java.io.Serializable; import org.slf4j.Logger; diff --git a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/InconsistentTapSchemaException.java b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/InconsistentTapSchemaException.java similarity index 85% rename from TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/InconsistentTapSchemaException.java rename to TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/InconsistentTapSchemaException.java index d0d5b8d..6ad471b 100644 --- a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/InconsistentTapSchemaException.java +++ b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/InconsistentTapSchemaException.java @@ -1,4 +1,4 @@ -package it.inaf.oats.ia2.tapschemamanager.datalayer; +package it.inaf.oats.ia2.tapschemamanager.api; /** * diff --git a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/InsertQueryBuilder.java b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/InsertQueryBuilder.java similarity index 86% rename from TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/InsertQueryBuilder.java rename to TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/InsertQueryBuilder.java index d01972a..6ae6f41 100644 --- a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/InsertQueryBuilder.java +++ b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/InsertQueryBuilder.java @@ -1,7 +1,8 @@ -package it.inaf.oats.ia2.tapschemamanager.datalayer; +package it.inaf.oats.ia2.tapschemamanager.api; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchema; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchemaEntity; +import it.inaf.oats.ia2.tapschemamanager.api.contract.DatabaseType; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchema; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchemaEntity; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; @@ -27,9 +28,9 @@ public class InsertQueryBuilder { protected InsertQueryBuilder(DatabaseType dbType, TapSchema tapSchema, TapSchemaEntity tapSchemaEntity, String tapSchemaTableName) { StringBuilder querySb = new StringBuilder("INSERT INTO "); - querySb.append(DLUtil.escapeName(tapSchema.getName(), dbType)); + querySb.append(TSMUtil.escapeName(tapSchema.getName(), dbType)); querySb.append("."); - querySb.append(DLUtil.escapeName(tapSchemaTableName, dbType)); + querySb.append(TSMUtil.escapeName(tapSchemaTableName, dbType)); querySb.append(" ("); addedProperties = new ArrayList<>(); diff --git a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/KeyColumnImpl.java b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/KeyColumnImpl.java similarity index 92% rename from TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/KeyColumnImpl.java rename to TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/KeyColumnImpl.java index 9ec3565..d4580a6 100644 --- a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/KeyColumnImpl.java +++ b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/KeyColumnImpl.java @@ -1,8 +1,8 @@ -package it.inaf.oats.ia2.tapschemamanager.datalayer; +package it.inaf.oats.ia2.tapschemamanager.api; -import it.inaf.oats.ia2.tapschemamanager.contract.Key; -import it.inaf.oats.ia2.tapschemamanager.contract.KeyColumn; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchema; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Key; +import it.inaf.oats.ia2.tapschemamanager.api.contract.KeyColumn; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchema; import java.util.Objects; /** diff --git a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/KeyImpl.java b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/KeyImpl.java similarity index 96% rename from TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/KeyImpl.java rename to TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/KeyImpl.java index 8d3cb7f..ca35b7b 100644 --- a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/KeyImpl.java +++ b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/KeyImpl.java @@ -1,8 +1,8 @@ -package it.inaf.oats.ia2.tapschemamanager.datalayer; +package it.inaf.oats.ia2.tapschemamanager.api; -import it.inaf.oats.ia2.tapschemamanager.contract.Key; -import it.inaf.oats.ia2.tapschemamanager.contract.KeyColumn; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchema; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Key; +import it.inaf.oats.ia2.tapschemamanager.api.contract.KeyColumn; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchema; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/SchemaImpl.java b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/SchemaImpl.java similarity index 93% rename from TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/SchemaImpl.java rename to TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/SchemaImpl.java index 40eed71..36b27fb 100644 --- a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/SchemaImpl.java +++ b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/SchemaImpl.java @@ -1,10 +1,10 @@ -package it.inaf.oats.ia2.tapschemamanager.datalayer; +package it.inaf.oats.ia2.tapschemamanager.api; -import it.inaf.oats.ia2.tapschemamanager.contract.Key; -import it.inaf.oats.ia2.tapschemamanager.contract.Schema; -import it.inaf.oats.ia2.tapschemamanager.contract.Status; -import it.inaf.oats.ia2.tapschemamanager.contract.Table; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchema; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Key; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Schema; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Status; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Table; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchema; import java.sql.SQLException; import java.util.List; import java.util.Map; @@ -150,7 +150,7 @@ public class SchemaImpl extends ChildEntityImpl implements Schema { */ @Override public Table getChild(String childName, Status... statuses) { - return DLUtil.getChild(tables, childName, statuses); + return TSMUtil.getChild(tables, childName, statuses); } /** @@ -158,7 +158,7 @@ public class SchemaImpl extends ChildEntityImpl implements Schema { */ @Override public List getChildren(Status... statuses) { - return DLUtil.getChildrenByStatus(tables.values(), statuses); + return TSMUtil.getChildrenByStatus(tables.values(), statuses); } /** @@ -166,7 +166,7 @@ public class SchemaImpl extends ChildEntityImpl implements Schema { */ @Override public List getAddableChildrenNames() { - return DLUtil.getAddableChildrenNames(tables); + return TSMUtil.getAddableChildrenNames(tables); } /** diff --git a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/SelectQueryBuilder.java b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/SelectQueryBuilder.java similarity index 85% rename from TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/SelectQueryBuilder.java rename to TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/SelectQueryBuilder.java index 32ca24d..5022e0c 100644 --- a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/SelectQueryBuilder.java +++ b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/SelectQueryBuilder.java @@ -1,7 +1,8 @@ -package it.inaf.oats.ia2.tapschemamanager.datalayer; +package it.inaf.oats.ia2.tapschemamanager.api; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchema; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchemaEntity; +import it.inaf.oats.ia2.tapschemamanager.api.contract.DatabaseType; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchema; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchemaEntity; import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; @@ -44,9 +45,9 @@ public abstract class SelectQueryBuilder { querySb.append(" FROM "); - querySb.append(DLUtil.escapeName(tapSchema.getName(), dbType)); + querySb.append(TSMUtil.escapeName(tapSchema.getName(), dbType)); querySb.append("."); - querySb.append(DLUtil.escapeName(tapSchemaTableName, dbType)); + querySb.append(TSMUtil.escapeName(tapSchemaTableName, dbType)); query = querySb.toString(); } @@ -67,7 +68,7 @@ public abstract class SelectQueryBuilder { for (EntityPropertyInfo property : addedProperties) { String key = property.getPropertyKey(); Class type = property.getPropertyType(); - Object value = DLUtil.getObject(rs, key, type); + Object value = TSMUtil.getObject(rs, key, type); if (property.isUpdatable()) { entity.initProperty(key, value); } else { diff --git a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/DLUtil.java b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/TSMUtil.java similarity index 90% rename from TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/DLUtil.java rename to TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/TSMUtil.java index e4d80f3..22968ab 100644 --- a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/DLUtil.java +++ b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/TSMUtil.java @@ -1,15 +1,16 @@ -package it.inaf.oats.ia2.tapschemamanager.datalayer; - -import it.inaf.oats.ia2.tapschemamanager.contract.ChildEntity; -import it.inaf.oats.ia2.tapschemamanager.contract.Column; -import it.inaf.oats.ia2.tapschemamanager.contract.Key; -import it.inaf.oats.ia2.tapschemamanager.contract.KeyColumn; -import it.inaf.oats.ia2.tapschemamanager.contract.Schema; -import it.inaf.oats.ia2.tapschemamanager.contract.Status; -import it.inaf.oats.ia2.tapschemamanager.contract.Table; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchema; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchemaEntity; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchemaVersion; +package it.inaf.oats.ia2.tapschemamanager.api; + +import it.inaf.oats.ia2.tapschemamanager.api.contract.DatabaseType; +import it.inaf.oats.ia2.tapschemamanager.api.contract.ChildEntity; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Column; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Key; +import it.inaf.oats.ia2.tapschemamanager.api.contract.KeyColumn; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Schema; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Status; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Table; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchema; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchemaEntity; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchemaVersion; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; @@ -26,9 +27,9 @@ import org.slf4j.LoggerFactory; * * @author Sonia Zorba {@literal } */ -public class DLUtil { +public class TSMUtil { - private static final Logger log = LoggerFactory.getLogger(DLUtil.class); + private static final Logger log = LoggerFactory.getLogger(TSMUtil.class); protected static List sortStringsList(List list) { Collections.sort(list, String.CASE_INSENSITIVE_ORDER); @@ -109,7 +110,7 @@ public class DLUtil { } else if (type == Boolean.class) { ret = (T) (Boolean) rs.getBoolean(key); } else { - throw new UnsupportedOperationException("Type " + type.getCanonicalName() + " not supported by " + DLUtil.class.getCanonicalName() + " getObject() method"); + throw new UnsupportedOperationException("Type " + type.getCanonicalName() + " not supported by " + TSMUtil.class.getCanonicalName() + " getObject() method"); } if (rs.wasNull()) { @@ -132,7 +133,7 @@ public class DLUtil { } else if (type == Boolean.class) { ret = (T) (Boolean) rs.getBoolean(i); } else { - throw new UnsupportedOperationException("Type " + type.getCanonicalName() + " not supported by " + DLUtil.class.getCanonicalName() + " getObject() method"); + throw new UnsupportedOperationException("Type " + type.getCanonicalName() + " not supported by " + TSMUtil.class.getCanonicalName() + " getObject() method"); } if (rs.wasNull()) { diff --git a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/TableImpl.java b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/TableImpl.java similarity index 93% rename from TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/TableImpl.java rename to TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/TableImpl.java index 9da946e..9f40149 100644 --- a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/TableImpl.java +++ b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/TableImpl.java @@ -1,11 +1,11 @@ -package it.inaf.oats.ia2.tapschemamanager.datalayer; - -import it.inaf.oats.ia2.tapschemamanager.contract.Column; -import it.inaf.oats.ia2.tapschemamanager.contract.Key; -import it.inaf.oats.ia2.tapschemamanager.contract.Schema; -import it.inaf.oats.ia2.tapschemamanager.contract.Status; -import it.inaf.oats.ia2.tapschemamanager.contract.Table; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchema; +package it.inaf.oats.ia2.tapschemamanager.api; + +import it.inaf.oats.ia2.tapschemamanager.api.contract.Column; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Key; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Schema; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Status; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Table; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchema; import java.sql.SQLException; import java.util.ArrayList; import java.util.Collections; @@ -151,7 +151,7 @@ public class TableImpl extends ChildEntityImpl implements Table { */ @Override public Column getChild(String childName, Status... statuses) { - return DLUtil.getChild(columns, childName, statuses); + return TSMUtil.getChild(columns, childName, statuses); } /** @@ -159,7 +159,7 @@ public class TableImpl extends ChildEntityImpl implements Table { */ @Override public List getChildren(Status... statuses) { - return DLUtil.getChildrenByStatus(columns.values(), statuses); + return TSMUtil.getChildrenByStatus(columns.values(), statuses); } /** @@ -167,7 +167,7 @@ public class TableImpl extends ChildEntityImpl implements Table { */ @Override public List getAddableChildrenNames() { - return DLUtil.getAddableChildrenNames(columns); + return TSMUtil.getAddableChildrenNames(columns); } @Override diff --git a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/TapSchemaEntityImpl.java b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/TapSchemaEntityImpl.java similarity index 87% rename from TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/TapSchemaEntityImpl.java rename to TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/TapSchemaEntityImpl.java index f32e146..25e19a3 100644 --- a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/TapSchemaEntityImpl.java +++ b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/TapSchemaEntityImpl.java @@ -1,8 +1,8 @@ -package it.inaf.oats.ia2.tapschemamanager.datalayer; +package it.inaf.oats.ia2.tapschemamanager.api; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchema; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchemaEntity; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchemaVersion; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchema; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchemaEntity; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchemaVersion; import java.io.Serializable; import java.util.ArrayList; import java.util.HashMap; @@ -29,7 +29,7 @@ public abstract class TapSchemaEntityImpl implements TapSchemaEntity, Serializab protected TapSchemaEntityImpl() { // for serialization properties = new HashMap<>(); - tapSchemaEntityTable = DLUtil.getTapSchemaTableNameFromEntity((this)); + tapSchemaEntityTable = TSMUtil.getTapSchemaTableNameFromEntity((this)); } public TapSchemaEntityImpl(DBWrapper dbWrapper, TapSchema tapSchema) { @@ -70,7 +70,7 @@ public abstract class TapSchemaEntityImpl implements TapSchemaEntity, Serializab @Override public T getValue(String key, Class type) { if (!EntityPropertyInfo.getEntityPropertyInfo(tapSchemaEntityTable, key).acceptVersion(tapSchema.getVersion())) { - throw DLUtil.getUnsupportedOperationException(getVersion(), key + " property"); + throw TSMUtil.getUnsupportedOperationException(getVersion(), key + " property"); } return properties.get(key).getValue(type); } @@ -79,7 +79,7 @@ public abstract class TapSchemaEntityImpl implements TapSchemaEntity, Serializab EntityProperty property = properties.get(key); if (property instanceof EditableProperty) { if (!EntityPropertyInfo.getEntityPropertyInfo(tapSchemaEntityTable, key).acceptVersion(tapSchema.getVersion())) { - throw DLUtil.getUnsupportedOperationException(getVersion(), key + " property"); + throw TSMUtil.getUnsupportedOperationException(getVersion(), key + " property"); } ((EditableProperty) property).setValue(value); } else { diff --git a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/TapSchemaFactory.java b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/TapSchemaFactory.java similarity index 75% rename from TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/TapSchemaFactory.java rename to TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/TapSchemaFactory.java index cc00106..226b44f 100644 --- a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/TapSchemaFactory.java +++ b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/TapSchemaFactory.java @@ -1,7 +1,7 @@ -package it.inaf.oats.ia2.tapschemamanager.datalayer; +package it.inaf.oats.ia2.tapschemamanager.api; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchema; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchemaVersion; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchema; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchemaVersion; import java.sql.SQLException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/TapSchemaImpl.java b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/TapSchemaImpl.java similarity index 90% rename from TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/TapSchemaImpl.java rename to TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/TapSchemaImpl.java index 8e5f517..00a424a 100644 --- a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/TapSchemaImpl.java +++ b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/TapSchemaImpl.java @@ -1,13 +1,13 @@ -package it.inaf.oats.ia2.tapschemamanager.datalayer; - -import it.inaf.oats.ia2.tapschemamanager.contract.Column; -import it.inaf.oats.ia2.tapschemamanager.contract.Key; -import it.inaf.oats.ia2.tapschemamanager.contract.KeyColumn; -import it.inaf.oats.ia2.tapschemamanager.contract.Schema; -import it.inaf.oats.ia2.tapschemamanager.contract.Status; -import it.inaf.oats.ia2.tapschemamanager.contract.Table; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchema; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchemaVersion; +package it.inaf.oats.ia2.tapschemamanager.api; + +import it.inaf.oats.ia2.tapschemamanager.api.contract.Column; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Key; +import it.inaf.oats.ia2.tapschemamanager.api.contract.KeyColumn; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Schema; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Status; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Table; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchema; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchemaVersion; import java.io.Serializable; import java.sql.SQLException; import java.util.HashSet; @@ -159,7 +159,7 @@ public class TapSchemaImpl implements TapSchema, Serializable { */ @Override public Schema getChild(String childName, Status... statuses) { - return DLUtil.getChild(schemas, childName, statuses); + return TSMUtil.getChild(schemas, childName, statuses); } /** @@ -167,7 +167,7 @@ public class TapSchemaImpl implements TapSchema, Serializable { */ @Override public List getChildren(Status... statuses) { - return DLUtil.getChildrenByStatus(schemas.values(), statuses); + return TSMUtil.getChildrenByStatus(schemas.values(), statuses); } /** @@ -175,7 +175,7 @@ public class TapSchemaImpl implements TapSchema, Serializable { */ @Override public List getAddableChildrenNames() { - return DLUtil.getAddableChildrenNames(schemas); + return TSMUtil.getAddableChildrenNames(schemas); } /** @@ -224,7 +224,7 @@ public class TapSchemaImpl implements TapSchema, Serializable { } } log.debug(this.toString()); - DLUtil.putInfoIntoTapSchemaSchema(tapSchemaSchema); + TSMUtil.putInfoIntoTapSchemaSchema(tapSchemaSchema); exists = true; // important! @@ -315,6 +315,20 @@ public class TapSchemaImpl implements TapSchema, Serializable { // } } + public void addFictitiousKey(Table fromTable, String[] fromColumns, Table targetTable, String[] targetColumns) { + KeyImpl key = new KeyImpl(dbWrapper, this, fromTable.getCompleteName(), targetTable.getCompleteName()); + key.setId((getMaxKeyId() + 1) + ""); + + for (int i = 0; i < fromColumns.length; i++) { + key.addKeyColumn(fromColumns[i], targetColumns[i]); + } + + fromTable.addFromKey(key); + targetTable.addTargetKey(key); + + allKeys.add(key); + } + /** * Print all TAP_SCHEMA tree (useful for debugging). */ diff --git a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/UpdateOperations.java b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/UpdateOperations.java similarity index 93% rename from TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/UpdateOperations.java rename to TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/UpdateOperations.java index 9910563..4dd7823 100644 --- a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/UpdateOperations.java +++ b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/UpdateOperations.java @@ -1,11 +1,11 @@ -package it.inaf.oats.ia2.tapschemamanager.datalayer; - -import it.inaf.oats.ia2.tapschemamanager.contract.Column; -import it.inaf.oats.ia2.tapschemamanager.contract.Key; -import it.inaf.oats.ia2.tapschemamanager.contract.Schema; -import it.inaf.oats.ia2.tapschemamanager.contract.Status; -import it.inaf.oats.ia2.tapschemamanager.contract.Table; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchema; +package it.inaf.oats.ia2.tapschemamanager.api; + +import it.inaf.oats.ia2.tapschemamanager.api.contract.Column; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Key; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Schema; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Status; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Table; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchema; import java.util.ArrayList; import java.util.List; import org.slf4j.Logger; @@ -15,7 +15,7 @@ import org.slf4j.LoggerFactory; * List of operations that have to be performed by the * {@link it.inaf.oats.ia2.tapschemamanager.contract.TapSchema#save()} method, * in terms of adding, updating or removing - * {@link it.inaf.oats.ia2.tapschemamanager.contract.TapSchemaEntity} entities. + * {@link it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchemaEntity} entities. * Could be used stand-alone to obtain a preview of the operations that will be * performed on the database. * diff --git a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/UpdateQueryBuilder.java b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/UpdateQueryBuilder.java similarity index 85% rename from TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/UpdateQueryBuilder.java rename to TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/UpdateQueryBuilder.java index d804b75..648865d 100644 --- a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/UpdateQueryBuilder.java +++ b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/UpdateQueryBuilder.java @@ -1,7 +1,8 @@ -package it.inaf.oats.ia2.tapschemamanager.datalayer; +package it.inaf.oats.ia2.tapschemamanager.api; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchema; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchemaEntity; +import it.inaf.oats.ia2.tapschemamanager.api.contract.DatabaseType; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchema; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchemaEntity; import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.ArrayList; @@ -26,9 +27,9 @@ public class UpdateQueryBuilder { protected UpdateQueryBuilder(DatabaseType dbType, TapSchema tapSchema, TapSchemaEntity tapSchemaEntity, String tapSchemaTableName, String whereCondition) { StringBuilder querySb = new StringBuilder("UPDATE "); - querySb.append(DLUtil.escapeName(tapSchema.getName(), dbType)); + querySb.append(TSMUtil.escapeName(tapSchema.getName(), dbType)); querySb.append("."); - querySb.append(DLUtil.escapeName(tapSchemaTableName, dbType)); + querySb.append(TSMUtil.escapeName(tapSchemaTableName, dbType)); querySb.append("\nSET"); addedProperties = new ArrayList<>(); diff --git a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/contract/ChildEntity.java b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/contract/ChildEntity.java similarity index 92% rename from TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/contract/ChildEntity.java rename to TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/contract/ChildEntity.java index 90c3883..99b6ce7 100644 --- a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/contract/ChildEntity.java +++ b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/contract/ChildEntity.java @@ -1,4 +1,4 @@ -package it.inaf.oats.ia2.tapschemamanager.contract; +package it.inaf.oats.ia2.tapschemamanager.api.contract; /** * A {@link TapSchemaEntity} that can be a child of an diff --git a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/contract/Column.java b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/contract/Column.java similarity index 98% rename from TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/contract/Column.java rename to TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/contract/Column.java index 0fe39e3..e242ea4 100644 --- a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/contract/Column.java +++ b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/contract/Column.java @@ -1,4 +1,4 @@ -package it.inaf.oats.ia2.tapschemamanager.contract; +package it.inaf.oats.ia2.tapschemamanager.api.contract; /** * {@link TapSchemaEntity} that represents the table {@code TAP_SCHEMA.columns}. diff --git a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/DatabaseType.java b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/contract/DatabaseType.java similarity index 74% rename from TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/DatabaseType.java rename to TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/contract/DatabaseType.java index d0a39a8..005dfb3 100644 --- a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/datalayer/DatabaseType.java +++ b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/contract/DatabaseType.java @@ -1,4 +1,4 @@ -package it.inaf.oats.ia2.tapschemamanager.datalayer; +package it.inaf.oats.ia2.tapschemamanager.api.contract; /** * This enum lists the supported RDBMS. diff --git a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/contract/EntitiesContainer.java b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/contract/EntitiesContainer.java similarity index 97% rename from TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/contract/EntitiesContainer.java rename to TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/contract/EntitiesContainer.java index 06c5a9d..8473646 100644 --- a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/contract/EntitiesContainer.java +++ b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/contract/EntitiesContainer.java @@ -1,4 +1,4 @@ -package it.inaf.oats.ia2.tapschemamanager.contract; +package it.inaf.oats.ia2.tapschemamanager.api.contract; import java.sql.SQLException; import java.util.List; diff --git a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/contract/Key.java b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/contract/Key.java similarity index 97% rename from TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/contract/Key.java rename to TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/contract/Key.java index 97a1238..15fa663 100644 --- a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/contract/Key.java +++ b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/contract/Key.java @@ -1,4 +1,4 @@ -package it.inaf.oats.ia2.tapschemamanager.contract; +package it.inaf.oats.ia2.tapschemamanager.api.contract; import java.util.List; diff --git a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/contract/KeyColumn.java b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/contract/KeyColumn.java similarity index 94% rename from TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/contract/KeyColumn.java rename to TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/contract/KeyColumn.java index 774632d..2064176 100644 --- a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/contract/KeyColumn.java +++ b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/contract/KeyColumn.java @@ -1,4 +1,4 @@ -package it.inaf.oats.ia2.tapschemamanager.contract; +package it.inaf.oats.ia2.tapschemamanager.api.contract; /** * {@link TapSchemaEntity} that represents the table diff --git a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/contract/Schema.java b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/contract/Schema.java similarity index 93% rename from TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/contract/Schema.java rename to TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/contract/Schema.java index f332991..051971e 100644 --- a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/contract/Schema.java +++ b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/contract/Schema.java @@ -1,4 +1,4 @@ -package it.inaf.oats.ia2.tapschemamanager.contract; +package it.inaf.oats.ia2.tapschemamanager.api.contract; /** * {@link TapSchemaEntity} that represents the table {@code TAP_SCHEMA.schemas}. diff --git a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/contract/Status.java b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/contract/Status.java similarity index 94% rename from TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/contract/Status.java rename to TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/contract/Status.java index 9911bf8..ffe9a74 100644 --- a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/contract/Status.java +++ b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/contract/Status.java @@ -1,4 +1,4 @@ -package it.inaf.oats.ia2.tapschemamanager.contract; +package it.inaf.oats.ia2.tapschemamanager.api.contract; /** * Define the persistence status of a {@link ChildEntity}. diff --git a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/contract/Table.java b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/contract/Table.java similarity index 97% rename from TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/contract/Table.java rename to TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/contract/Table.java index 7becc0c..0831fb5 100644 --- a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/contract/Table.java +++ b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/contract/Table.java @@ -1,4 +1,4 @@ -package it.inaf.oats.ia2.tapschemamanager.contract; +package it.inaf.oats.ia2.tapschemamanager.api.contract; import java.util.List; diff --git a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/contract/TapSchema.java b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/contract/TapSchema.java similarity index 94% rename from TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/contract/TapSchema.java rename to TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/contract/TapSchema.java index b560828..bd8b5c7 100644 --- a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/contract/TapSchema.java +++ b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/contract/TapSchema.java @@ -1,4 +1,4 @@ -package it.inaf.oats.ia2.tapschemamanager.contract; +package it.inaf.oats.ia2.tapschemamanager.api.contract; import java.sql.SQLException; diff --git a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/contract/TapSchemaEntity.java b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/contract/TapSchemaEntity.java similarity index 96% rename from TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/contract/TapSchemaEntity.java rename to TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/contract/TapSchemaEntity.java index 3e9282b..0343066 100644 --- a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/contract/TapSchemaEntity.java +++ b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/contract/TapSchemaEntity.java @@ -1,4 +1,4 @@ -package it.inaf.oats.ia2.tapschemamanager.contract; +package it.inaf.oats.ia2.tapschemamanager.api.contract; import java.util.List; diff --git a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/contract/TapSchemaVersion.java b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/contract/TapSchemaVersion.java similarity index 89% rename from TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/contract/TapSchemaVersion.java rename to TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/contract/TapSchemaVersion.java index 7f9fa92..9bf03ea 100644 --- a/TapSchemaManagerDL/src/main/java/it/inaf/oats/ia2/tapschemamanager/contract/TapSchemaVersion.java +++ b/TapSchemaManagerAPI/src/main/java/it/inaf/oats/ia2/tapschemamanager/api/contract/TapSchemaVersion.java @@ -1,4 +1,4 @@ -package it.inaf.oats.ia2.tapschemamanager.contract; +package it.inaf.oats.ia2.tapschemamanager.api.contract; /** * Version of a TAP_SCHEMA schema. TAP_SCHEMA schemas with different versions diff --git a/TapSchemaManager/src/main/resources/log4j.properties b/TapSchemaManagerAPI/src/main/resources/log4j.properties similarity index 100% rename from TapSchemaManager/src/main/resources/log4j.properties rename to TapSchemaManagerAPI/src/main/resources/log4j.properties diff --git a/TapSchemaManagerDL/src/test/java/it/inaf/oats/ia2/tapschemamanager/datalayer/TestAll.java b/TapSchemaManagerAPI/src/test/java/it/inaf/oats/ia2/tapschemamanager/api/TestAll.java similarity index 97% rename from TapSchemaManagerDL/src/test/java/it/inaf/oats/ia2/tapschemamanager/datalayer/TestAll.java rename to TapSchemaManagerAPI/src/test/java/it/inaf/oats/ia2/tapschemamanager/api/TestAll.java index 2ef3833..fcb071e 100644 --- a/TapSchemaManagerDL/src/test/java/it/inaf/oats/ia2/tapschemamanager/datalayer/TestAll.java +++ b/TapSchemaManagerAPI/src/test/java/it/inaf/oats/ia2/tapschemamanager/api/TestAll.java @@ -1,13 +1,19 @@ -package it.inaf.oats.ia2.tapschemamanager.datalayer; +package it.inaf.oats.ia2.tapschemamanager.api; -import it.inaf.oats.ia2.tapschemamanager.contract.Column; -import it.inaf.oats.ia2.tapschemamanager.contract.Key; -import it.inaf.oats.ia2.tapschemamanager.contract.KeyColumn; -import it.inaf.oats.ia2.tapschemamanager.contract.Schema; -import it.inaf.oats.ia2.tapschemamanager.contract.Status; -import it.inaf.oats.ia2.tapschemamanager.contract.Table; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchema; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchemaVersion; +import it.inaf.oats.ia2.tapschemamanager.api.TapSchemaImpl; +import it.inaf.oats.ia2.tapschemamanager.api.contract.DatabaseType; +import it.inaf.oats.ia2.tapschemamanager.api.Credentials; +import it.inaf.oats.ia2.tapschemamanager.api.DBWrapper; +import it.inaf.oats.ia2.tapschemamanager.api.UpdateOperations; +import it.inaf.oats.ia2.tapschemamanager.api.TapSchemaFactory; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Column; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Key; +import it.inaf.oats.ia2.tapschemamanager.api.contract.KeyColumn; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Schema; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Status; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Table; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchema; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchemaVersion; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; diff --git a/TapSchemaManagerDL/src/main/resources/META-INF/persistence.xml b/TapSchemaManagerDL/src/main/resources/META-INF/persistence.xml deleted file mode 100644 index d30c396..0000000 --- a/TapSchemaManagerDL/src/main/resources/META-INF/persistence.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - org.eclipse.persistence.jpa.PersistenceProvider - - it.inaf.oats.ia2.tapschemamanager.datalayer.SchemaEntity - it.inaf.oats.ia2.tapschemamanager.datalayer.TableEntity - it.inaf.oats.ia2.tapschemamanager.datalayer.ColumnEntity - it.inaf.oats.ia2.tapschemamanager.datalayer.KeyEntity - it.inaf.oats.ia2.tapschemamanager.datalayer.KeyColumnEntity - - - - - - - diff --git a/TapSchemaManager/pom.xml b/TapSchemaManagerWebApp/pom.xml similarity index 64% rename from TapSchemaManager/pom.xml rename to TapSchemaManagerWebApp/pom.xml index e1035a6..6bd6c58 100644 --- a/TapSchemaManager/pom.xml +++ b/TapSchemaManagerWebApp/pom.xml @@ -3,21 +3,76 @@ 4.0.0 it.inaf.oats.ia2.tap - webapp + TapSchemaManagerWebApp 1.0-SNAPSHOT war - TapSchemaManager + TapSchemaManagerWebApp ${project.build.directory}/endorsed UTF-8 + + + GlassFish + + + environment + GlassFish + + true + + + + + Tomcat + + + environment + Tomcat + + + + + org.glassfish + javax.faces + 2.2.8-02 + runtime + + + org.jboss.weld.servlet + weld-servlet + 2.3.4.Final + runtime + + + org.glassfish + javax.json + 1.0.4 + runtime + + + org.glassfish + javax.el + + 3.0.1-b08 + + + javax.servlet + jstl + 1.2 + runtime + + + + + it.inaf.oats.ia2 - TapSchemaManagerDL + TapSchemaManagerAPI 1.0-SNAPSHOT diff --git a/TapSchemaManager/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/CredentialsBean.java b/TapSchemaManagerWebApp/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/CredentialsBean.java similarity index 97% rename from TapSchemaManager/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/CredentialsBean.java rename to TapSchemaManagerWebApp/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/CredentialsBean.java index 60aea08..5ff34e3 100644 --- a/TapSchemaManager/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/CredentialsBean.java +++ b/TapSchemaManagerWebApp/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/CredentialsBean.java @@ -1,7 +1,7 @@ package it.inaf.oats.ia2.tapschemamanager.webapp; -import it.inaf.oats.ia2.tapschemamanager.datalayer.Credentials; -import it.inaf.oats.ia2.tapschemamanager.datalayer.DBWrapper; +import it.inaf.oats.ia2.tapschemamanager.api.Credentials; +import it.inaf.oats.ia2.tapschemamanager.api.DBWrapper; import java.io.IOException; import java.io.Serializable; import java.sql.SQLException; diff --git a/TapSchemaManager/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/CredentialsConfiguration.java b/TapSchemaManagerWebApp/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/CredentialsConfiguration.java similarity index 94% rename from TapSchemaManager/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/CredentialsConfiguration.java rename to TapSchemaManagerWebApp/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/CredentialsConfiguration.java index 247669f..b30f558 100644 --- a/TapSchemaManager/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/CredentialsConfiguration.java +++ b/TapSchemaManagerWebApp/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/CredentialsConfiguration.java @@ -1,6 +1,6 @@ package it.inaf.oats.ia2.tapschemamanager.webapp; -import it.inaf.oats.ia2.tapschemamanager.datalayer.Credentials; +import it.inaf.oats.ia2.tapschemamanager.api.Credentials; import java.util.ArrayList; import java.util.List; import javax.xml.bind.annotation.XmlElement; diff --git a/TapSchemaManager/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/CustomPartialResponseWriter.java b/TapSchemaManagerWebApp/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/CustomPartialResponseWriter.java similarity index 100% rename from TapSchemaManager/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/CustomPartialResponseWriter.java rename to TapSchemaManagerWebApp/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/CustomPartialResponseWriter.java diff --git a/TapSchemaManager/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/CustomPartialViewContextFactory.java b/TapSchemaManagerWebApp/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/CustomPartialViewContextFactory.java similarity index 100% rename from TapSchemaManager/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/CustomPartialViewContextFactory.java rename to TapSchemaManagerWebApp/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/CustomPartialViewContextFactory.java diff --git a/TapSchemaManager/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/CustomPartialViewContextWrapper.java b/TapSchemaManagerWebApp/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/CustomPartialViewContextWrapper.java similarity index 100% rename from TapSchemaManager/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/CustomPartialViewContextWrapper.java rename to TapSchemaManagerWebApp/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/CustomPartialViewContextWrapper.java diff --git a/TapSchemaManager/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/JSUpdateHandler.java b/TapSchemaManagerWebApp/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/JSUpdateHandler.java similarity index 100% rename from TapSchemaManager/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/JSUpdateHandler.java rename to TapSchemaManagerWebApp/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/JSUpdateHandler.java diff --git a/TapSchemaManager/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/ParsedUCD.java b/TapSchemaManagerWebApp/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/ParsedUCD.java similarity index 100% rename from TapSchemaManager/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/ParsedUCD.java rename to TapSchemaManagerWebApp/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/ParsedUCD.java diff --git a/TapSchemaManager/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/SchemaSelectionBean.java b/TapSchemaManagerWebApp/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/SchemaSelectionBean.java similarity index 94% rename from TapSchemaManager/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/SchemaSelectionBean.java rename to TapSchemaManagerWebApp/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/SchemaSelectionBean.java index 42a7727..86ffcc3 100644 --- a/TapSchemaManager/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/SchemaSelectionBean.java +++ b/TapSchemaManagerWebApp/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/SchemaSelectionBean.java @@ -1,11 +1,11 @@ package it.inaf.oats.ia2.tapschemamanager.webapp; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchema; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchemaVersion; -import it.inaf.oats.ia2.tapschemamanager.datalayer.DBWrapper; -import it.inaf.oats.ia2.tapschemamanager.datalayer.Dao; -import it.inaf.oats.ia2.tapschemamanager.datalayer.DaoSchema; -import it.inaf.oats.ia2.tapschemamanager.datalayer.TapSchemaFactory; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchema; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchemaVersion; +import it.inaf.oats.ia2.tapschemamanager.api.DBWrapper; +import it.inaf.oats.ia2.tapschemamanager.api.Dao; +import it.inaf.oats.ia2.tapschemamanager.api.DaoSchema; +import it.inaf.oats.ia2.tapschemamanager.api.TapSchemaFactory; import java.io.Serializable; import java.sql.SQLException; import java.util.ArrayList; diff --git a/TapSchemaManager/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/SearchUCD.java b/TapSchemaManagerWebApp/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/SearchUCD.java similarity index 100% rename from TapSchemaManager/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/SearchUCD.java rename to TapSchemaManagerWebApp/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/SearchUCD.java diff --git a/TapSchemaManager/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/SearchUCDDialog.java b/TapSchemaManagerWebApp/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/SearchUCDDialog.java similarity index 100% rename from TapSchemaManager/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/SearchUCDDialog.java rename to TapSchemaManagerWebApp/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/SearchUCDDialog.java diff --git a/TapSchemaManager/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/SeparateCredentials.java b/TapSchemaManagerWebApp/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/SeparateCredentials.java similarity index 94% rename from TapSchemaManager/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/SeparateCredentials.java rename to TapSchemaManagerWebApp/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/SeparateCredentials.java index b836e6d..447136a 100644 --- a/TapSchemaManager/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/SeparateCredentials.java +++ b/TapSchemaManagerWebApp/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/SeparateCredentials.java @@ -1,6 +1,6 @@ package it.inaf.oats.ia2.tapschemamanager.webapp; -import it.inaf.oats.ia2.tapschemamanager.datalayer.Credentials; +import it.inaf.oats.ia2.tapschemamanager.api.Credentials; import javax.xml.bind.annotation.XmlElement; /** diff --git a/TapSchemaManager/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/TapSchemaEditingBean.java b/TapSchemaManagerWebApp/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/TapSchemaEditingBean.java similarity index 93% rename from TapSchemaManager/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/TapSchemaEditingBean.java rename to TapSchemaManagerWebApp/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/TapSchemaEditingBean.java index d7a903d..94fce7e 100644 --- a/TapSchemaManager/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/TapSchemaEditingBean.java +++ b/TapSchemaManagerWebApp/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/TapSchemaEditingBean.java @@ -1,16 +1,16 @@ package it.inaf.oats.ia2.tapschemamanager.webapp; -import it.inaf.oats.ia2.tapschemamanager.contract.ChildEntity; -import it.inaf.oats.ia2.tapschemamanager.contract.Column; -import it.inaf.oats.ia2.tapschemamanager.contract.EntitiesContainer; -import it.inaf.oats.ia2.tapschemamanager.contract.Key; -import it.inaf.oats.ia2.tapschemamanager.contract.KeyColumn; -import it.inaf.oats.ia2.tapschemamanager.contract.Schema; -import it.inaf.oats.ia2.tapschemamanager.contract.Status; -import it.inaf.oats.ia2.tapschemamanager.contract.Table; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchema; -import it.inaf.oats.ia2.tapschemamanager.contract.TapSchemaEntity; -import it.inaf.oats.ia2.tapschemamanager.datalayer.UpdateOperations; +import it.inaf.oats.ia2.tapschemamanager.api.contract.ChildEntity; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Column; +import it.inaf.oats.ia2.tapschemamanager.api.contract.EntitiesContainer; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Key; +import it.inaf.oats.ia2.tapschemamanager.api.contract.KeyColumn; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Schema; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Status; +import it.inaf.oats.ia2.tapschemamanager.api.contract.Table; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchema; +import it.inaf.oats.ia2.tapschemamanager.api.contract.TapSchemaEntity; +import it.inaf.oats.ia2.tapschemamanager.api.UpdateOperations; import java.io.Serializable; import java.sql.SQLException; import java.util.ArrayList; diff --git a/TapSchemaManager/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/UCDInfo.java b/TapSchemaManagerWebApp/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/UCDInfo.java similarity index 100% rename from TapSchemaManager/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/UCDInfo.java rename to TapSchemaManagerWebApp/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/UCDInfo.java diff --git a/TapSchemaManager/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/UCDServiceException.java b/TapSchemaManagerWebApp/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/UCDServiceException.java similarity index 100% rename from TapSchemaManager/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/UCDServiceException.java rename to TapSchemaManagerWebApp/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/UCDServiceException.java diff --git a/TapSchemaManager/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/WebAppConfigurationBean.java b/TapSchemaManagerWebApp/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/WebAppConfigurationBean.java similarity index 100% rename from TapSchemaManager/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/WebAppConfigurationBean.java rename to TapSchemaManagerWebApp/src/main/java/it/inaf/oats/ia2/tapschemamanager/webapp/WebAppConfigurationBean.java diff --git a/TapSchemaManagerDL/src/main/resources/log4j.properties b/TapSchemaManagerWebApp/src/main/resources/log4j.properties similarity index 100% rename from TapSchemaManagerDL/src/main/resources/log4j.properties rename to TapSchemaManagerWebApp/src/main/resources/log4j.properties diff --git a/TapSchemaManager/src/main/resources/webapp.properties b/TapSchemaManagerWebApp/src/main/resources/webapp.properties similarity index 100% rename from TapSchemaManager/src/main/resources/webapp.properties rename to TapSchemaManagerWebApp/src/main/resources/webapp.properties diff --git a/TapSchemaManager/src/main/webapp/WEB-INF/beans.xml b/TapSchemaManagerWebApp/src/main/webapp/WEB-INF/beans.xml similarity index 100% rename from TapSchemaManager/src/main/webapp/WEB-INF/beans.xml rename to TapSchemaManagerWebApp/src/main/webapp/WEB-INF/beans.xml diff --git a/TapSchemaManager/src/main/webapp/WEB-INF/faces-config.xml b/TapSchemaManagerWebApp/src/main/webapp/WEB-INF/faces-config.xml similarity index 100% rename from TapSchemaManager/src/main/webapp/WEB-INF/faces-config.xml rename to TapSchemaManagerWebApp/src/main/webapp/WEB-INF/faces-config.xml diff --git a/TapSchemaManager/src/main/webapp/WEB-INF/templates/master.xhtml b/TapSchemaManagerWebApp/src/main/webapp/WEB-INF/templates/master.xhtml similarity index 100% rename from TapSchemaManager/src/main/webapp/WEB-INF/templates/master.xhtml rename to TapSchemaManagerWebApp/src/main/webapp/WEB-INF/templates/master.xhtml diff --git a/TapSchemaManager/src/main/webapp/WEB-INF/web.xml b/TapSchemaManagerWebApp/src/main/webapp/WEB-INF/web.xml similarity index 93% rename from TapSchemaManager/src/main/webapp/WEB-INF/web.xml rename to TapSchemaManagerWebApp/src/main/webapp/WEB-INF/web.xml index e0954e0..dbe2088 100644 --- a/TapSchemaManager/src/main/webapp/WEB-INF/web.xml +++ b/TapSchemaManagerWebApp/src/main/webapp/WEB-INF/web.xml @@ -16,6 +16,10 @@ javax.faces.INTERPRET_EMPTY_STRING_SUBMITTED_VALUES_AS_NULL true + + com.sun.faces.expressionFactory + com.sun.el.ExpressionFactoryImpl + eot application/vnd.ms-fontobject diff --git a/TapSchemaManager/src/main/webapp/expired.xhtml b/TapSchemaManagerWebApp/src/main/webapp/expired.xhtml similarity index 100% rename from TapSchemaManager/src/main/webapp/expired.xhtml rename to TapSchemaManagerWebApp/src/main/webapp/expired.xhtml diff --git a/TapSchemaManager/src/main/webapp/index.xhtml b/TapSchemaManagerWebApp/src/main/webapp/index.xhtml similarity index 100% rename from TapSchemaManager/src/main/webapp/index.xhtml rename to TapSchemaManagerWebApp/src/main/webapp/index.xhtml diff --git a/TapSchemaManager/src/main/webapp/resources/css/animation.css b/TapSchemaManagerWebApp/src/main/webapp/resources/css/animation.css similarity index 100% rename from TapSchemaManager/src/main/webapp/resources/css/animation.css rename to TapSchemaManagerWebApp/src/main/webapp/resources/css/animation.css diff --git a/TapSchemaManager/src/main/webapp/resources/css/bootstrap-theme.min.css b/TapSchemaManagerWebApp/src/main/webapp/resources/css/bootstrap-theme.min.css similarity index 100% rename from TapSchemaManager/src/main/webapp/resources/css/bootstrap-theme.min.css rename to TapSchemaManagerWebApp/src/main/webapp/resources/css/bootstrap-theme.min.css diff --git a/TapSchemaManager/src/main/webapp/resources/css/bootstrap.css b/TapSchemaManagerWebApp/src/main/webapp/resources/css/bootstrap.css similarity index 100% rename from TapSchemaManager/src/main/webapp/resources/css/bootstrap.css rename to TapSchemaManagerWebApp/src/main/webapp/resources/css/bootstrap.css diff --git a/TapSchemaManager/src/main/webapp/resources/css/fontello.css b/TapSchemaManagerWebApp/src/main/webapp/resources/css/fontello.css similarity index 100% rename from TapSchemaManager/src/main/webapp/resources/css/fontello.css rename to TapSchemaManagerWebApp/src/main/webapp/resources/css/fontello.css diff --git a/TapSchemaManager/src/main/webapp/resources/css/style.css b/TapSchemaManagerWebApp/src/main/webapp/resources/css/style.css similarity index 100% rename from TapSchemaManager/src/main/webapp/resources/css/style.css rename to TapSchemaManagerWebApp/src/main/webapp/resources/css/style.css diff --git a/TapSchemaManager/src/main/webapp/resources/fonts/fontello.eot b/TapSchemaManagerWebApp/src/main/webapp/resources/fonts/fontello.eot similarity index 100% rename from TapSchemaManager/src/main/webapp/resources/fonts/fontello.eot rename to TapSchemaManagerWebApp/src/main/webapp/resources/fonts/fontello.eot diff --git a/TapSchemaManager/src/main/webapp/resources/fonts/fontello.svg b/TapSchemaManagerWebApp/src/main/webapp/resources/fonts/fontello.svg similarity index 100% rename from TapSchemaManager/src/main/webapp/resources/fonts/fontello.svg rename to TapSchemaManagerWebApp/src/main/webapp/resources/fonts/fontello.svg diff --git a/TapSchemaManager/src/main/webapp/resources/fonts/fontello.ttf b/TapSchemaManagerWebApp/src/main/webapp/resources/fonts/fontello.ttf similarity index 100% rename from TapSchemaManager/src/main/webapp/resources/fonts/fontello.ttf rename to TapSchemaManagerWebApp/src/main/webapp/resources/fonts/fontello.ttf diff --git a/TapSchemaManager/src/main/webapp/resources/fonts/fontello.woff b/TapSchemaManagerWebApp/src/main/webapp/resources/fonts/fontello.woff similarity index 100% rename from TapSchemaManager/src/main/webapp/resources/fonts/fontello.woff rename to TapSchemaManagerWebApp/src/main/webapp/resources/fonts/fontello.woff diff --git a/TapSchemaManager/src/main/webapp/resources/fonts/glyphicons-halflings-regular.eot b/TapSchemaManagerWebApp/src/main/webapp/resources/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from TapSchemaManager/src/main/webapp/resources/fonts/glyphicons-halflings-regular.eot rename to TapSchemaManagerWebApp/src/main/webapp/resources/fonts/glyphicons-halflings-regular.eot diff --git a/TapSchemaManager/src/main/webapp/resources/fonts/glyphicons-halflings-regular.svg b/TapSchemaManagerWebApp/src/main/webapp/resources/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from TapSchemaManager/src/main/webapp/resources/fonts/glyphicons-halflings-regular.svg rename to TapSchemaManagerWebApp/src/main/webapp/resources/fonts/glyphicons-halflings-regular.svg diff --git a/TapSchemaManager/src/main/webapp/resources/fonts/glyphicons-halflings-regular.ttf b/TapSchemaManagerWebApp/src/main/webapp/resources/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from TapSchemaManager/src/main/webapp/resources/fonts/glyphicons-halflings-regular.ttf rename to TapSchemaManagerWebApp/src/main/webapp/resources/fonts/glyphicons-halflings-regular.ttf diff --git a/TapSchemaManager/src/main/webapp/resources/fonts/glyphicons-halflings-regular.woff b/TapSchemaManagerWebApp/src/main/webapp/resources/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from TapSchemaManager/src/main/webapp/resources/fonts/glyphicons-halflings-regular.woff rename to TapSchemaManagerWebApp/src/main/webapp/resources/fonts/glyphicons-halflings-regular.woff diff --git a/TapSchemaManager/src/main/webapp/resources/fonts/glyphicons-halflings-regular.woff2 b/TapSchemaManagerWebApp/src/main/webapp/resources/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from TapSchemaManager/src/main/webapp/resources/fonts/glyphicons-halflings-regular.woff2 rename to TapSchemaManagerWebApp/src/main/webapp/resources/fonts/glyphicons-halflings-regular.woff2 diff --git a/TapSchemaManager/src/main/webapp/resources/js/credentials.js b/TapSchemaManagerWebApp/src/main/webapp/resources/js/credentials.js similarity index 100% rename from TapSchemaManager/src/main/webapp/resources/js/credentials.js rename to TapSchemaManagerWebApp/src/main/webapp/resources/js/credentials.js diff --git a/TapSchemaManager/src/main/webapp/resources/js/edit-tapschema.js b/TapSchemaManagerWebApp/src/main/webapp/resources/js/edit-tapschema.js similarity index 100% rename from TapSchemaManager/src/main/webapp/resources/js/edit-tapschema.js rename to TapSchemaManagerWebApp/src/main/webapp/resources/js/edit-tapschema.js diff --git a/TapSchemaManager/src/main/webapp/resources/js/lib/bootstrap.min.js b/TapSchemaManagerWebApp/src/main/webapp/resources/js/lib/bootstrap.min.js similarity index 100% rename from TapSchemaManager/src/main/webapp/resources/js/lib/bootstrap.min.js rename to TapSchemaManagerWebApp/src/main/webapp/resources/js/lib/bootstrap.min.js diff --git a/TapSchemaManager/src/main/webapp/resources/js/lib/jquery-1.11.3.min.js b/TapSchemaManagerWebApp/src/main/webapp/resources/js/lib/jquery-1.11.3.min.js similarity index 100% rename from TapSchemaManager/src/main/webapp/resources/js/lib/jquery-1.11.3.min.js rename to TapSchemaManagerWebApp/src/main/webapp/resources/js/lib/jquery-1.11.3.min.js diff --git a/TapSchemaManager/src/main/webapp/schemaSelection.xhtml b/TapSchemaManagerWebApp/src/main/webapp/schemaSelection.xhtml similarity index 100% rename from TapSchemaManager/src/main/webapp/schemaSelection.xhtml rename to TapSchemaManagerWebApp/src/main/webapp/schemaSelection.xhtml diff --git a/TapSchemaManager/src/main/webapp/tapSchemaEditing.xhtml b/TapSchemaManagerWebApp/src/main/webapp/tapSchemaEditing.xhtml similarity index 100% rename from TapSchemaManager/src/main/webapp/tapSchemaEditing.xhtml rename to TapSchemaManagerWebApp/src/main/webapp/tapSchemaEditing.xhtml diff --git a/TapSchemaManager/src/test/java/TapSchemaMangerTest.java b/TapSchemaManagerWebApp/src/test/java/TapSchemaMangerTest.java similarity index 96% rename from TapSchemaManager/src/test/java/TapSchemaMangerTest.java rename to TapSchemaManagerWebApp/src/test/java/TapSchemaMangerTest.java index 45228a3..8bb8246 100644 --- a/TapSchemaManager/src/test/java/TapSchemaMangerTest.java +++ b/TapSchemaManagerWebApp/src/test/java/TapSchemaMangerTest.java @@ -1,7 +1,7 @@ import it.inaf.oats.ia2.tapschemamanager.webapp.CredentialsConfiguration; import it.inaf.oats.ia2.tapschemamanager.webapp.SeparateCredentials; -import it.inaf.oats.ia2.tapschemamanager.datalayer.Credentials; +import it.inaf.oats.ia2.tapschemamanager.api.Credentials; import it.inaf.oats.ia2.tapschemamanager.webapp.CredentialsBean; import java.io.StringReader; import java.io.StringWriter; -- GitLab