diff --git a/README.md b/README.md new file mode 100644 index 0000000000000000000000000000000000000000..821f424aaae5ad907c42680f204f761877b05504 --- /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 ac98f02d57842a1e821593cd16e4d99d2b28aaeb..1e5d5d4adf674b847ff9a9e61286a577f663e0e7 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 831e3025bee6208d082d657ddad5847ef41ad503..ce162e0881db14f21a5a25950b439b223f485566 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 9029780d3eab201b0dc71436ce7f2dde2e939d61..f8710ca7cc44025d1653e741bb0a41664b14697a 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 8dd6fce4ca96ff33768aeecdd434e137295cb3d4..ac8d9656be17953977db8689ff9091cdea34070d 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 2bf4617ed5c37a59db358985d26bff3d11997e04..ff6d5e6b0b306b39a5af676ecb22b24c3e177297 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 9943584d4fdde69e81821bf25ce7dd1200042159..d5d7dafa9b4925b69e9627d5ba47fae45ca6c092 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 e5d47f80fea0e0256f76e357475e54471172b071..af58bd42b4523f525bd487931a57fc122074a273 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 05627b386070e0f6701d29006ce625db7c9fffb5..04dcda26d6225d579b19ac6de1d87c177f04e69b 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 d74629a7179c02801ef7457016051ee7ae4ec428..ade5587bda77d4e68c0f63e9d47270f818cc2029 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 0de8b5f6e5ea2c7b8eba1c9a06ad7c0745a8fc06..34dbac5acb71ad5dd3c858abd9f6accba01f0b22 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 83c8d78510b9497bc61f18cb3781683f9a30bf18..4de145988fb0250946140da4195c2ab57f3b1d5b 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 e8dcbeead5ddb23fc26bc798fd9a2f2fa70a39af..c92a3c4a55707ca6c37536c088391ae1155485d5 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 f73bdc2d3a5ade2f92e7397c197b056b0a7141ba..0accd9e0e67695c3565466bd1ecb019346ec2cd9 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 07664bebe3d25c5d74689a34abcd884e8dd34438..1146cb38452be9fd5f8b8be7aaf95d520636ff1b 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 d0d5b8d05f04c5c23f0a51ee2d826f5225d687e0..6ad471be7828afb4ae9ce4672dc50465373bf000 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 d01972aca48b455f40fbcabb696c4f764603f017..6ae6f41466b8481b73ef222821d20b78583556e4 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 9ec35657673ff081abba51499ccd38664efb1f60..d4580a67b95c9b662b438dc60489182c91eb85ad 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 8d3cb7fbfb1ee9046dc71e8357ab37daad99c279..ca35b7b7ee9f3f32650fc32b2562b33f57a184ca 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 40eed71fc6a6058448f58c90a0512002cb13e70e..36b27fbd09b9694816c34bef9713b01749744fd2 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 32ca24d541882e312901a0c9ad044bff044ec415..5022e0c797090bf73a8b3276fe0e2c6175822570 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 e4d80f30e5a8d321032d1efff0231bb82136211d..22968ab727cc7699dc39793d8db0f6f2c6551b36 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 9da946e61226cea25faa5a0654570ef04ad6d2ff..9f401499750b3b62a1ca22eb74ddc583a37c4c75 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 f32e146615be6f184d564fbdd9a7c312fb7c96e0..25e19a36c122e1ee5c2be18fca8ffbaa1d17b969 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 cc00106dd64eee3bf19139c7f94a816db51df589..226b44f5380a61bb916f7898756e572eb88bb12b 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 8e5f517e1619d99fdf6b0e6ecddcb1fef39cee88..00a424a94c3e70bf714dd3c7fbe52592d847c0ed 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 9910563ed7e32f40da66cb2ca21c595819d87b67..4dd78238550c6e4ef0820a7bc157b4d9b752e370 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 d804b75b7320e81d36e9734ccb81fd1f9df5f3d1..648865dc0f6960993353950f5d061f06e8a532b5 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 90c3883b4d2ff399c8cf919fee7be4cdb4e4c27f..99b6ce7650d92febe4246ab9afe91eb1f6e30b5c 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 0fe39e335fb0a672d708ebb1d6555f0aac112255..e242ea42e3a627f2eb345f1e998222e713abc2b0 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 d0a39a8974ae9ad3ca107e5798ff6504c125fae0..005dfb316d0f7fea70a3d562b6f3fb0419311da6 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 06c5a9dc8cfdef37838abe8cb7a5ef110343249a..84736461d953cfffbc3da2f0114db5ab302e9e9c 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 97a123804ca2722b26aaddd346b6b607e7d00d03..15fa663c9834e0195111d4ed3e68882551a5dd2b 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 774632ddaa07d26a02970619ed0f36a5255a4a57..206417694db4108bf9fc729b57d85644961d4d2e 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 f332991c2442a11fe8ad7d3ecb0248cd7353e4da..051971ec5c5a179ee700359002baa60a49a92ae4 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 9911bf803c34bb1f44b69719448149a598fba617..ffe9a74a93cae1c5c5c5e832115e3406a600cf42 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 7becc0cb9819d35bf552de2162e5b001fb48114b..0831fb56a917608e4bec8d14cb170292ebea216f 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 b5608287ae03fe05ea95e4777b4ad578767d1de5..bd8b5c7876e3d8a95bc2a861253a142000f00f63 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 3e9282b9da450b5771dd840b7e90cf036f21ac21..034306684ff6326be30698f5bb6e6f98a3daf84c 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 7f9fa92334d4f057e20484aaf3c35d0b1385982e..9bf03ead9acde0fcc4ee55a0a305381f806d6724 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 2ef3833c1e88c93cb41eaa5d3d19e9f4a644e074..fcb071eb4a79ae32441ff4dcfca2cc93c17a0e54 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 d30c396b7a08be86e925ae1fcb64de1b4c371216..0000000000000000000000000000000000000000 --- 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 e1035a6db88b0ee659f3e18ebab36af8187a3f90..6bd6c582973c1bb32e666223e6178cf5673e77b9 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 60aea08ebca82f2349361f0390ed82e517a3c9d5..5ff34e3bd8565aa1779212baa6407b1b27661855 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 247669f4f072c2897c1aee81add3d1acd03a6a7c..b30f55853ed616cccd5af2aa000448674fc40ced 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 42a7727872a1463d13ae830d0774d26c22e46c8e..86ffcc35aca8e4f9a2c514089b67681ba6f80d61 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 b836e6dea53fe8039958cbd959549cb70be2aade..447136a1e2c6e8c6c8d39e76d6198fcd7e706eda 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 d7a903df4879de833c10f9032413f3fe80c062a9..94fce7ee47dbb2dfda74a166ac0ad3b26440f9dd 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 e0954e0694e2391ecdf2ef4126c5c5988677b4a8..dbe2088a003018302ede64aeb2551ce5b69f4e53 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 45228a39375a414af4b6476eccea0cd0df042b3c..8bb82468231acf67e03792fd615ae7b26b690936 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;