From 29c52b68a3177783696348a644f221d2316a45c0 Mon Sep 17 00:00:00 2001 From: Sonia Zorba Date: Mon, 4 Jan 2016 15:58:30 +0100 Subject: [PATCH] Moved /new directory content to root --- new/pom.xml => pom.xml | 0 .../java/it/inaf/oats/ia2/tap/tsm/TSMPages.java | 0 .../java/it/inaf/oats/ia2/tap/tsm/TSMServlet.java | 0 .../ia2/tap/tsm/datalayer/ConnectionManager.java | 0 .../oats/ia2/tap/tsm/datalayer/ResultSetReader.java | 0 .../inaf/oats/ia2/tap/tsm/datalayer/SchemaDL.java | 0 .../it/inaf/oats/ia2/tap/tsm/datalayer/TableDL.java | 0 .../oats/ia2/tap/tsm/datalayer/TapSchemaDL.java | 0 .../oats/ia2/tap/tsm/datalayer/UpdateManager.java | 0 .../oats/ia2/tap/tsm/ejb/ApplicationManager.java | 0 .../ia2/tap/tsm/ejb/ApplicationManagerLocal.java | 0 .../java/it/inaf/oats/ia2/tap/tsm/model/Column.java | 0 .../it/inaf/oats/ia2/tap/tsm/model/ColumnField.java | 0 .../it/inaf/oats/ia2/tap/tsm/model/Credentials.java | 0 .../it/inaf/oats/ia2/tap/tsm/model/DbEntity.java | 0 .../ia2/tap/tsm/model/IDbEntitiesContainer.java | 0 .../ia2/tap/tsm/model/InsertCredentialsModel.java | 0 .../java/it/inaf/oats/ia2/tap/tsm/model/Key.java | 0 .../it/inaf/oats/ia2/tap/tsm/model/KeyColumn.java | 0 .../java/it/inaf/oats/ia2/tap/tsm/model/Schema.java | 0 .../ia2/tap/tsm/model/SelectTapSchemaModel.java | 0 .../java/it/inaf/oats/ia2/tap/tsm/model/Status.java | 0 .../java/it/inaf/oats/ia2/tap/tsm/model/Table.java | 0 .../it/inaf/oats/ia2/tap/tsm/model/TapSchema.java | 0 .../oats/ia2/tap/tsm/rest/ApplicationConfig.java | 0 .../ia2/tap/tsm/rest/EditTapSchemaPageModel.java | 0 .../ia2/tap/tsm/rest/EditTapSchemaPageState.java | 0 .../inaf/oats/ia2/tap/tsm/rest/SearchUCDDialog.java | 0 .../oats/ia2/tap/tsm/rest/TapSchemaResource.java | 0 src/main/resources/META-INF/persistence.xml | 10 ++++++++++ {new/src => src}/main/webapp/WEB-INF/beans.xml | 0 .../main/webapp/WEB-INF/tags/basepage.tag | 0 .../main/webapp/WEB-INF/tags/editcheckbox.tag | 0 .../main/webapp/WEB-INF/tags/edittext.tag | 0 .../main/webapp/WEB-INF/tags/schemapage.tag | 0 {new/src => src}/main/webapp/WEB-INF/tags/tab.tag | 0 .../main/webapp/WEB-INF/tags/tablepanel.tag | 0 .../main/webapp/WEB-INF/tags/textfield.tag | 0 {new/src => src}/main/webapp/credentials.jsp | 0 {new/src => src}/main/webapp/css/animation.css | 0 .../main/webapp/css/bootstrap-theme.min.css | 0 {new/src => src}/main/webapp/css/bootstrap.min.css | 0 {new/src => src}/main/webapp/css/fontello.css | 0 {new/src => src}/main/webapp/css/style.css | 0 {new/src => src}/main/webapp/editTapSchema.jsp | 0 {new/src => src}/main/webapp/fonts/fontello.eot | Bin {new/src => src}/main/webapp/fonts/fontello.svg | 0 {new/src => src}/main/webapp/fonts/fontello.ttf | Bin {new/src => src}/main/webapp/fonts/fontello.woff | Bin .../webapp/fonts/glyphicons-halflings-regular.eot | Bin .../webapp/fonts/glyphicons-halflings-regular.svg | 0 .../webapp/fonts/glyphicons-halflings-regular.ttf | Bin .../webapp/fonts/glyphicons-halflings-regular.woff | Bin .../webapp/fonts/glyphicons-halflings-regular.woff2 | Bin {new/src => src}/main/webapp/index.jsp | 0 {new/src => src}/main/webapp/js/edit-tapschema.js | 0 {new/src => src}/main/webapp/js/lib/angular.min.js | 0 .../src => src}/main/webapp/js/lib/bootstrap.min.js | 0 .../main/webapp/js/lib/jquery-1.11.3.min.js | 0 .../src => src}/main/webapp/js/lib/jsonpatch.min.js | 0 {new/src => src}/main/webapp/js/select-tapschema.js | 0 {new/src => src}/main/webapp/schema/schemas.jsp | 0 {new/src => src}/main/webapp/schema/tables.jsp | 0 {new/src => src}/main/webapp/schema/test.jsp | 0 {new/src => src}/main/webapp/selectTapSchema.jsp | 0 {new/src => src}/test/java/BadMockDbException.java | 0 {new/src => src}/test/java/DLTest.java | 0 {new/src => src}/test/java/TestUtils.java | 0 68 files changed, 10 insertions(+) rename new/pom.xml => pom.xml (100%) rename {new/src => src}/main/java/it/inaf/oats/ia2/tap/tsm/TSMPages.java (100%) rename {new/src => src}/main/java/it/inaf/oats/ia2/tap/tsm/TSMServlet.java (100%) rename {new/src => src}/main/java/it/inaf/oats/ia2/tap/tsm/datalayer/ConnectionManager.java (100%) rename {new/src => src}/main/java/it/inaf/oats/ia2/tap/tsm/datalayer/ResultSetReader.java (100%) rename {new/src => src}/main/java/it/inaf/oats/ia2/tap/tsm/datalayer/SchemaDL.java (100%) rename {new/src => src}/main/java/it/inaf/oats/ia2/tap/tsm/datalayer/TableDL.java (100%) rename {new/src => src}/main/java/it/inaf/oats/ia2/tap/tsm/datalayer/TapSchemaDL.java (100%) rename {new/src => src}/main/java/it/inaf/oats/ia2/tap/tsm/datalayer/UpdateManager.java (100%) rename {new/src => src}/main/java/it/inaf/oats/ia2/tap/tsm/ejb/ApplicationManager.java (100%) rename {new/src => src}/main/java/it/inaf/oats/ia2/tap/tsm/ejb/ApplicationManagerLocal.java (100%) rename {new/src => src}/main/java/it/inaf/oats/ia2/tap/tsm/model/Column.java (100%) rename {new/src => src}/main/java/it/inaf/oats/ia2/tap/tsm/model/ColumnField.java (100%) rename {new/src => src}/main/java/it/inaf/oats/ia2/tap/tsm/model/Credentials.java (100%) rename {new/src => src}/main/java/it/inaf/oats/ia2/tap/tsm/model/DbEntity.java (100%) rename {new/src => src}/main/java/it/inaf/oats/ia2/tap/tsm/model/IDbEntitiesContainer.java (100%) rename {new/src => src}/main/java/it/inaf/oats/ia2/tap/tsm/model/InsertCredentialsModel.java (100%) rename {new/src => src}/main/java/it/inaf/oats/ia2/tap/tsm/model/Key.java (100%) rename {new/src => src}/main/java/it/inaf/oats/ia2/tap/tsm/model/KeyColumn.java (100%) rename {new/src => src}/main/java/it/inaf/oats/ia2/tap/tsm/model/Schema.java (100%) rename {new/src => src}/main/java/it/inaf/oats/ia2/tap/tsm/model/SelectTapSchemaModel.java (100%) rename {new/src => src}/main/java/it/inaf/oats/ia2/tap/tsm/model/Status.java (100%) rename {new/src => src}/main/java/it/inaf/oats/ia2/tap/tsm/model/Table.java (100%) rename {new/src => src}/main/java/it/inaf/oats/ia2/tap/tsm/model/TapSchema.java (100%) rename {new/src => src}/main/java/it/inaf/oats/ia2/tap/tsm/rest/ApplicationConfig.java (100%) rename {new/src => src}/main/java/it/inaf/oats/ia2/tap/tsm/rest/EditTapSchemaPageModel.java (100%) rename {new/src => src}/main/java/it/inaf/oats/ia2/tap/tsm/rest/EditTapSchemaPageState.java (100%) rename {new/src => src}/main/java/it/inaf/oats/ia2/tap/tsm/rest/SearchUCDDialog.java (100%) rename {new/src => src}/main/java/it/inaf/oats/ia2/tap/tsm/rest/TapSchemaResource.java (100%) create mode 100644 src/main/resources/META-INF/persistence.xml rename {new/src => src}/main/webapp/WEB-INF/beans.xml (100%) rename {new/src => src}/main/webapp/WEB-INF/tags/basepage.tag (100%) rename {new/src => src}/main/webapp/WEB-INF/tags/editcheckbox.tag (100%) rename {new/src => src}/main/webapp/WEB-INF/tags/edittext.tag (100%) rename {new/src => src}/main/webapp/WEB-INF/tags/schemapage.tag (100%) rename {new/src => src}/main/webapp/WEB-INF/tags/tab.tag (100%) rename {new/src => src}/main/webapp/WEB-INF/tags/tablepanel.tag (100%) rename {new/src => src}/main/webapp/WEB-INF/tags/textfield.tag (100%) rename {new/src => src}/main/webapp/credentials.jsp (100%) rename {new/src => src}/main/webapp/css/animation.css (100%) rename {new/src => src}/main/webapp/css/bootstrap-theme.min.css (100%) rename {new/src => src}/main/webapp/css/bootstrap.min.css (100%) rename {new/src => src}/main/webapp/css/fontello.css (100%) rename {new/src => src}/main/webapp/css/style.css (100%) rename {new/src => src}/main/webapp/editTapSchema.jsp (100%) rename {new/src => src}/main/webapp/fonts/fontello.eot (100%) rename {new/src => src}/main/webapp/fonts/fontello.svg (100%) rename {new/src => src}/main/webapp/fonts/fontello.ttf (100%) rename {new/src => src}/main/webapp/fonts/fontello.woff (100%) rename {new/src => src}/main/webapp/fonts/glyphicons-halflings-regular.eot (100%) rename {new/src => src}/main/webapp/fonts/glyphicons-halflings-regular.svg (100%) rename {new/src => src}/main/webapp/fonts/glyphicons-halflings-regular.ttf (100%) rename {new/src => src}/main/webapp/fonts/glyphicons-halflings-regular.woff (100%) rename {new/src => src}/main/webapp/fonts/glyphicons-halflings-regular.woff2 (100%) rename {new/src => src}/main/webapp/index.jsp (100%) rename {new/src => src}/main/webapp/js/edit-tapschema.js (100%) rename {new/src => src}/main/webapp/js/lib/angular.min.js (100%) rename {new/src => src}/main/webapp/js/lib/bootstrap.min.js (100%) rename {new/src => src}/main/webapp/js/lib/jquery-1.11.3.min.js (100%) rename {new/src => src}/main/webapp/js/lib/jsonpatch.min.js (100%) rename {new/src => src}/main/webapp/js/select-tapschema.js (100%) rename {new/src => src}/main/webapp/schema/schemas.jsp (100%) rename {new/src => src}/main/webapp/schema/tables.jsp (100%) rename {new/src => src}/main/webapp/schema/test.jsp (100%) rename {new/src => src}/main/webapp/selectTapSchema.jsp (100%) rename {new/src => src}/test/java/BadMockDbException.java (100%) rename {new/src => src}/test/java/DLTest.java (100%) rename {new/src => src}/test/java/TestUtils.java (100%) diff --git a/new/pom.xml b/pom.xml similarity index 100% rename from new/pom.xml rename to pom.xml diff --git a/new/src/main/java/it/inaf/oats/ia2/tap/tsm/TSMPages.java b/src/main/java/it/inaf/oats/ia2/tap/tsm/TSMPages.java similarity index 100% rename from new/src/main/java/it/inaf/oats/ia2/tap/tsm/TSMPages.java rename to src/main/java/it/inaf/oats/ia2/tap/tsm/TSMPages.java diff --git a/new/src/main/java/it/inaf/oats/ia2/tap/tsm/TSMServlet.java b/src/main/java/it/inaf/oats/ia2/tap/tsm/TSMServlet.java similarity index 100% rename from new/src/main/java/it/inaf/oats/ia2/tap/tsm/TSMServlet.java rename to src/main/java/it/inaf/oats/ia2/tap/tsm/TSMServlet.java diff --git a/new/src/main/java/it/inaf/oats/ia2/tap/tsm/datalayer/ConnectionManager.java b/src/main/java/it/inaf/oats/ia2/tap/tsm/datalayer/ConnectionManager.java similarity index 100% rename from new/src/main/java/it/inaf/oats/ia2/tap/tsm/datalayer/ConnectionManager.java rename to src/main/java/it/inaf/oats/ia2/tap/tsm/datalayer/ConnectionManager.java diff --git a/new/src/main/java/it/inaf/oats/ia2/tap/tsm/datalayer/ResultSetReader.java b/src/main/java/it/inaf/oats/ia2/tap/tsm/datalayer/ResultSetReader.java similarity index 100% rename from new/src/main/java/it/inaf/oats/ia2/tap/tsm/datalayer/ResultSetReader.java rename to src/main/java/it/inaf/oats/ia2/tap/tsm/datalayer/ResultSetReader.java diff --git a/new/src/main/java/it/inaf/oats/ia2/tap/tsm/datalayer/SchemaDL.java b/src/main/java/it/inaf/oats/ia2/tap/tsm/datalayer/SchemaDL.java similarity index 100% rename from new/src/main/java/it/inaf/oats/ia2/tap/tsm/datalayer/SchemaDL.java rename to src/main/java/it/inaf/oats/ia2/tap/tsm/datalayer/SchemaDL.java diff --git a/new/src/main/java/it/inaf/oats/ia2/tap/tsm/datalayer/TableDL.java b/src/main/java/it/inaf/oats/ia2/tap/tsm/datalayer/TableDL.java similarity index 100% rename from new/src/main/java/it/inaf/oats/ia2/tap/tsm/datalayer/TableDL.java rename to src/main/java/it/inaf/oats/ia2/tap/tsm/datalayer/TableDL.java diff --git a/new/src/main/java/it/inaf/oats/ia2/tap/tsm/datalayer/TapSchemaDL.java b/src/main/java/it/inaf/oats/ia2/tap/tsm/datalayer/TapSchemaDL.java similarity index 100% rename from new/src/main/java/it/inaf/oats/ia2/tap/tsm/datalayer/TapSchemaDL.java rename to src/main/java/it/inaf/oats/ia2/tap/tsm/datalayer/TapSchemaDL.java diff --git a/new/src/main/java/it/inaf/oats/ia2/tap/tsm/datalayer/UpdateManager.java b/src/main/java/it/inaf/oats/ia2/tap/tsm/datalayer/UpdateManager.java similarity index 100% rename from new/src/main/java/it/inaf/oats/ia2/tap/tsm/datalayer/UpdateManager.java rename to src/main/java/it/inaf/oats/ia2/tap/tsm/datalayer/UpdateManager.java diff --git a/new/src/main/java/it/inaf/oats/ia2/tap/tsm/ejb/ApplicationManager.java b/src/main/java/it/inaf/oats/ia2/tap/tsm/ejb/ApplicationManager.java similarity index 100% rename from new/src/main/java/it/inaf/oats/ia2/tap/tsm/ejb/ApplicationManager.java rename to src/main/java/it/inaf/oats/ia2/tap/tsm/ejb/ApplicationManager.java diff --git a/new/src/main/java/it/inaf/oats/ia2/tap/tsm/ejb/ApplicationManagerLocal.java b/src/main/java/it/inaf/oats/ia2/tap/tsm/ejb/ApplicationManagerLocal.java similarity index 100% rename from new/src/main/java/it/inaf/oats/ia2/tap/tsm/ejb/ApplicationManagerLocal.java rename to src/main/java/it/inaf/oats/ia2/tap/tsm/ejb/ApplicationManagerLocal.java diff --git a/new/src/main/java/it/inaf/oats/ia2/tap/tsm/model/Column.java b/src/main/java/it/inaf/oats/ia2/tap/tsm/model/Column.java similarity index 100% rename from new/src/main/java/it/inaf/oats/ia2/tap/tsm/model/Column.java rename to src/main/java/it/inaf/oats/ia2/tap/tsm/model/Column.java diff --git a/new/src/main/java/it/inaf/oats/ia2/tap/tsm/model/ColumnField.java b/src/main/java/it/inaf/oats/ia2/tap/tsm/model/ColumnField.java similarity index 100% rename from new/src/main/java/it/inaf/oats/ia2/tap/tsm/model/ColumnField.java rename to src/main/java/it/inaf/oats/ia2/tap/tsm/model/ColumnField.java diff --git a/new/src/main/java/it/inaf/oats/ia2/tap/tsm/model/Credentials.java b/src/main/java/it/inaf/oats/ia2/tap/tsm/model/Credentials.java similarity index 100% rename from new/src/main/java/it/inaf/oats/ia2/tap/tsm/model/Credentials.java rename to src/main/java/it/inaf/oats/ia2/tap/tsm/model/Credentials.java diff --git a/new/src/main/java/it/inaf/oats/ia2/tap/tsm/model/DbEntity.java b/src/main/java/it/inaf/oats/ia2/tap/tsm/model/DbEntity.java similarity index 100% rename from new/src/main/java/it/inaf/oats/ia2/tap/tsm/model/DbEntity.java rename to src/main/java/it/inaf/oats/ia2/tap/tsm/model/DbEntity.java diff --git a/new/src/main/java/it/inaf/oats/ia2/tap/tsm/model/IDbEntitiesContainer.java b/src/main/java/it/inaf/oats/ia2/tap/tsm/model/IDbEntitiesContainer.java similarity index 100% rename from new/src/main/java/it/inaf/oats/ia2/tap/tsm/model/IDbEntitiesContainer.java rename to src/main/java/it/inaf/oats/ia2/tap/tsm/model/IDbEntitiesContainer.java diff --git a/new/src/main/java/it/inaf/oats/ia2/tap/tsm/model/InsertCredentialsModel.java b/src/main/java/it/inaf/oats/ia2/tap/tsm/model/InsertCredentialsModel.java similarity index 100% rename from new/src/main/java/it/inaf/oats/ia2/tap/tsm/model/InsertCredentialsModel.java rename to src/main/java/it/inaf/oats/ia2/tap/tsm/model/InsertCredentialsModel.java diff --git a/new/src/main/java/it/inaf/oats/ia2/tap/tsm/model/Key.java b/src/main/java/it/inaf/oats/ia2/tap/tsm/model/Key.java similarity index 100% rename from new/src/main/java/it/inaf/oats/ia2/tap/tsm/model/Key.java rename to src/main/java/it/inaf/oats/ia2/tap/tsm/model/Key.java diff --git a/new/src/main/java/it/inaf/oats/ia2/tap/tsm/model/KeyColumn.java b/src/main/java/it/inaf/oats/ia2/tap/tsm/model/KeyColumn.java similarity index 100% rename from new/src/main/java/it/inaf/oats/ia2/tap/tsm/model/KeyColumn.java rename to src/main/java/it/inaf/oats/ia2/tap/tsm/model/KeyColumn.java diff --git a/new/src/main/java/it/inaf/oats/ia2/tap/tsm/model/Schema.java b/src/main/java/it/inaf/oats/ia2/tap/tsm/model/Schema.java similarity index 100% rename from new/src/main/java/it/inaf/oats/ia2/tap/tsm/model/Schema.java rename to src/main/java/it/inaf/oats/ia2/tap/tsm/model/Schema.java diff --git a/new/src/main/java/it/inaf/oats/ia2/tap/tsm/model/SelectTapSchemaModel.java b/src/main/java/it/inaf/oats/ia2/tap/tsm/model/SelectTapSchemaModel.java similarity index 100% rename from new/src/main/java/it/inaf/oats/ia2/tap/tsm/model/SelectTapSchemaModel.java rename to src/main/java/it/inaf/oats/ia2/tap/tsm/model/SelectTapSchemaModel.java diff --git a/new/src/main/java/it/inaf/oats/ia2/tap/tsm/model/Status.java b/src/main/java/it/inaf/oats/ia2/tap/tsm/model/Status.java similarity index 100% rename from new/src/main/java/it/inaf/oats/ia2/tap/tsm/model/Status.java rename to src/main/java/it/inaf/oats/ia2/tap/tsm/model/Status.java diff --git a/new/src/main/java/it/inaf/oats/ia2/tap/tsm/model/Table.java b/src/main/java/it/inaf/oats/ia2/tap/tsm/model/Table.java similarity index 100% rename from new/src/main/java/it/inaf/oats/ia2/tap/tsm/model/Table.java rename to src/main/java/it/inaf/oats/ia2/tap/tsm/model/Table.java diff --git a/new/src/main/java/it/inaf/oats/ia2/tap/tsm/model/TapSchema.java b/src/main/java/it/inaf/oats/ia2/tap/tsm/model/TapSchema.java similarity index 100% rename from new/src/main/java/it/inaf/oats/ia2/tap/tsm/model/TapSchema.java rename to src/main/java/it/inaf/oats/ia2/tap/tsm/model/TapSchema.java diff --git a/new/src/main/java/it/inaf/oats/ia2/tap/tsm/rest/ApplicationConfig.java b/src/main/java/it/inaf/oats/ia2/tap/tsm/rest/ApplicationConfig.java similarity index 100% rename from new/src/main/java/it/inaf/oats/ia2/tap/tsm/rest/ApplicationConfig.java rename to src/main/java/it/inaf/oats/ia2/tap/tsm/rest/ApplicationConfig.java diff --git a/new/src/main/java/it/inaf/oats/ia2/tap/tsm/rest/EditTapSchemaPageModel.java b/src/main/java/it/inaf/oats/ia2/tap/tsm/rest/EditTapSchemaPageModel.java similarity index 100% rename from new/src/main/java/it/inaf/oats/ia2/tap/tsm/rest/EditTapSchemaPageModel.java rename to src/main/java/it/inaf/oats/ia2/tap/tsm/rest/EditTapSchemaPageModel.java diff --git a/new/src/main/java/it/inaf/oats/ia2/tap/tsm/rest/EditTapSchemaPageState.java b/src/main/java/it/inaf/oats/ia2/tap/tsm/rest/EditTapSchemaPageState.java similarity index 100% rename from new/src/main/java/it/inaf/oats/ia2/tap/tsm/rest/EditTapSchemaPageState.java rename to src/main/java/it/inaf/oats/ia2/tap/tsm/rest/EditTapSchemaPageState.java diff --git a/new/src/main/java/it/inaf/oats/ia2/tap/tsm/rest/SearchUCDDialog.java b/src/main/java/it/inaf/oats/ia2/tap/tsm/rest/SearchUCDDialog.java similarity index 100% rename from new/src/main/java/it/inaf/oats/ia2/tap/tsm/rest/SearchUCDDialog.java rename to src/main/java/it/inaf/oats/ia2/tap/tsm/rest/SearchUCDDialog.java diff --git a/new/src/main/java/it/inaf/oats/ia2/tap/tsm/rest/TapSchemaResource.java b/src/main/java/it/inaf/oats/ia2/tap/tsm/rest/TapSchemaResource.java similarity index 100% rename from new/src/main/java/it/inaf/oats/ia2/tap/tsm/rest/TapSchemaResource.java rename to src/main/java/it/inaf/oats/ia2/tap/tsm/rest/TapSchemaResource.java diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml new file mode 100644 index 0000000..10f7d6e --- /dev/null +++ b/src/main/resources/META-INF/persistence.xml @@ -0,0 +1,10 @@ + + + + jdbc/__TimerPool + false + + + + + diff --git a/new/src/main/webapp/WEB-INF/beans.xml b/src/main/webapp/WEB-INF/beans.xml similarity index 100% rename from new/src/main/webapp/WEB-INF/beans.xml rename to src/main/webapp/WEB-INF/beans.xml diff --git a/new/src/main/webapp/WEB-INF/tags/basepage.tag b/src/main/webapp/WEB-INF/tags/basepage.tag similarity index 100% rename from new/src/main/webapp/WEB-INF/tags/basepage.tag rename to src/main/webapp/WEB-INF/tags/basepage.tag diff --git a/new/src/main/webapp/WEB-INF/tags/editcheckbox.tag b/src/main/webapp/WEB-INF/tags/editcheckbox.tag similarity index 100% rename from new/src/main/webapp/WEB-INF/tags/editcheckbox.tag rename to src/main/webapp/WEB-INF/tags/editcheckbox.tag diff --git a/new/src/main/webapp/WEB-INF/tags/edittext.tag b/src/main/webapp/WEB-INF/tags/edittext.tag similarity index 100% rename from new/src/main/webapp/WEB-INF/tags/edittext.tag rename to src/main/webapp/WEB-INF/tags/edittext.tag diff --git a/new/src/main/webapp/WEB-INF/tags/schemapage.tag b/src/main/webapp/WEB-INF/tags/schemapage.tag similarity index 100% rename from new/src/main/webapp/WEB-INF/tags/schemapage.tag rename to src/main/webapp/WEB-INF/tags/schemapage.tag diff --git a/new/src/main/webapp/WEB-INF/tags/tab.tag b/src/main/webapp/WEB-INF/tags/tab.tag similarity index 100% rename from new/src/main/webapp/WEB-INF/tags/tab.tag rename to src/main/webapp/WEB-INF/tags/tab.tag diff --git a/new/src/main/webapp/WEB-INF/tags/tablepanel.tag b/src/main/webapp/WEB-INF/tags/tablepanel.tag similarity index 100% rename from new/src/main/webapp/WEB-INF/tags/tablepanel.tag rename to src/main/webapp/WEB-INF/tags/tablepanel.tag diff --git a/new/src/main/webapp/WEB-INF/tags/textfield.tag b/src/main/webapp/WEB-INF/tags/textfield.tag similarity index 100% rename from new/src/main/webapp/WEB-INF/tags/textfield.tag rename to src/main/webapp/WEB-INF/tags/textfield.tag diff --git a/new/src/main/webapp/credentials.jsp b/src/main/webapp/credentials.jsp similarity index 100% rename from new/src/main/webapp/credentials.jsp rename to src/main/webapp/credentials.jsp diff --git a/new/src/main/webapp/css/animation.css b/src/main/webapp/css/animation.css similarity index 100% rename from new/src/main/webapp/css/animation.css rename to src/main/webapp/css/animation.css diff --git a/new/src/main/webapp/css/bootstrap-theme.min.css b/src/main/webapp/css/bootstrap-theme.min.css similarity index 100% rename from new/src/main/webapp/css/bootstrap-theme.min.css rename to src/main/webapp/css/bootstrap-theme.min.css diff --git a/new/src/main/webapp/css/bootstrap.min.css b/src/main/webapp/css/bootstrap.min.css similarity index 100% rename from new/src/main/webapp/css/bootstrap.min.css rename to src/main/webapp/css/bootstrap.min.css diff --git a/new/src/main/webapp/css/fontello.css b/src/main/webapp/css/fontello.css similarity index 100% rename from new/src/main/webapp/css/fontello.css rename to src/main/webapp/css/fontello.css diff --git a/new/src/main/webapp/css/style.css b/src/main/webapp/css/style.css similarity index 100% rename from new/src/main/webapp/css/style.css rename to src/main/webapp/css/style.css diff --git a/new/src/main/webapp/editTapSchema.jsp b/src/main/webapp/editTapSchema.jsp similarity index 100% rename from new/src/main/webapp/editTapSchema.jsp rename to src/main/webapp/editTapSchema.jsp diff --git a/new/src/main/webapp/fonts/fontello.eot b/src/main/webapp/fonts/fontello.eot similarity index 100% rename from new/src/main/webapp/fonts/fontello.eot rename to src/main/webapp/fonts/fontello.eot diff --git a/new/src/main/webapp/fonts/fontello.svg b/src/main/webapp/fonts/fontello.svg similarity index 100% rename from new/src/main/webapp/fonts/fontello.svg rename to src/main/webapp/fonts/fontello.svg diff --git a/new/src/main/webapp/fonts/fontello.ttf b/src/main/webapp/fonts/fontello.ttf similarity index 100% rename from new/src/main/webapp/fonts/fontello.ttf rename to src/main/webapp/fonts/fontello.ttf diff --git a/new/src/main/webapp/fonts/fontello.woff b/src/main/webapp/fonts/fontello.woff similarity index 100% rename from new/src/main/webapp/fonts/fontello.woff rename to src/main/webapp/fonts/fontello.woff diff --git a/new/src/main/webapp/fonts/glyphicons-halflings-regular.eot b/src/main/webapp/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from new/src/main/webapp/fonts/glyphicons-halflings-regular.eot rename to src/main/webapp/fonts/glyphicons-halflings-regular.eot diff --git a/new/src/main/webapp/fonts/glyphicons-halflings-regular.svg b/src/main/webapp/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from new/src/main/webapp/fonts/glyphicons-halflings-regular.svg rename to src/main/webapp/fonts/glyphicons-halflings-regular.svg diff --git a/new/src/main/webapp/fonts/glyphicons-halflings-regular.ttf b/src/main/webapp/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from new/src/main/webapp/fonts/glyphicons-halflings-regular.ttf rename to src/main/webapp/fonts/glyphicons-halflings-regular.ttf diff --git a/new/src/main/webapp/fonts/glyphicons-halflings-regular.woff b/src/main/webapp/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from new/src/main/webapp/fonts/glyphicons-halflings-regular.woff rename to src/main/webapp/fonts/glyphicons-halflings-regular.woff diff --git a/new/src/main/webapp/fonts/glyphicons-halflings-regular.woff2 b/src/main/webapp/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from new/src/main/webapp/fonts/glyphicons-halflings-regular.woff2 rename to src/main/webapp/fonts/glyphicons-halflings-regular.woff2 diff --git a/new/src/main/webapp/index.jsp b/src/main/webapp/index.jsp similarity index 100% rename from new/src/main/webapp/index.jsp rename to src/main/webapp/index.jsp diff --git a/new/src/main/webapp/js/edit-tapschema.js b/src/main/webapp/js/edit-tapschema.js similarity index 100% rename from new/src/main/webapp/js/edit-tapschema.js rename to src/main/webapp/js/edit-tapschema.js diff --git a/new/src/main/webapp/js/lib/angular.min.js b/src/main/webapp/js/lib/angular.min.js similarity index 100% rename from new/src/main/webapp/js/lib/angular.min.js rename to src/main/webapp/js/lib/angular.min.js diff --git a/new/src/main/webapp/js/lib/bootstrap.min.js b/src/main/webapp/js/lib/bootstrap.min.js similarity index 100% rename from new/src/main/webapp/js/lib/bootstrap.min.js rename to src/main/webapp/js/lib/bootstrap.min.js diff --git a/new/src/main/webapp/js/lib/jquery-1.11.3.min.js b/src/main/webapp/js/lib/jquery-1.11.3.min.js similarity index 100% rename from new/src/main/webapp/js/lib/jquery-1.11.3.min.js rename to src/main/webapp/js/lib/jquery-1.11.3.min.js diff --git a/new/src/main/webapp/js/lib/jsonpatch.min.js b/src/main/webapp/js/lib/jsonpatch.min.js similarity index 100% rename from new/src/main/webapp/js/lib/jsonpatch.min.js rename to src/main/webapp/js/lib/jsonpatch.min.js diff --git a/new/src/main/webapp/js/select-tapschema.js b/src/main/webapp/js/select-tapschema.js similarity index 100% rename from new/src/main/webapp/js/select-tapschema.js rename to src/main/webapp/js/select-tapschema.js diff --git a/new/src/main/webapp/schema/schemas.jsp b/src/main/webapp/schema/schemas.jsp similarity index 100% rename from new/src/main/webapp/schema/schemas.jsp rename to src/main/webapp/schema/schemas.jsp diff --git a/new/src/main/webapp/schema/tables.jsp b/src/main/webapp/schema/tables.jsp similarity index 100% rename from new/src/main/webapp/schema/tables.jsp rename to src/main/webapp/schema/tables.jsp diff --git a/new/src/main/webapp/schema/test.jsp b/src/main/webapp/schema/test.jsp similarity index 100% rename from new/src/main/webapp/schema/test.jsp rename to src/main/webapp/schema/test.jsp diff --git a/new/src/main/webapp/selectTapSchema.jsp b/src/main/webapp/selectTapSchema.jsp similarity index 100% rename from new/src/main/webapp/selectTapSchema.jsp rename to src/main/webapp/selectTapSchema.jsp diff --git a/new/src/test/java/BadMockDbException.java b/src/test/java/BadMockDbException.java similarity index 100% rename from new/src/test/java/BadMockDbException.java rename to src/test/java/BadMockDbException.java diff --git a/new/src/test/java/DLTest.java b/src/test/java/DLTest.java similarity index 100% rename from new/src/test/java/DLTest.java rename to src/test/java/DLTest.java diff --git a/new/src/test/java/TestUtils.java b/src/test/java/TestUtils.java similarity index 100% rename from new/src/test/java/TestUtils.java rename to src/test/java/TestUtils.java -- GitLab