registry refactoring changes
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/4045c094 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/4045c094 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/4045c094 Branch: refs/heads/master Commit: 4045c09473e11758e79aa2f02392181868017d94 Parents: 093643a Author: Chathuri Wimalasena <[email protected]> Authored: Fri Jun 5 12:25:40 2015 -0400 Committer: Chathuri Wimalasena <[email protected]> Committed: Fri Jun 5 12:25:40 2015 -0400 ---------------------------------------------------------------------- airavata-api/airavata-api-server/pom.xml | 2 +- .../server/handler/AiravataServerHandler.java | 22 +- .../api/server/util/DatabaseCreator.java | 4 +- .../api/server/util/RegistryInitUtil.java | 14 +- modules/gfac/gfac-core/pom.xml | 2 +- modules/gfac/gfac-service/pom.xml | 2 +- .../airavata/gfac/client/util/Initialize.java | 2 +- .../src/test/resources/expcatalog-derby.sql | 391 +++++++++ .../src/test/resources/registry-derby.sql | 361 -------- modules/integration-tests/pom.xml | 2 +- modules/orchestrator/orchestrator-core/pom.xml | 2 +- .../orchestrator/core/util/Initialize.java | 6 +- .../src/test/resources/expcatalog-derby.sql | 391 +++++++++ .../src/test/resources/registry-derby.sql | 361 -------- .../orchestrator/client/util/Initialize.java | 2 +- .../src/test/resources/expcatalog-derby.sql | 391 +++++++++ ...ies~30f9d70adbd9ee7dd6f7d3eccbfca4baf19b09fa | 26 - .../src/test/resources/gsissh.properties~HEAD | 26 - ...ies~30f9d70adbd9ee7dd6f7d3eccbfca4baf19b09fa | 30 - .../src/test/resources/monitor.properties~HEAD | 30 - .../src/test/resources/registry-derby.sql | 361 -------- ...sql~30f9d70adbd9ee7dd6f7d3eccbfca4baf19b09fa | 361 -------- .../src/test/resources/registry-derby.sql~HEAD | 361 -------- modules/registry/registry-core/pom.xml | 50 +- .../catalog/impl/ApplicationDeploymentImpl.java | 72 +- .../catalog/impl/ApplicationInterfaceImpl.java | 74 +- .../app/catalog/impl/ComputeResourceImpl.java | 138 +-- .../catalog/impl/GwyResourceProfileImpl.java | 44 +- .../app/catalog/impl/WorkflowCatalogImpl.java | 40 +- .../AppDeploymentAppCatalogResourceAppCat.java | 446 ---------- .../resources/AppDeploymentResource.java | 446 ++++++++++ .../AppEnvironmentAppCatalogResourceAppCat.java | 293 ------- .../resources/AppEnvironmentResource.java | 293 +++++++ .../AppInterfaceAppCatalogResourceAppCat.java | 363 -------- .../catalog/resources/AppInterfaceResource.java | 363 ++++++++ .../AppModuleAppCatalogResourceAppCat.java | 344 -------- ...ppModuleMappingAppCatalogResourceAppCat.java | 12 +- .../catalog/resources/AppModuleResource.java | 344 ++++++++ ...pplicationInputAppCatalogResourceAppCat.java | 454 ---------- .../resources/ApplicationInputResource.java | 454 ++++++++++ ...plicationOutputAppCatalogResourceAppCat.java | 433 ---------- .../resources/ApplicationOutputResource.java | 433 ++++++++++ .../BatchQueueAppCatalogResourceAppCat.java | 357 -------- .../catalog/resources/BatchQueueResource.java | 357 ++++++++ ...CloudSubmissionAppCatalogResourceAppCat.java | 298 ------- .../resources/CloudSubmissionResource.java | 298 +++++++ ...eHostPreferenceAppCatalogResourceAppCat.java | 413 --------- .../ComputeHostPreferenceResource.java | 413 +++++++++ ...ComputeResourceAppCatalogResourceAppCat.java | 351 -------- ...ourceFileSystemAppCatalogResourceAppCat.java | 307 ------- .../ComputeResourceFileSystemResource.java | 307 +++++++ .../resources/ComputeResourceResource.java | 351 ++++++++ ...vementInterfaceAppCatalogResourceAppCat.java | 339 -------- .../DataMovementInterfaceResource.java | 339 ++++++++ .../GSISSHExportAppCatalogResourceAppCat.java | 324 -------- .../catalog/resources/GSISSHExportResource.java | 324 ++++++++ ...SISSHSubmissionAppCatalogResourceAppCat.java | 373 --------- .../resources/GSISSHSubmissionResource.java | 373 +++++++++ .../GatewayProfileAppCatalogResourceAppCat.java | 318 ------- .../resources/GatewayProfileResource.java | 318 +++++++ ...lobusGKEndpointAppCatalogResourceAppCat.java | 323 ------- .../resources/GlobusGKEndpointResource.java | 323 +++++++ ...usJobSubmissionAppCatalogResourceAppCat.java | 315 ------- .../resources/GlobusJobSubmissionResource.java | 315 +++++++ ...ftpDataMovementAppCatalogResourceAppCat.java | 279 ------- .../resources/GridftpDataMovementResource.java | 279 +++++++ ...GridftpEndpointAppCatalogResourceAppCat.java | 317 ------- .../resources/GridftpEndpointResource.java | 317 +++++++ .../HostAliasAppCatalogResourceAppCat.java | 317 ------- .../catalog/resources/HostAliasAppResource.java | 317 +++++++ .../HostIPAddressAppCatalogResourceAppCat.java | 318 ------- .../resources/HostIPAddressResource.java | 318 +++++++ ...bManagerCommandAppCatalogResourceAppCat.java | 307 ------- .../resources/JobManagerCommandResource.java | 307 +++++++ ...issionInterfaceAppCatalogResourceAppCat.java | 339 -------- .../JobSubmissionInterfaceResource.java | 339 ++++++++ ...ibraryApendPathAppCatalogResourceAppCat.java | 292 ------- .../resources/LibraryApendPathResource.java | 292 +++++++ ...raryPrepandPathAppCatalogResourceAppCat.java | 291 ------- .../resources/LibraryPrepandPathResource.java | 291 +++++++ ...calDataMovementAppCatalogResourceAppCat.java | 249 ------ .../resources/LocalDataMovementResource.java | 249 ++++++ ...LocalSubmissionAppCatalogResourceAppCat.java | 293 ------- .../resources/LocalSubmissionResource.java | 293 +++++++ .../ModuleLoadCmdAppCatalogResourceAppCat.java | 300 ------- .../resources/ModuleLoadCmdResource.java | 300 +++++++ .../PostJobCommandAppCatalogResourceAppCat.java | 333 -------- .../resources/PostJobCommandResource.java | 333 ++++++++ .../PreJobCommandAppCatalogResourceAppCat.java | 333 -------- .../resources/PreJobCommandResource.java | 333 ++++++++ ...ourceJobManagerAppCatalogResourceAppCat.java | 301 ------- .../resources/ResourceJobManagerResource.java | 301 +++++++ ...ScpDataMovementAppCatalogResourceAppCat.java | 308 ------- .../resources/ScpDataMovementResource.java | 308 +++++++ ...shJobSubmissionAppCatalogResourceAppCat.java | 332 -------- .../resources/SshJobSubmissionResource.java | 332 ++++++++ ...oreDataMovementAppCatalogResourceAppCat.java | 255 ------ .../resources/UnicoreDataMovementResource.java | 255 ++++++ ...reJobSubmissionAppCatalogResourceAppCat.java | 328 -------- .../resources/UnicoreJobSubmissionResource.java | 328 ++++++++ .../WorkflowAppCatalogResourceAppCat.java | 382 --------- .../WorkflowInputAppCatalogResourceAppCat.java | 451 ---------- .../resources/WorkflowInputResource.java | 451 ++++++++++ .../WorkflowOutputAppCatalogResourceAppCat.java | 410 --------- .../resources/WorkflowOutputResource.java | 410 +++++++++ .../app/catalog/resources/WorkflowResource.java | 382 +++++++++ .../app/catalog/util/AppCatalogJPAUtils.java | 128 +-- .../util/AppCatalogThriftConversion.java | 192 ++--- .../experiment/catalog/ExpCatResourceUtils.java | 89 +- .../catalog/impl/ExperimentCatalogImpl.java | 20 +- .../catalog/impl/ExperimentRegistry.java | 806 +++++++++--------- .../catalog/impl/GatewayRegistry.java | 16 +- .../catalog/impl/ProjectRegistry.java | 52 +- .../catalog/impl/RegistryFactory.java | 2 + .../core/experiment/catalog/impl/UserReg.java | 10 +- .../resources/AbstractExpCatResource.java | 317 +++++++ .../AbstractExperimentCatResource.java | 317 ------- ...eInputDataHandlingExperimentCatResource.java | 160 ---- .../AdvanceInputDataHandlingResource.java | 160 ++++ ...OutputDataHandlingExperimentCatResource.java | 150 ---- .../AdvancedOutputDataHandlingResource.java | 150 ++++ .../ApplicationInputExperimentCatResource.java | 230 ----- .../resources/ApplicationInputResource.java | 230 +++++ .../ApplicationOutputExperimentCatResource.java | 208 ----- .../resources/ApplicationOutputResource.java | 208 +++++ ...putationSchedulingExperimentCatResource.java | 221 ----- .../ComputationSchedulingResource.java | 221 +++++ .../ConfigDataExperimentCatResource.java | 194 ----- .../catalog/resources/ConfigDataResource.java | 194 +++++ .../ConfigurationExperimentCatResource.java | 204 ----- .../resources/ConfigurationResource.java | 204 +++++ ...DataTransferDetailExperimentCatResource.java | 276 ------ .../resources/DataTransferDetailResource.java | 276 ++++++ .../ErrorDetailExperimentCatResource.java | 215 ----- .../catalog/resources/ErrorDetailResource.java | 215 +++++ .../ExperimentExperimentCatResource.java | 831 ------------------- .../ExperimentInputExperimentCatResource.java | 225 ----- .../resources/ExperimentInputResource.java | 225 +++++ .../ExperimentOutputExperimentCatResource.java | 204 ----- .../resources/ExperimentOutputResource.java | 204 +++++ .../catalog/resources/ExperimentResource.java | 831 +++++++++++++++++++ .../ExperimentSummaryExperimentCatResource.java | 134 --- .../resources/ExperimentSummaryResource.java | 134 +++ .../resources/GatewayExperimentCatResource.java | 437 ---------- .../catalog/resources/GatewayResource.java | 437 ++++++++++ .../JobDetailExperimentCatResource.java | 376 --------- .../catalog/resources/JobDetailResource.java | 376 +++++++++ .../NodeInputExperimentCatResource.java | 227 ----- .../catalog/resources/NodeInputResource.java | 227 +++++ .../NodeOutputExperimentCatResource.java | 207 ----- .../catalog/resources/NodeOutputResource.java | 207 +++++ .../NotificationEmailExperimentCatResource.java | 119 --- .../resources/NotificationEmailResource.java | 119 +++ .../resources/ProjectExperimentCatResource.java | 508 ------------ .../catalog/resources/ProjectResource.java | 508 ++++++++++++ .../ProjectUserExperimentCatResource.java | 123 --- .../catalog/resources/ProjectUserResource.java | 123 +++ .../QosParamExperimentCatResource.java | 144 ---- .../catalog/resources/QosParamResource.java | 144 ++++ .../resources/StatusExperimentCatResource.java | 181 ---- .../catalog/resources/StatusResource.java | 181 ++++ .../TaskDetailExperimentCatResource.java | 748 ----------------- .../catalog/resources/TaskDetailResource.java | 748 +++++++++++++++++ .../resources/UserExperimentCatResource.java | 186 ----- .../catalog/resources/UserResource.java | 186 +++++ .../experiment/catalog/resources/Utils.java | 162 ++-- .../resources/WorkerExperimentCatResource.java | 725 ---------------- .../catalog/resources/WorkerResource.java | 725 ++++++++++++++++ ...WorkflowNodeDetailExperimentCatResource.java | 515 ------------ .../resources/WorkflowNodeDetailResource.java | 515 ++++++++++++ .../utils/ThriftDataModelConversion.java | 178 ++-- .../resources/META-INF/experiment-catalog.xml | 65 -- .../src/main/resources/META-INF/persistence.xml | 29 + .../catalog/AbstractResourceTest.java | 34 +- .../catalog/ComputationalSchedulingTest.java | 14 +- .../ConfigurationExperimentCatResourceTest.java | 58 -- .../catalog/ConfigurationResourceTest.java | 58 ++ .../catalog/ExperimentCatalogUseCaseTest.java | 296 ------- .../ExperimentExperimentCatResourceTest.java | 78 -- ...xperimentInputExperimentCatResourceTest.java | 77 -- .../catalog/ExperimentInputResourceTest.java | 77 ++ ...perimentOutputExperimentCatResourceTest.java | 77 -- .../catalog/ExperimentOutputResourceTest.java | 77 ++ .../catalog/ExperimentResourceTest.java | 78 ++ .../catalog/ExperimentUseCaseTest.java | 296 +++++++ .../GatewayExperimentCatResourceTest.java | 122 --- .../experiment/catalog/GatewayResourceTest.java | 122 +++ .../TaskDetailExperimentCatResourceTest.java | 94 --- .../catalog/TaskDetailResourceTest.java | 97 +++ .../catalog/UserExperimentCatResourceTest.java | 55 -- .../experiment/catalog/UserResourceTest.java | 55 ++ ...flowNodeDetailExperimentCatResourceTest.java | 86 -- .../catalog/WorkflowNodeDetailResourceTest.java | 88 ++ .../experiment/catalog/util/Initialize.java | 12 +- modules/workflow-model/workflow-engine/pom.xml | 2 +- modules/workflow/workflow-core/pom.xml | 2 +- modules/xbaya-gui/pom.xml | 2 +- 197 files changed, 24120 insertions(+), 24868 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/4045c094/airavata-api/airavata-api-server/pom.xml ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-api-server/pom.xml b/airavata-api/airavata-api-server/pom.xml index 3f0537a..b30fbeb 100644 --- a/airavata-api/airavata-api-server/pom.xml +++ b/airavata-api/airavata-api-server/pom.xml @@ -48,7 +48,7 @@ </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId.airavata.registry.core.experiment.catalog</artifactId> + <artifactId>airavata-registry-core</artifactId> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/airavata/blob/4045c094/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java index 940210a..49e8a76 100644 --- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java +++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java @@ -55,7 +55,7 @@ import org.apache.airavata.model.workspace.experiment.*; import org.apache.airavata.orchestrator.client.OrchestratorClientFactory; import org.apache.airavata.orchestrator.cpi.OrchestratorService; import org.apache.airavata.orchestrator.cpi.OrchestratorService.Client; -import org.apache.airavata.registry.core.experiment.catalog.ResourceUtils; +import org.apache.airavata.registry.core.experiment.catalog.ExpCatResourceUtils; import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory; import org.apache.airavata.registry.cpi.*; import org.apache.airavata.registry.cpi.utils.Constants; @@ -362,7 +362,7 @@ public class AiravataServerHandler implements Airavata.Iface { } List<Project> projects = new ArrayList<Project>(); try { - if (!ResourceUtils.isUserExist(userName)){ + if (!ExpCatResourceUtils.isUserExist(userName)){ logger.error("User does not exist in the system. Please provide a valid user.."); AiravataSystemException exception = new AiravataSystemException(); exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR); @@ -439,7 +439,7 @@ public class AiravataServerHandler implements Airavata.Iface { throw new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR); } try { - if (!ResourceUtils.isUserExist(userName)){ + if (!ExpCatResourceUtils.isUserExist(userName)){ logger.error("User does not exist in the system. Please provide a valid user.."); AiravataSystemException exception = new AiravataSystemException(); exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR); @@ -515,7 +515,7 @@ public class AiravataServerHandler implements Airavata.Iface { throw new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR); } try { - if (!ResourceUtils.isUserExist(userName)){ + if (!ExpCatResourceUtils.isUserExist(userName)){ logger.error("User does not exist in the system. Please provide a valid user.."); AiravataSystemException exception = new AiravataSystemException(); exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR); @@ -594,7 +594,7 @@ public class AiravataServerHandler implements Airavata.Iface { throw new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR); } try { - if (!ResourceUtils.isUserExist(userName)){ + if (!ExpCatResourceUtils.isUserExist(userName)){ logger.error("User does not exist in the system. Please provide a valid user.."); AiravataSystemException exception = new AiravataSystemException(); exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR); @@ -672,7 +672,7 @@ public class AiravataServerHandler implements Airavata.Iface { throw new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR); } try { - if (!ResourceUtils.isUserExist(userName)){ + if (!ExpCatResourceUtils.isUserExist(userName)){ logger.error("User does not exist in the system. Please provide a valid user.."); AiravataSystemException exception = new AiravataSystemException(); exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR); @@ -747,7 +747,7 @@ public class AiravataServerHandler implements Airavata.Iface { throw new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR); } try { - if (!ResourceUtils.isUserExist(userName)){ + if (!ExpCatResourceUtils.isUserExist(userName)){ logger.error("User does not exist in the system. Please provide a valid user.."); AiravataSystemException exception = new AiravataSystemException(); exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR); @@ -822,7 +822,7 @@ public class AiravataServerHandler implements Airavata.Iface { throw new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR); } try { - if (!ResourceUtils.isUserExist(userName)){ + if (!ExpCatResourceUtils.isUserExist(userName)){ logger.error("User does not exist in the system. Please provide a valid user.."); AiravataSystemException exception = new AiravataSystemException(); exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR); @@ -901,7 +901,7 @@ public class AiravataServerHandler implements Airavata.Iface { throw new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR); } try { - if (!ResourceUtils.isUserExist(userName)){ + if (!ExpCatResourceUtils.isUserExist(userName)){ logger.error("User does not exist in the system. Please provide a valid user.."); AiravataSystemException exception = new AiravataSystemException(); exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR); @@ -960,7 +960,7 @@ public class AiravataServerHandler implements Airavata.Iface { throw new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR); } try { - if (!ResourceUtils.isUserExist(userName)){ + if (!ExpCatResourceUtils.isUserExist(userName)){ logger.error("User does not exist in the system. Please provide a valid user.."); AiravataSystemException exception = new AiravataSystemException(); exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR); @@ -1112,7 +1112,7 @@ public class AiravataServerHandler implements Airavata.Iface { throw new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR); } try { - if (!ResourceUtils.isUserExist(userName)){ + if (!ExpCatResourceUtils.isUserExist(userName)){ logger.error("User does not exist in the system. Please provide a valid user.."); AiravataSystemException exception = new AiravataSystemException(); exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR); http://git-wip-us.apache.org/repos/asf/airavata/blob/4045c094/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/DatabaseCreator.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/DatabaseCreator.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/DatabaseCreator.java index 3a62688..722ec96 100644 --- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/DatabaseCreator.java +++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/DatabaseCreator.java @@ -266,10 +266,10 @@ public class DatabaseCreator { DatabaseType databaseType = DatabaseCreator.getDatabaseType(conn); if(databaseType.equals(DatabaseType.derby)){ is = Thread.currentThread().getContextClassLoader() - .getResourceAsStream("registry-core/src/main/resources/registry-derby.sql"); + .getResourceAsStream("registry-core/src/main/resources/expcatalog-derby.sql"); }else if(databaseType.equals(DatabaseType.derby)){ is = Thread.currentThread().getContextClassLoader() - .getResourceAsStream("registry-core/src/main/resources/registry-mysql.sql"); + .getResourceAsStream("registry-core/src/main/resources/expcatalog-mysql.sql"); } } reader = new BufferedReader(new InputStreamReader(is)); http://git-wip-us.apache.org/repos/asf/airavata/blob/4045c094/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/RegistryInitUtil.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/RegistryInitUtil.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/RegistryInitUtil.java index 438bc6a..b540f41 100644 --- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/RegistryInitUtil.java +++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/RegistryInitUtil.java @@ -29,8 +29,8 @@ import java.sql.SQLException; import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.common.utils.ServerSettings; +import org.apache.airavata.registry.core.experiment.catalog.ExpCatResourceUtils; import org.apache.airavata.registry.core.experiment.catalog.ResourceType; -import org.apache.airavata.registry.core.experiment.catalog.ResourceUtils; import org.apache.airavata.registry.core.experiment.catalog.resources.GatewayResource; import org.apache.airavata.registry.core.experiment.catalog.resources.ProjectResource; import org.apache.airavata.registry.core.experiment.catalog.resources.UserResource; @@ -85,19 +85,19 @@ public class RegistryInitUtil { } try{ GatewayResource gateway; - if (!ResourceUtils.isGatewayExist(ServerSettings.getDefaultUserGateway())){ - gateway = (GatewayResource)ResourceUtils.createGateway(ServerSettings.getDefaultUserGateway()); + if (!ExpCatResourceUtils.isGatewayExist(ServerSettings.getDefaultUserGateway())){ + gateway = (GatewayResource)ExpCatResourceUtils.createGateway(ServerSettings.getDefaultUserGateway()); gateway.save(); }else { - gateway = (GatewayResource)ResourceUtils.getGateway(ServerSettings.getDefaultUserGateway()); + gateway = (GatewayResource)ExpCatResourceUtils.getGateway(ServerSettings.getDefaultUserGateway()); } UserResource user; - if (!ResourceUtils.isUserExist(ServerSettings.getDefaultUser())){ - user = ResourceUtils.createUser(ServerSettings.getDefaultUser(), ServerSettings.getDefaultUserPassword()); + if (!ExpCatResourceUtils.isUserExist(ServerSettings.getDefaultUser())){ + user = ExpCatResourceUtils.createUser(ServerSettings.getDefaultUser(), ServerSettings.getDefaultUserPassword()); user.save(); }else { - user = (UserResource)ResourceUtils.getUser(ServerSettings.getDefaultUser()); + user = (UserResource)ExpCatResourceUtils.getUser(ServerSettings.getDefaultUser()); } WorkerResource workerResource; http://git-wip-us.apache.org/repos/asf/airavata/blob/4045c094/modules/gfac/gfac-core/pom.xml ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/pom.xml b/modules/gfac/gfac-core/pom.xml index f1de99c..1004ba9 100644 --- a/modules/gfac/gfac-core/pom.xml +++ b/modules/gfac/gfac-core/pom.xml @@ -47,7 +47,7 @@ </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId.airavata.registry.core.experiment.catalog</artifactId> + <artifactId>airavata-registry-core</artifactId> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/airavata/blob/4045c094/modules/gfac/gfac-service/pom.xml ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-service/pom.xml b/modules/gfac/gfac-service/pom.xml index f3b794b..f1d4d6c 100644 --- a/modules/gfac/gfac-service/pom.xml +++ b/modules/gfac/gfac-service/pom.xml @@ -52,7 +52,7 @@ </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId.airavata.registry.core.experiment.catalog</artifactId> + <artifactId>airavata-registry-core</artifactId> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/airavata/blob/4045c094/modules/gfac/gfac-service/src/test/java/org/apache/airavata/gfac/client/util/Initialize.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-service/src/test/java/org/apache/airavata/gfac/client/util/Initialize.java b/modules/gfac/gfac-service/src/test/java/org/apache/airavata/gfac/client/util/Initialize.java index 548d4b5..e75bce1 100644 --- a/modules/gfac/gfac-service/src/test/java/org/apache/airavata/gfac/client/util/Initialize.java +++ b/modules/gfac/gfac-service/src/test/java/org/apache/airavata/gfac/client/util/Initialize.java @@ -41,7 +41,7 @@ import java.util.StringTokenizer; public class Initialize { private static final Logger logger = LoggerFactory.getLogger(Initialize.class); public static final String DERBY_SERVER_MODE_SYS_PROPERTY = "derby.drda.startNetworkServer"; - public String scriptName = "registry-derby.sql"; + public String scriptName = "expcatalog-derby.sql"; private NetworkServerControl server; private static final String delimiter = ";"; public static final String PERSISTANT_DATA = "Configuration"; http://git-wip-us.apache.org/repos/asf/airavata/blob/4045c094/modules/gfac/gfac-service/src/test/resources/expcatalog-derby.sql ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-service/src/test/resources/expcatalog-derby.sql b/modules/gfac/gfac-service/src/test/resources/expcatalog-derby.sql new file mode 100644 index 0000000..7ab3755 --- /dev/null +++ b/modules/gfac/gfac-service/src/test/resources/expcatalog-derby.sql @@ -0,0 +1,391 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ +CREATE TABLE GATEWAY +( + GATEWAY_ID VARCHAR (255), + GATEWAY_NAME VARCHAR(255), + DOMAIN VARCHAR(255), + EMAIL_ADDRESS VARCHAR(255), + PRIMARY KEY (GATEWAY_ID) +); + +CREATE TABLE CONFIGURATION +( + CONFIG_KEY VARCHAR(255), + CONFIG_VAL VARCHAR(255), + EXPIRE_DATE TIMESTAMP DEFAULT '0000-00-00 00:00:00', + CATEGORY_ID VARCHAR (255), + PRIMARY KEY(CONFIG_KEY, CONFIG_VAL, CATEGORY_ID) +); + +INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL, EXPIRE_DATE, CATEGORY_ID) VALUES('registry.version', '0.15', CURRENT_TIMESTAMP ,'SYSTEM'); + +CREATE TABLE USERS +( + USER_NAME VARCHAR(255), + PASSWORD VARCHAR(255), + PRIMARY KEY(USER_NAME) +); + +CREATE TABLE GATEWAY_WORKER +( + GATEWAY_ID VARCHAR(255), + USER_NAME VARCHAR(255), + PRIMARY KEY (GATEWAY_ID, USER_NAME), + FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY(GATEWAY_ID) ON DELETE CASCADE, + FOREIGN KEY (USER_NAME) REFERENCES USERS(USER_NAME) ON DELETE CASCADE +); + +CREATE TABLE PROJECT +( + GATEWAY_ID VARCHAR(255), + USER_NAME VARCHAR(255) NOT NULL, + PROJECT_ID VARCHAR(255), + PROJECT_NAME VARCHAR(255) NOT NULL, + DESCRIPTION VARCHAR(255), + CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (PROJECT_ID), + FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY(GATEWAY_ID) ON DELETE CASCADE, + FOREIGN KEY (USER_NAME) REFERENCES USERS(USER_NAME) ON DELETE CASCADE +); + +CREATE TABLE PROJECT_USER +( + PROJECT_ID VARCHAR(255), + USER_NAME VARCHAR(255), + PRIMARY KEY (PROJECT_ID,USER_NAME), + FOREIGN KEY (PROJECT_ID) REFERENCES PROJECT(PROJECT_ID) ON DELETE CASCADE, + FOREIGN KEY (USER_NAME) REFERENCES USERS(USER_NAME) ON DELETE CASCADE +); + +CREATE TABLE EXPERIMENT +( + EXPERIMENT_ID VARCHAR(255), + GATEWAY_ID VARCHAR(255), + EXECUTION_USER VARCHAR(255) NOT NULL, + PROJECT_ID VARCHAR(255) NOT NULL, + CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + EXPERIMENT_NAME VARCHAR(255) NOT NULL, + EXPERIMENT_DESCRIPTION VARCHAR(255), + APPLICATION_ID VARCHAR(255), + APPLICATION_VERSION VARCHAR(255), + WORKFLOW_TEMPLATE_ID VARCHAR(255), + WORKFLOW_TEMPLATE_VERSION VARCHAR(255), + WORKFLOW_EXECUTION_ID VARCHAR(255), + ALLOW_NOTIFICATION SMALLINT, + GATEWAY_EXECUTION_ID VARCHAR(255), + PRIMARY KEY(EXPERIMENT_ID), + FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY(GATEWAY_ID) ON DELETE CASCADE, + FOREIGN KEY (EXECUTION_USER) REFERENCES USERS(USER_NAME) ON DELETE CASCADE, + FOREIGN KEY (PROJECT_ID) REFERENCES PROJECT(PROJECT_ID) ON DELETE CASCADE +); + +CREATE TABLE EXPERIMENT_INPUT +( + EXPERIMENT_ID VARCHAR(255), + INPUT_KEY VARCHAR(255) NOT NULL, + DATA_TYPE VARCHAR(255), + METADATA VARCHAR(255), + APP_ARGUMENT VARCHAR(255), + STANDARD_INPUT SMALLINT, + USER_FRIENDLY_DESC VARCHAR(255), + VALUE CLOB, + INPUT_ORDER INTEGER, + IS_REQUIRED SMALLINT, + REQUIRED_TO_COMMANDLINE SMALLINT, + DATA_STAGED SMALLINT, + PRIMARY KEY(EXPERIMENT_ID,INPUT_KEY), + FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE +); + +CREATE TABLE EXPERIMENT_OUTPUT +( + EXPERIMENT_ID VARCHAR(255), + OUTPUT_KEY VARCHAR(255) NOT NULL, + DATA_TYPE VARCHAR(255), + VALUE CLOB, + IS_REQUIRED SMALLINT, + REQUIRED_TO_COMMANDLINE SMALLINT, + DATA_MOVEMENT SMALLINT, + DATA_NAME_LOCATION VARCHAR(255), + SEARCH_QUERY VARCHAR(255), + APP_ARGUMENT VARCHAR(255), + PRIMARY KEY(EXPERIMENT_ID,OUTPUT_KEY), + FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE +); + + +CREATE TABLE WORKFLOW_NODE_DETAIL +( + EXPERIMENT_ID VARCHAR(255) NOT NULL, + NODE_INSTANCE_ID VARCHAR(255), + CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + NODE_NAME VARCHAR(255) NOT NULL, + EXECUTION_UNIT VARCHAR(255) NOT NULL, + EXECUTION_UNIT_DATA VARCHAR(255), + PRIMARY KEY(NODE_INSTANCE_ID), + FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE +); + +CREATE TABLE TASK_DETAIL +( + TASK_ID VARCHAR(255), + NODE_INSTANCE_ID VARCHAR(255), + CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + APPLICATION_ID VARCHAR(255), + APPLICATION_VERSION VARCHAR(255), + APPLICATION_DEPLOYMENT_ID VARCHAR(255), + ALLOW_NOTIFICATION SMALLINT, + PRIMARY KEY(TASK_ID), + FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE +); + +CREATE TABLE NOTIFICATION_EMAIL +( + EMAIL_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY, + EXPERIMENT_ID VARCHAR(255), + TASK_ID VARCHAR(255), + EMAIL_ADDRESS VARCHAR(255), + PRIMARY KEY(EMAIL_ID), + FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE, + FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE +); + +CREATE TABLE ERROR_DETAIL +( + ERROR_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY, + EXPERIMENT_ID VARCHAR(255), + TASK_ID VARCHAR(255), + NODE_INSTANCE_ID VARCHAR(255), + JOB_ID VARCHAR(255), + CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + ACTUAL_ERROR_MESSAGE CLOB, + USER_FRIEDNLY_ERROR_MSG VARCHAR(255), + TRANSIENT_OR_PERSISTENT SMALLINT, + ERROR_CATEGORY VARCHAR(255), + CORRECTIVE_ACTION VARCHAR(255), + ACTIONABLE_GROUP VARCHAR(255), + PRIMARY KEY(ERROR_ID), + FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE, + FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE, + FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE +); + +CREATE TABLE APPLICATION_INPUT +( + TASK_ID VARCHAR(255), + INPUT_KEY VARCHAR(255) NOT NULL, + DATA_TYPE VARCHAR(255), + METADATA VARCHAR(255), + APP_ARGUMENT VARCHAR(255), + STANDARD_INPUT SMALLINT, + USER_FRIENDLY_DESC VARCHAR(255), + VALUE CLOB, + INPUT_ORDER INTEGER, + IS_REQUIRED SMALLINT, + REQUIRED_TO_COMMANDLINE SMALLINT, + DATA_STAGED SMALLINT, + PRIMARY KEY(TASK_ID,INPUT_KEY), + FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE +); + +CREATE TABLE APPLICATION_OUTPUT +( + TASK_ID VARCHAR(255), + OUTPUT_KEY VARCHAR(255) NOT NULL, + DATA_TYPE VARCHAR(255), + VALUE CLOB, + IS_REQUIRED SMALLINT, + REQUIRED_TO_COMMANDLINE SMALLINT, + DATA_MOVEMENT SMALLINT, + DATA_NAME_LOCATION VARCHAR(255), + SEARCH_QUERY VARCHAR(255), + APP_ARGUMENT VARCHAR(255), + PRIMARY KEY(TASK_ID,OUTPUT_KEY), + FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE +); + +CREATE TABLE NODE_INPUT +( + NODE_INSTANCE_ID VARCHAR(255), + INPUT_KEY VARCHAR(255) NOT NULL, + DATA_TYPE VARCHAR(255), + METADATA VARCHAR(255), + APP_ARGUMENT VARCHAR(255), + STANDARD_INPUT SMALLINT, + USER_FRIENDLY_DESC VARCHAR(255), + VALUE VARCHAR(255), + INPUT_ORDER INTEGER, + IS_REQUIRED SMALLINT, + REQUIRED_TO_COMMANDLINE SMALLINT, + DATA_STAGED SMALLINT, + PRIMARY KEY(NODE_INSTANCE_ID,INPUT_KEY), + FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE +); + +CREATE TABLE NODE_OUTPUT +( + NODE_INSTANCE_ID VARCHAR(255), + OUTPUT_KEY VARCHAR(255) NOT NULL, + DATA_TYPE VARCHAR(255), + VALUE VARCHAR(255), + IS_REQUIRED SMALLINT, + REQUIRED_TO_COMMANDLINE SMALLINT, + DATA_MOVEMENT SMALLINT, + DATA_NAME_LOCATION VARCHAR(255), + SEARCH_QUERY VARCHAR(255), + APP_ARGUMENT VARCHAR(255), + PRIMARY KEY(NODE_INSTANCE_ID,OUTPUT_KEY), + FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE +); + +CREATE TABLE JOB_DETAIL +( + JOB_ID VARCHAR(255), + TASK_ID VARCHAR(255), + JOB_DESCRIPTION CLOB NOT NULL, + CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + COMPUTE_RESOURCE_CONSUMED VARCHAR(255), + JOBNAME VARCHAR (255), + WORKING_DIR VARCHAR(255), + PRIMARY KEY (TASK_ID, JOB_ID), + FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE +); + +CREATE TABLE DATA_TRANSFER_DETAIL +( + TRANSFER_ID VARCHAR(255), + TASK_ID VARCHAR(255), + CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + TRANSFER_DESC VARCHAR(255) NOT NULL, + PRIMARY KEY(TRANSFER_ID), + FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE +); + +CREATE TABLE STATUS +( + STATUS_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY, + EXPERIMENT_ID VARCHAR(255), + NODE_INSTANCE_ID VARCHAR(255), + TRANSFER_ID VARCHAR(255), + TASK_ID VARCHAR(255), + JOB_ID VARCHAR(255), + STATE VARCHAR(255), + STATUS_UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00', + STATUS_TYPE VARCHAR(255), + PRIMARY KEY(STATUS_ID), + FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE, + FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE, + FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE, + FOREIGN KEY (TRANSFER_ID) REFERENCES DATA_TRANSFER_DETAIL(TRANSFER_ID) ON DELETE CASCADE +); + +CREATE TABLE CONFIG_DATA +( + EXPERIMENT_ID VARCHAR(255), + AIRAVATA_AUTO_SCHEDULE SMALLINT NOT NULL, + OVERRIDE_MANUAL_SCHEDULE_PARAMS SMALLINT NOT NULL, + SHARE_EXPERIMENT SMALLINT, + USER_DN VARCHAR(255), + GENERATE_CERT SMALLINT, + PRIMARY KEY(EXPERIMENT_ID) +); + +CREATE TABLE COMPUTATIONAL_RESOURCE_SCHEDULING +( + RESOURCE_SCHEDULING_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY, + EXPERIMENT_ID VARCHAR(255), + TASK_ID VARCHAR(255), + RESOURCE_HOST_ID VARCHAR(255), + CPU_COUNT INTEGER, + NODE_COUNT INTEGER, + NO_OF_THREADS INTEGER, + QUEUE_NAME VARCHAR(255), + WALLTIME_LIMIT INTEGER, + JOB_START_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00', + TOTAL_PHYSICAL_MEMORY INTEGER, + COMPUTATIONAL_PROJECT_ACCOUNT VARCHAR(255), + CHESSIS_NAME VARCHAR(255), + PRIMARY KEY(RESOURCE_SCHEDULING_ID), + FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE, + FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE +); + +CREATE TABLE ADVANCE_INPUT_DATA_HANDLING +( + INPUT_DATA_HANDLING_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY, + EXPERIMENT_ID VARCHAR(255), + TASK_ID VARCHAR(255), + WORKING_DIR_PARENT VARCHAR(255), + UNIQUE_WORKING_DIR VARCHAR(255), + STAGE_INPUT_FILES_TO_WORKING_DIR SMALLINT, + CLEAN_AFTER_JOB SMALLINT, + PRIMARY KEY(INPUT_DATA_HANDLING_ID), + FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE, + FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE +); + +CREATE TABLE ADVANCE_OUTPUT_DATA_HANDLING +( + OUTPUT_DATA_HANDLING_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY, + EXPERIMENT_ID VARCHAR(255), + TASK_ID VARCHAR(255), + OUTPUT_DATA_DIR VARCHAR(255), + DATA_REG_URL VARCHAR (255), + PERSIST_OUTPUT_DATA SMALLINT, + PRIMARY KEY(OUTPUT_DATA_HANDLING_ID), + FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE, + FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE +); + +CREATE TABLE QOS_PARAM +( + QOS_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY, + EXPERIMENT_ID VARCHAR(255), + TASK_ID VARCHAR(255), + START_EXECUTION_AT VARCHAR(255), + EXECUTE_BEFORE VARCHAR(255), + NO_OF_RETRIES INTEGER, + PRIMARY KEY(QOS_ID), + FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE, + FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE +); + +CREATE TABLE COMMUNITY_USER +( + GATEWAY_ID VARCHAR(256) NOT NULL, + COMMUNITY_USER_NAME VARCHAR(256) NOT NULL, + TOKEN_ID VARCHAR(256) NOT NULL, + COMMUNITY_USER_EMAIL VARCHAR(256) NOT NULL, + PRIMARY KEY (GATEWAY_ID, COMMUNITY_USER_NAME, TOKEN_ID) +); + +CREATE TABLE CREDENTIALS +( + GATEWAY_ID VARCHAR(256) NOT NULL, + TOKEN_ID VARCHAR(256) NOT NULL, + CREDENTIAL BLOB NOT NULL, + PORTAL_USER_ID VARCHAR(256) NOT NULL, + TIME_PERSISTED TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (GATEWAY_ID, TOKEN_ID) +); + + http://git-wip-us.apache.org/repos/asf/airavata/blob/4045c094/modules/gfac/gfac-service/src/test/resources/registry-derby.sql ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-service/src/test/resources/registry-derby.sql b/modules/gfac/gfac-service/src/test/resources/registry-derby.sql deleted file mode 100644 index 9ed5ca9..0000000 --- a/modules/gfac/gfac-service/src/test/resources/registry-derby.sql +++ /dev/null @@ -1,361 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -CREATE TABLE GATEWAY -( - GATEWAY_NAME VARCHAR(255), - OWNER VARCHAR(255), - PRIMARY KEY (GATEWAY_NAME) -); - -CREATE TABLE CONFIGURATION -( - CONFIG_KEY VARCHAR(255), - CONFIG_VAL VARCHAR(255), - EXPIRE_DATE TIMESTAMP DEFAULT '0000-00-00 00:00:00', - CATEGORY_ID VARCHAR (255), - PRIMARY KEY(CONFIG_KEY, CONFIG_VAL, CATEGORY_ID) -); - -INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL, EXPIRE_DATE, CATEGORY_ID) VALUES('registry.version', '0.12', CURRENT_TIMESTAMP ,'SYSTEM'); - -CREATE TABLE USERS -( - USER_NAME VARCHAR(255), - PASSWORD VARCHAR(255), - PRIMARY KEY(USER_NAME) -); - -CREATE TABLE GATEWAY_WORKER -( - GATEWAY_NAME VARCHAR(255), - USER_NAME VARCHAR(255), - PRIMARY KEY (GATEWAY_NAME, USER_NAME), - FOREIGN KEY (GATEWAY_NAME) REFERENCES GATEWAY(GATEWAY_NAME) ON DELETE CASCADE, - FOREIGN KEY (USER_NAME) REFERENCES USERS(USER_NAME) ON DELETE CASCADE -); - -CREATE TABLE PROJECT -( - GATEWAY_NAME VARCHAR(255), - USER_NAME VARCHAR(255) NOT NULL, - PROJECT_ID VARCHAR(255), - PROJECT_NAME VARCHAR(255) NOT NULL, - DESCRIPTION VARCHAR(255), - CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - PRIMARY KEY (PROJECT_ID), - FOREIGN KEY (GATEWAY_NAME) REFERENCES GATEWAY(GATEWAY_NAME) ON DELETE CASCADE, - FOREIGN KEY (USER_NAME) REFERENCES USERS(USER_NAME) ON DELETE CASCADE -); - -CREATE TABLE PROJECT_USER -( - PROJECT_ID VARCHAR(255), - USER_NAME VARCHAR(255), - PRIMARY KEY (PROJECT_ID,USER_NAME), - FOREIGN KEY (PROJECT_ID) REFERENCES PROJECT(PROJECT_ID) ON DELETE CASCADE, - FOREIGN KEY (USER_NAME) REFERENCES USERS(USER_NAME) ON DELETE CASCADE -); - -CREATE TABLE PUBLISHED_WORKFLOW -( - GATEWAY_NAME VARCHAR(255), - CREATED_USER VARCHAR(255), - PUBLISH_WORKFLOW_NAME VARCHAR(255), - VERSION VARCHAR(255), - PUBLISHED_DATE TIMESTAMP DEFAULT '0000-00-00 00:00:00', - PATH VARCHAR (255), - WORKFLOW_CONTENT BLOB, - PRIMARY KEY(GATEWAY_NAME, PUBLISH_WORKFLOW_NAME), - FOREIGN KEY (GATEWAY_NAME) REFERENCES GATEWAY(GATEWAY_NAME) ON DELETE CASCADE, - FOREIGN KEY (CREATED_USER) REFERENCES USERS(USER_NAME) ON DELETE CASCADE -); - -CREATE TABLE USER_WORKFLOW -( - GATEWAY_NAME VARCHAR(255), - OWNER VARCHAR(255), - TEMPLATE_NAME VARCHAR(255), - LAST_UPDATED_TIME TIMESTAMP DEFAULT CURRENT TIMESTAMP, - PATH VARCHAR (255), - WORKFLOW_GRAPH BLOB, - PRIMARY KEY(GATEWAY_NAME, OWNER, TEMPLATE_NAME), - FOREIGN KEY (GATEWAY_NAME) REFERENCES GATEWAY(GATEWAY_NAME) ON DELETE CASCADE, - FOREIGN KEY (OWNER) REFERENCES USERS(USER_NAME) ON DELETE CASCADE -); - -CREATE TABLE EXPERIMENT -( - EXPERIMENT_ID VARCHAR(255), - GATEWAY_NAME VARCHAR(255), - EXECUTION_USER VARCHAR(255) NOT NULL, - PROJECT_ID VARCHAR(255) NOT NULL, - CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - EXPERIMENT_NAME VARCHAR(255) NOT NULL, - EXPERIMENT_DESCRIPTION VARCHAR(255), - APPLICATION_ID VARCHAR(255), - APPLICATION_VERSION VARCHAR(255), - WORKFLOW_TEMPLATE_ID VARCHAR(255), - WORKFLOW_TEMPLATE_VERSION VARCHAR(255), - WORKFLOW_EXECUTION_ID VARCHAR(255), - PRIMARY KEY(EXPERIMENT_ID), - FOREIGN KEY (GATEWAY_NAME) REFERENCES GATEWAY(GATEWAY_NAME) ON DELETE CASCADE, - FOREIGN KEY (EXECUTION_USER) REFERENCES USERS(USER_NAME) ON DELETE CASCADE, - FOREIGN KEY (PROJECT_ID) REFERENCES PROJECT(PROJECT_ID) ON DELETE CASCADE -); - -CREATE TABLE EXPERIMENT_INPUT -( - EXPERIMENT_ID VARCHAR(255), - INPUT_KEY VARCHAR(255) NOT NULL, - INPUT_TYPE VARCHAR(255), - METADATA VARCHAR(255), - VALUE CLOB, - PRIMARY KEY(EXPERIMENT_ID,INPUT_KEY), - FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE -); - -CREATE TABLE EXPERIMENT_OUTPUT -( - EXPERIMENT_ID VARCHAR(255), - OUTPUT_KEY VARCHAR(255) NOT NULL, - OUTPUT_KEY_TYPE VARCHAR(255), - METADATA VARCHAR(255), - VALUE CLOB, - PRIMARY KEY(EXPERIMENT_ID,OUTPUT_KEY), - FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE -); - - -CREATE TABLE WORKFLOW_NODE_DETAIL -( - EXPERIMENT_ID VARCHAR(255) NOT NULL, - NODE_INSTANCE_ID VARCHAR(255), - CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - NODE_NAME VARCHAR(255) NOT NULL, - EXECUTION_UNIT VARCHAR(255) NOT NULL, - EXECUTION_UNIT_DATA VARCHAR(255), - PRIMARY KEY(NODE_INSTANCE_ID), - FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE -); - -CREATE TABLE TASK_DETAIL -( - TASK_ID VARCHAR(255), - NODE_INSTANCE_ID VARCHAR(255), - CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - APPLICATION_ID VARCHAR(255), - APPLICATION_VERSION VARCHAR(255), - APPLICATION_DEPLOYMENT_ID VARCHAR(255), - PRIMARY KEY(TASK_ID), - FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE -); - -CREATE TABLE ERROR_DETAIL -( - ERROR_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY, - EXPERIMENT_ID VARCHAR(255), - TASK_ID VARCHAR(255), - NODE_INSTANCE_ID VARCHAR(255), - JOB_ID VARCHAR(255), - CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - ACTUAL_ERROR_MESSAGE CLOB, - USER_FRIEDNLY_ERROR_MSG VARCHAR(255), - TRANSIENT_OR_PERSISTENT SMALLINT, - ERROR_CATEGORY VARCHAR(255), - CORRECTIVE_ACTION VARCHAR(255), - ACTIONABLE_GROUP VARCHAR(255), - PRIMARY KEY(ERROR_ID), - FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE, - FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE, - FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE -); - -CREATE TABLE APPLICATION_INPUT -( - TASK_ID VARCHAR(255), - INPUT_KEY VARCHAR(255) NOT NULL, - INPUT_KEY_TYPE VARCHAR(255), - METADATA VARCHAR(255), - VALUE CLOB, - PRIMARY KEY(TASK_ID,INPUT_KEY), - FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE -); - -CREATE TABLE APPLICATION_OUTPUT -( - TASK_ID VARCHAR(255), - OUTPUT_KEY VARCHAR(255) NOT NULL, - OUTPUT_KEY_TYPE VARCHAR(255), - METADATA VARCHAR(255), - VALUE CLOB, - PRIMARY KEY(TASK_ID,OUTPUT_KEY), - FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE -); - -CREATE TABLE NODE_INPUT -( - NODE_INSTANCE_ID VARCHAR(255), - INPUT_KEY VARCHAR(255) NOT NULL, - INPUT_KEY_TYPE VARCHAR(255), - METADATA VARCHAR(255), - VALUE VARCHAR(255), - PRIMARY KEY(NODE_INSTANCE_ID,INPUT_KEY), - FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE -); - -CREATE TABLE NODE_OUTPUT -( - NODE_INSTANCE_ID VARCHAR(255), - OUTPUT_KEY VARCHAR(255) NOT NULL, - OUTPUT_KEY_TYPE VARCHAR(255), - METADATA VARCHAR(255), - VALUE VARCHAR(255), - PRIMARY KEY(NODE_INSTANCE_ID,OUTPUT_KEY), - FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE -); - -CREATE TABLE JOB_DETAIL -( - JOB_ID VARCHAR(255), - TASK_ID VARCHAR(255), - JOB_DESCRIPTION CLOB NOT NULL, - CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - COMPUTE_RESOURCE_CONSUMED VARCHAR(255), - PRIMARY KEY (TASK_ID, JOB_ID), - FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE -); - -CREATE TABLE DATA_TRANSFER_DETAIL -( - TRANSFER_ID VARCHAR(255), - TASK_ID VARCHAR(255), - CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - TRANSFER_DESC CLOB NOT NULL, - PRIMARY KEY(TRANSFER_ID), - FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE -); - -CREATE TABLE STATUS -( - STATUS_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY, - EXPERIMENT_ID VARCHAR(255), - NODE_INSTANCE_ID VARCHAR(255), - TRANSFER_ID VARCHAR(255), - TASK_ID VARCHAR(255), - JOB_ID VARCHAR(255), - STATE VARCHAR(255), - STATUS_UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00', - STATUS_TYPE VARCHAR(255), - PRIMARY KEY(STATUS_ID), - FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE, - FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE, - FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE, - FOREIGN KEY (TRANSFER_ID) REFERENCES DATA_TRANSFER_DETAIL(TRANSFER_ID) ON DELETE CASCADE -); - -CREATE TABLE CONFIG_DATA -( - EXPERIMENT_ID VARCHAR(255), - AIRAVATA_AUTO_SCHEDULE SMALLINT NOT NULL, - OVERRIDE_MANUAL_SCHEDULE_PARAMS SMALLINT NOT NULL, - SHARE_EXPERIMENT SMALLINT, - PRIMARY KEY(EXPERIMENT_ID) -); - -CREATE TABLE COMPUTATIONAL_RESOURCE_SCHEDULING -( - RESOURCE_SCHEDULING_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY, - EXPERIMENT_ID VARCHAR(255), - TASK_ID VARCHAR(255), - RESOURCE_HOST_ID VARCHAR(255), - CPU_COUNT INTEGER, - NODE_COUNT INTEGER, - NO_OF_THREADS INTEGER, - QUEUE_NAME VARCHAR(255), - WALLTIME_LIMIT INTEGER, - JOB_START_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00', - TOTAL_PHYSICAL_MEMORY INTEGER, - COMPUTATIONAL_PROJECT_ACCOUNT VARCHAR(255), - PRIMARY KEY(RESOURCE_SCHEDULING_ID), - FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE, - FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE -); - -CREATE TABLE ADVANCE_INPUT_DATA_HANDLING -( - INPUT_DATA_HANDLING_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY, - EXPERIMENT_ID VARCHAR(255), - TASK_ID VARCHAR(255), - WORKING_DIR_PARENT VARCHAR(255), - UNIQUE_WORKING_DIR VARCHAR(255), - STAGE_INPUT_FILES_TO_WORKING_DIR SMALLINT, - CLEAN_AFTER_JOB SMALLINT, - PRIMARY KEY(INPUT_DATA_HANDLING_ID), - FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE, - FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE -); - -CREATE TABLE ADVANCE_OUTPUT_DATA_HANDLING -( - OUTPUT_DATA_HANDLING_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY, - EXPERIMENT_ID VARCHAR(255), - TASK_ID VARCHAR(255), - OUTPUT_DATA_DIR VARCHAR(255), - DATA_REG_URL VARCHAR (255), - PERSIST_OUTPUT_DATA SMALLINT, - PRIMARY KEY(OUTPUT_DATA_HANDLING_ID), - FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE, - FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE -); - -CREATE TABLE QOS_PARAM -( - QOS_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY, - EXPERIMENT_ID VARCHAR(255), - TASK_ID VARCHAR(255), - START_EXECUTION_AT VARCHAR(255), - EXECUTE_BEFORE VARCHAR(255), - NO_OF_RETRIES INTEGER, - PRIMARY KEY(QOS_ID), - FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE, - FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE -); - -CREATE TABLE COMMUNITY_USER -( - GATEWAY_NAME VARCHAR(256) NOT NULL, - COMMUNITY_USER_NAME VARCHAR(256) NOT NULL, - TOKEN_ID VARCHAR(256) NOT NULL, - COMMUNITY_USER_EMAIL VARCHAR(256) NOT NULL, - PRIMARY KEY (GATEWAY_NAME, COMMUNITY_USER_NAME, TOKEN_ID) -); - -CREATE TABLE CREDENTIALS -( - GATEWAY_ID VARCHAR(256) NOT NULL, - TOKEN_ID VARCHAR(256) NOT NULL, - CREDENTIAL BLOB NOT NULL, - PORTAL_USER_ID VARCHAR(256) NOT NULL, - TIME_PERSISTED TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - PRIMARY KEY (GATEWAY_ID, TOKEN_ID) -); - - http://git-wip-us.apache.org/repos/asf/airavata/blob/4045c094/modules/integration-tests/pom.xml ---------------------------------------------------------------------- diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml index b4700ec..bbc4d9c 100644 --- a/modules/integration-tests/pom.xml +++ b/modules/integration-tests/pom.xml @@ -182,7 +182,7 @@ <dependency> <groupId>org.apache.airavata</groupId> - <artifactId.airavata.registry.core.experiment.catalog</artifactId> + <artifactId>airavata-registry-core</artifactId> <version>${project.version}</version> <exclusions> <exclusion> http://git-wip-us.apache.org/repos/asf/airavata/blob/4045c094/modules/orchestrator/orchestrator-core/pom.xml ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-core/pom.xml b/modules/orchestrator/orchestrator-core/pom.xml index 4882e58..f0bbafb 100644 --- a/modules/orchestrator/orchestrator-core/pom.xml +++ b/modules/orchestrator/orchestrator-core/pom.xml @@ -36,7 +36,7 @@ the License. --> </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId.airavata.registry.core.experiment.catalog</artifactId> + <artifactId>airavata-registry-core</artifactId> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/airavata/blob/4045c094/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/util/Initialize.java ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/util/Initialize.java b/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/util/Initialize.java index 5b0247f..4c5c219 100644 --- a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/util/Initialize.java +++ b/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/util/Initialize.java @@ -23,8 +23,8 @@ package org.apache.airavata.orchestrator.core.util; import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.common.utils.ServerSettings; -import org.apache.airavata.registry.core.experiment.catalog.ResourceType; -import org.apache.airavata.registry.core.experiment.catalog.resources.*; +import org.apache.airavata.experiment.catalog.ResourceType; +import org.apache.airavata.experiment.catalog.resources.*; import org.apache.airavata.registry.cpi.RegistryException; import org.apache.derby.drda.NetworkServerControl; import org.slf4j.Logger; @@ -41,7 +41,7 @@ import java.util.StringTokenizer; public class Initialize { private static final Logger logger = LoggerFactory.getLogger(Initialize.class); public static final String DERBY_SERVER_MODE_SYS_PROPERTY = "derby.drda.startNetworkServer"; - public String scriptName = "registry-derby.sql"; + public String scriptName = "expcatalog-derby.sql"; private NetworkServerControl server; private static final String delimiter = ";"; public static final String PERSISTANT_DATA = "Configuration"; http://git-wip-us.apache.org/repos/asf/airavata/blob/4045c094/modules/orchestrator/orchestrator-core/src/test/resources/expcatalog-derby.sql ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-core/src/test/resources/expcatalog-derby.sql b/modules/orchestrator/orchestrator-core/src/test/resources/expcatalog-derby.sql new file mode 100644 index 0000000..7ab3755 --- /dev/null +++ b/modules/orchestrator/orchestrator-core/src/test/resources/expcatalog-derby.sql @@ -0,0 +1,391 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ +CREATE TABLE GATEWAY +( + GATEWAY_ID VARCHAR (255), + GATEWAY_NAME VARCHAR(255), + DOMAIN VARCHAR(255), + EMAIL_ADDRESS VARCHAR(255), + PRIMARY KEY (GATEWAY_ID) +); + +CREATE TABLE CONFIGURATION +( + CONFIG_KEY VARCHAR(255), + CONFIG_VAL VARCHAR(255), + EXPIRE_DATE TIMESTAMP DEFAULT '0000-00-00 00:00:00', + CATEGORY_ID VARCHAR (255), + PRIMARY KEY(CONFIG_KEY, CONFIG_VAL, CATEGORY_ID) +); + +INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL, EXPIRE_DATE, CATEGORY_ID) VALUES('registry.version', '0.15', CURRENT_TIMESTAMP ,'SYSTEM'); + +CREATE TABLE USERS +( + USER_NAME VARCHAR(255), + PASSWORD VARCHAR(255), + PRIMARY KEY(USER_NAME) +); + +CREATE TABLE GATEWAY_WORKER +( + GATEWAY_ID VARCHAR(255), + USER_NAME VARCHAR(255), + PRIMARY KEY (GATEWAY_ID, USER_NAME), + FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY(GATEWAY_ID) ON DELETE CASCADE, + FOREIGN KEY (USER_NAME) REFERENCES USERS(USER_NAME) ON DELETE CASCADE +); + +CREATE TABLE PROJECT +( + GATEWAY_ID VARCHAR(255), + USER_NAME VARCHAR(255) NOT NULL, + PROJECT_ID VARCHAR(255), + PROJECT_NAME VARCHAR(255) NOT NULL, + DESCRIPTION VARCHAR(255), + CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (PROJECT_ID), + FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY(GATEWAY_ID) ON DELETE CASCADE, + FOREIGN KEY (USER_NAME) REFERENCES USERS(USER_NAME) ON DELETE CASCADE +); + +CREATE TABLE PROJECT_USER +( + PROJECT_ID VARCHAR(255), + USER_NAME VARCHAR(255), + PRIMARY KEY (PROJECT_ID,USER_NAME), + FOREIGN KEY (PROJECT_ID) REFERENCES PROJECT(PROJECT_ID) ON DELETE CASCADE, + FOREIGN KEY (USER_NAME) REFERENCES USERS(USER_NAME) ON DELETE CASCADE +); + +CREATE TABLE EXPERIMENT +( + EXPERIMENT_ID VARCHAR(255), + GATEWAY_ID VARCHAR(255), + EXECUTION_USER VARCHAR(255) NOT NULL, + PROJECT_ID VARCHAR(255) NOT NULL, + CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + EXPERIMENT_NAME VARCHAR(255) NOT NULL, + EXPERIMENT_DESCRIPTION VARCHAR(255), + APPLICATION_ID VARCHAR(255), + APPLICATION_VERSION VARCHAR(255), + WORKFLOW_TEMPLATE_ID VARCHAR(255), + WORKFLOW_TEMPLATE_VERSION VARCHAR(255), + WORKFLOW_EXECUTION_ID VARCHAR(255), + ALLOW_NOTIFICATION SMALLINT, + GATEWAY_EXECUTION_ID VARCHAR(255), + PRIMARY KEY(EXPERIMENT_ID), + FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY(GATEWAY_ID) ON DELETE CASCADE, + FOREIGN KEY (EXECUTION_USER) REFERENCES USERS(USER_NAME) ON DELETE CASCADE, + FOREIGN KEY (PROJECT_ID) REFERENCES PROJECT(PROJECT_ID) ON DELETE CASCADE +); + +CREATE TABLE EXPERIMENT_INPUT +( + EXPERIMENT_ID VARCHAR(255), + INPUT_KEY VARCHAR(255) NOT NULL, + DATA_TYPE VARCHAR(255), + METADATA VARCHAR(255), + APP_ARGUMENT VARCHAR(255), + STANDARD_INPUT SMALLINT, + USER_FRIENDLY_DESC VARCHAR(255), + VALUE CLOB, + INPUT_ORDER INTEGER, + IS_REQUIRED SMALLINT, + REQUIRED_TO_COMMANDLINE SMALLINT, + DATA_STAGED SMALLINT, + PRIMARY KEY(EXPERIMENT_ID,INPUT_KEY), + FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE +); + +CREATE TABLE EXPERIMENT_OUTPUT +( + EXPERIMENT_ID VARCHAR(255), + OUTPUT_KEY VARCHAR(255) NOT NULL, + DATA_TYPE VARCHAR(255), + VALUE CLOB, + IS_REQUIRED SMALLINT, + REQUIRED_TO_COMMANDLINE SMALLINT, + DATA_MOVEMENT SMALLINT, + DATA_NAME_LOCATION VARCHAR(255), + SEARCH_QUERY VARCHAR(255), + APP_ARGUMENT VARCHAR(255), + PRIMARY KEY(EXPERIMENT_ID,OUTPUT_KEY), + FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE +); + + +CREATE TABLE WORKFLOW_NODE_DETAIL +( + EXPERIMENT_ID VARCHAR(255) NOT NULL, + NODE_INSTANCE_ID VARCHAR(255), + CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + NODE_NAME VARCHAR(255) NOT NULL, + EXECUTION_UNIT VARCHAR(255) NOT NULL, + EXECUTION_UNIT_DATA VARCHAR(255), + PRIMARY KEY(NODE_INSTANCE_ID), + FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE +); + +CREATE TABLE TASK_DETAIL +( + TASK_ID VARCHAR(255), + NODE_INSTANCE_ID VARCHAR(255), + CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + APPLICATION_ID VARCHAR(255), + APPLICATION_VERSION VARCHAR(255), + APPLICATION_DEPLOYMENT_ID VARCHAR(255), + ALLOW_NOTIFICATION SMALLINT, + PRIMARY KEY(TASK_ID), + FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE +); + +CREATE TABLE NOTIFICATION_EMAIL +( + EMAIL_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY, + EXPERIMENT_ID VARCHAR(255), + TASK_ID VARCHAR(255), + EMAIL_ADDRESS VARCHAR(255), + PRIMARY KEY(EMAIL_ID), + FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE, + FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE +); + +CREATE TABLE ERROR_DETAIL +( + ERROR_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY, + EXPERIMENT_ID VARCHAR(255), + TASK_ID VARCHAR(255), + NODE_INSTANCE_ID VARCHAR(255), + JOB_ID VARCHAR(255), + CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + ACTUAL_ERROR_MESSAGE CLOB, + USER_FRIEDNLY_ERROR_MSG VARCHAR(255), + TRANSIENT_OR_PERSISTENT SMALLINT, + ERROR_CATEGORY VARCHAR(255), + CORRECTIVE_ACTION VARCHAR(255), + ACTIONABLE_GROUP VARCHAR(255), + PRIMARY KEY(ERROR_ID), + FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE, + FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE, + FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE +); + +CREATE TABLE APPLICATION_INPUT +( + TASK_ID VARCHAR(255), + INPUT_KEY VARCHAR(255) NOT NULL, + DATA_TYPE VARCHAR(255), + METADATA VARCHAR(255), + APP_ARGUMENT VARCHAR(255), + STANDARD_INPUT SMALLINT, + USER_FRIENDLY_DESC VARCHAR(255), + VALUE CLOB, + INPUT_ORDER INTEGER, + IS_REQUIRED SMALLINT, + REQUIRED_TO_COMMANDLINE SMALLINT, + DATA_STAGED SMALLINT, + PRIMARY KEY(TASK_ID,INPUT_KEY), + FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE +); + +CREATE TABLE APPLICATION_OUTPUT +( + TASK_ID VARCHAR(255), + OUTPUT_KEY VARCHAR(255) NOT NULL, + DATA_TYPE VARCHAR(255), + VALUE CLOB, + IS_REQUIRED SMALLINT, + REQUIRED_TO_COMMANDLINE SMALLINT, + DATA_MOVEMENT SMALLINT, + DATA_NAME_LOCATION VARCHAR(255), + SEARCH_QUERY VARCHAR(255), + APP_ARGUMENT VARCHAR(255), + PRIMARY KEY(TASK_ID,OUTPUT_KEY), + FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE +); + +CREATE TABLE NODE_INPUT +( + NODE_INSTANCE_ID VARCHAR(255), + INPUT_KEY VARCHAR(255) NOT NULL, + DATA_TYPE VARCHAR(255), + METADATA VARCHAR(255), + APP_ARGUMENT VARCHAR(255), + STANDARD_INPUT SMALLINT, + USER_FRIENDLY_DESC VARCHAR(255), + VALUE VARCHAR(255), + INPUT_ORDER INTEGER, + IS_REQUIRED SMALLINT, + REQUIRED_TO_COMMANDLINE SMALLINT, + DATA_STAGED SMALLINT, + PRIMARY KEY(NODE_INSTANCE_ID,INPUT_KEY), + FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE +); + +CREATE TABLE NODE_OUTPUT +( + NODE_INSTANCE_ID VARCHAR(255), + OUTPUT_KEY VARCHAR(255) NOT NULL, + DATA_TYPE VARCHAR(255), + VALUE VARCHAR(255), + IS_REQUIRED SMALLINT, + REQUIRED_TO_COMMANDLINE SMALLINT, + DATA_MOVEMENT SMALLINT, + DATA_NAME_LOCATION VARCHAR(255), + SEARCH_QUERY VARCHAR(255), + APP_ARGUMENT VARCHAR(255), + PRIMARY KEY(NODE_INSTANCE_ID,OUTPUT_KEY), + FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE +); + +CREATE TABLE JOB_DETAIL +( + JOB_ID VARCHAR(255), + TASK_ID VARCHAR(255), + JOB_DESCRIPTION CLOB NOT NULL, + CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + COMPUTE_RESOURCE_CONSUMED VARCHAR(255), + JOBNAME VARCHAR (255), + WORKING_DIR VARCHAR(255), + PRIMARY KEY (TASK_ID, JOB_ID), + FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE +); + +CREATE TABLE DATA_TRANSFER_DETAIL +( + TRANSFER_ID VARCHAR(255), + TASK_ID VARCHAR(255), + CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + TRANSFER_DESC VARCHAR(255) NOT NULL, + PRIMARY KEY(TRANSFER_ID), + FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE +); + +CREATE TABLE STATUS +( + STATUS_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY, + EXPERIMENT_ID VARCHAR(255), + NODE_INSTANCE_ID VARCHAR(255), + TRANSFER_ID VARCHAR(255), + TASK_ID VARCHAR(255), + JOB_ID VARCHAR(255), + STATE VARCHAR(255), + STATUS_UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00', + STATUS_TYPE VARCHAR(255), + PRIMARY KEY(STATUS_ID), + FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE, + FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE, + FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE, + FOREIGN KEY (TRANSFER_ID) REFERENCES DATA_TRANSFER_DETAIL(TRANSFER_ID) ON DELETE CASCADE +); + +CREATE TABLE CONFIG_DATA +( + EXPERIMENT_ID VARCHAR(255), + AIRAVATA_AUTO_SCHEDULE SMALLINT NOT NULL, + OVERRIDE_MANUAL_SCHEDULE_PARAMS SMALLINT NOT NULL, + SHARE_EXPERIMENT SMALLINT, + USER_DN VARCHAR(255), + GENERATE_CERT SMALLINT, + PRIMARY KEY(EXPERIMENT_ID) +); + +CREATE TABLE COMPUTATIONAL_RESOURCE_SCHEDULING +( + RESOURCE_SCHEDULING_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY, + EXPERIMENT_ID VARCHAR(255), + TASK_ID VARCHAR(255), + RESOURCE_HOST_ID VARCHAR(255), + CPU_COUNT INTEGER, + NODE_COUNT INTEGER, + NO_OF_THREADS INTEGER, + QUEUE_NAME VARCHAR(255), + WALLTIME_LIMIT INTEGER, + JOB_START_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00', + TOTAL_PHYSICAL_MEMORY INTEGER, + COMPUTATIONAL_PROJECT_ACCOUNT VARCHAR(255), + CHESSIS_NAME VARCHAR(255), + PRIMARY KEY(RESOURCE_SCHEDULING_ID), + FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE, + FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE +); + +CREATE TABLE ADVANCE_INPUT_DATA_HANDLING +( + INPUT_DATA_HANDLING_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY, + EXPERIMENT_ID VARCHAR(255), + TASK_ID VARCHAR(255), + WORKING_DIR_PARENT VARCHAR(255), + UNIQUE_WORKING_DIR VARCHAR(255), + STAGE_INPUT_FILES_TO_WORKING_DIR SMALLINT, + CLEAN_AFTER_JOB SMALLINT, + PRIMARY KEY(INPUT_DATA_HANDLING_ID), + FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE, + FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE +); + +CREATE TABLE ADVANCE_OUTPUT_DATA_HANDLING +( + OUTPUT_DATA_HANDLING_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY, + EXPERIMENT_ID VARCHAR(255), + TASK_ID VARCHAR(255), + OUTPUT_DATA_DIR VARCHAR(255), + DATA_REG_URL VARCHAR (255), + PERSIST_OUTPUT_DATA SMALLINT, + PRIMARY KEY(OUTPUT_DATA_HANDLING_ID), + FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE, + FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE +); + +CREATE TABLE QOS_PARAM +( + QOS_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY, + EXPERIMENT_ID VARCHAR(255), + TASK_ID VARCHAR(255), + START_EXECUTION_AT VARCHAR(255), + EXECUTE_BEFORE VARCHAR(255), + NO_OF_RETRIES INTEGER, + PRIMARY KEY(QOS_ID), + FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE, + FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE +); + +CREATE TABLE COMMUNITY_USER +( + GATEWAY_ID VARCHAR(256) NOT NULL, + COMMUNITY_USER_NAME VARCHAR(256) NOT NULL, + TOKEN_ID VARCHAR(256) NOT NULL, + COMMUNITY_USER_EMAIL VARCHAR(256) NOT NULL, + PRIMARY KEY (GATEWAY_ID, COMMUNITY_USER_NAME, TOKEN_ID) +); + +CREATE TABLE CREDENTIALS +( + GATEWAY_ID VARCHAR(256) NOT NULL, + TOKEN_ID VARCHAR(256) NOT NULL, + CREDENTIAL BLOB NOT NULL, + PORTAL_USER_ID VARCHAR(256) NOT NULL, + TIME_PERSISTED TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (GATEWAY_ID, TOKEN_ID) +); + + http://git-wip-us.apache.org/repos/asf/airavata/blob/4045c094/modules/orchestrator/orchestrator-core/src/test/resources/registry-derby.sql ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-core/src/test/resources/registry-derby.sql b/modules/orchestrator/orchestrator-core/src/test/resources/registry-derby.sql deleted file mode 100644 index 9ed5ca9..0000000 --- a/modules/orchestrator/orchestrator-core/src/test/resources/registry-derby.sql +++ /dev/null @@ -1,361 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -CREATE TABLE GATEWAY -( - GATEWAY_NAME VARCHAR(255), - OWNER VARCHAR(255), - PRIMARY KEY (GATEWAY_NAME) -); - -CREATE TABLE CONFIGURATION -( - CONFIG_KEY VARCHAR(255), - CONFIG_VAL VARCHAR(255), - EXPIRE_DATE TIMESTAMP DEFAULT '0000-00-00 00:00:00', - CATEGORY_ID VARCHAR (255), - PRIMARY KEY(CONFIG_KEY, CONFIG_VAL, CATEGORY_ID) -); - -INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL, EXPIRE_DATE, CATEGORY_ID) VALUES('registry.version', '0.12', CURRENT_TIMESTAMP ,'SYSTEM'); - -CREATE TABLE USERS -( - USER_NAME VARCHAR(255), - PASSWORD VARCHAR(255), - PRIMARY KEY(USER_NAME) -); - -CREATE TABLE GATEWAY_WORKER -( - GATEWAY_NAME VARCHAR(255), - USER_NAME VARCHAR(255), - PRIMARY KEY (GATEWAY_NAME, USER_NAME), - FOREIGN KEY (GATEWAY_NAME) REFERENCES GATEWAY(GATEWAY_NAME) ON DELETE CASCADE, - FOREIGN KEY (USER_NAME) REFERENCES USERS(USER_NAME) ON DELETE CASCADE -); - -CREATE TABLE PROJECT -( - GATEWAY_NAME VARCHAR(255), - USER_NAME VARCHAR(255) NOT NULL, - PROJECT_ID VARCHAR(255), - PROJECT_NAME VARCHAR(255) NOT NULL, - DESCRIPTION VARCHAR(255), - CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - PRIMARY KEY (PROJECT_ID), - FOREIGN KEY (GATEWAY_NAME) REFERENCES GATEWAY(GATEWAY_NAME) ON DELETE CASCADE, - FOREIGN KEY (USER_NAME) REFERENCES USERS(USER_NAME) ON DELETE CASCADE -); - -CREATE TABLE PROJECT_USER -( - PROJECT_ID VARCHAR(255), - USER_NAME VARCHAR(255), - PRIMARY KEY (PROJECT_ID,USER_NAME), - FOREIGN KEY (PROJECT_ID) REFERENCES PROJECT(PROJECT_ID) ON DELETE CASCADE, - FOREIGN KEY (USER_NAME) REFERENCES USERS(USER_NAME) ON DELETE CASCADE -); - -CREATE TABLE PUBLISHED_WORKFLOW -( - GATEWAY_NAME VARCHAR(255), - CREATED_USER VARCHAR(255), - PUBLISH_WORKFLOW_NAME VARCHAR(255), - VERSION VARCHAR(255), - PUBLISHED_DATE TIMESTAMP DEFAULT '0000-00-00 00:00:00', - PATH VARCHAR (255), - WORKFLOW_CONTENT BLOB, - PRIMARY KEY(GATEWAY_NAME, PUBLISH_WORKFLOW_NAME), - FOREIGN KEY (GATEWAY_NAME) REFERENCES GATEWAY(GATEWAY_NAME) ON DELETE CASCADE, - FOREIGN KEY (CREATED_USER) REFERENCES USERS(USER_NAME) ON DELETE CASCADE -); - -CREATE TABLE USER_WORKFLOW -( - GATEWAY_NAME VARCHAR(255), - OWNER VARCHAR(255), - TEMPLATE_NAME VARCHAR(255), - LAST_UPDATED_TIME TIMESTAMP DEFAULT CURRENT TIMESTAMP, - PATH VARCHAR (255), - WORKFLOW_GRAPH BLOB, - PRIMARY KEY(GATEWAY_NAME, OWNER, TEMPLATE_NAME), - FOREIGN KEY (GATEWAY_NAME) REFERENCES GATEWAY(GATEWAY_NAME) ON DELETE CASCADE, - FOREIGN KEY (OWNER) REFERENCES USERS(USER_NAME) ON DELETE CASCADE -); - -CREATE TABLE EXPERIMENT -( - EXPERIMENT_ID VARCHAR(255), - GATEWAY_NAME VARCHAR(255), - EXECUTION_USER VARCHAR(255) NOT NULL, - PROJECT_ID VARCHAR(255) NOT NULL, - CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - EXPERIMENT_NAME VARCHAR(255) NOT NULL, - EXPERIMENT_DESCRIPTION VARCHAR(255), - APPLICATION_ID VARCHAR(255), - APPLICATION_VERSION VARCHAR(255), - WORKFLOW_TEMPLATE_ID VARCHAR(255), - WORKFLOW_TEMPLATE_VERSION VARCHAR(255), - WORKFLOW_EXECUTION_ID VARCHAR(255), - PRIMARY KEY(EXPERIMENT_ID), - FOREIGN KEY (GATEWAY_NAME) REFERENCES GATEWAY(GATEWAY_NAME) ON DELETE CASCADE, - FOREIGN KEY (EXECUTION_USER) REFERENCES USERS(USER_NAME) ON DELETE CASCADE, - FOREIGN KEY (PROJECT_ID) REFERENCES PROJECT(PROJECT_ID) ON DELETE CASCADE -); - -CREATE TABLE EXPERIMENT_INPUT -( - EXPERIMENT_ID VARCHAR(255), - INPUT_KEY VARCHAR(255) NOT NULL, - INPUT_TYPE VARCHAR(255), - METADATA VARCHAR(255), - VALUE CLOB, - PRIMARY KEY(EXPERIMENT_ID,INPUT_KEY), - FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE -); - -CREATE TABLE EXPERIMENT_OUTPUT -( - EXPERIMENT_ID VARCHAR(255), - OUTPUT_KEY VARCHAR(255) NOT NULL, - OUTPUT_KEY_TYPE VARCHAR(255), - METADATA VARCHAR(255), - VALUE CLOB, - PRIMARY KEY(EXPERIMENT_ID,OUTPUT_KEY), - FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE -); - - -CREATE TABLE WORKFLOW_NODE_DETAIL -( - EXPERIMENT_ID VARCHAR(255) NOT NULL, - NODE_INSTANCE_ID VARCHAR(255), - CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - NODE_NAME VARCHAR(255) NOT NULL, - EXECUTION_UNIT VARCHAR(255) NOT NULL, - EXECUTION_UNIT_DATA VARCHAR(255), - PRIMARY KEY(NODE_INSTANCE_ID), - FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE -); - -CREATE TABLE TASK_DETAIL -( - TASK_ID VARCHAR(255), - NODE_INSTANCE_ID VARCHAR(255), - CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - APPLICATION_ID VARCHAR(255), - APPLICATION_VERSION VARCHAR(255), - APPLICATION_DEPLOYMENT_ID VARCHAR(255), - PRIMARY KEY(TASK_ID), - FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE -); - -CREATE TABLE ERROR_DETAIL -( - ERROR_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY, - EXPERIMENT_ID VARCHAR(255), - TASK_ID VARCHAR(255), - NODE_INSTANCE_ID VARCHAR(255), - JOB_ID VARCHAR(255), - CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - ACTUAL_ERROR_MESSAGE CLOB, - USER_FRIEDNLY_ERROR_MSG VARCHAR(255), - TRANSIENT_OR_PERSISTENT SMALLINT, - ERROR_CATEGORY VARCHAR(255), - CORRECTIVE_ACTION VARCHAR(255), - ACTIONABLE_GROUP VARCHAR(255), - PRIMARY KEY(ERROR_ID), - FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE, - FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE, - FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE -); - -CREATE TABLE APPLICATION_INPUT -( - TASK_ID VARCHAR(255), - INPUT_KEY VARCHAR(255) NOT NULL, - INPUT_KEY_TYPE VARCHAR(255), - METADATA VARCHAR(255), - VALUE CLOB, - PRIMARY KEY(TASK_ID,INPUT_KEY), - FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE -); - -CREATE TABLE APPLICATION_OUTPUT -( - TASK_ID VARCHAR(255), - OUTPUT_KEY VARCHAR(255) NOT NULL, - OUTPUT_KEY_TYPE VARCHAR(255), - METADATA VARCHAR(255), - VALUE CLOB, - PRIMARY KEY(TASK_ID,OUTPUT_KEY), - FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE -); - -CREATE TABLE NODE_INPUT -( - NODE_INSTANCE_ID VARCHAR(255), - INPUT_KEY VARCHAR(255) NOT NULL, - INPUT_KEY_TYPE VARCHAR(255), - METADATA VARCHAR(255), - VALUE VARCHAR(255), - PRIMARY KEY(NODE_INSTANCE_ID,INPUT_KEY), - FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE -); - -CREATE TABLE NODE_OUTPUT -( - NODE_INSTANCE_ID VARCHAR(255), - OUTPUT_KEY VARCHAR(255) NOT NULL, - OUTPUT_KEY_TYPE VARCHAR(255), - METADATA VARCHAR(255), - VALUE VARCHAR(255), - PRIMARY KEY(NODE_INSTANCE_ID,OUTPUT_KEY), - FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE -); - -CREATE TABLE JOB_DETAIL -( - JOB_ID VARCHAR(255), - TASK_ID VARCHAR(255), - JOB_DESCRIPTION CLOB NOT NULL, - CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - COMPUTE_RESOURCE_CONSUMED VARCHAR(255), - PRIMARY KEY (TASK_ID, JOB_ID), - FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE -); - -CREATE TABLE DATA_TRANSFER_DETAIL -( - TRANSFER_ID VARCHAR(255), - TASK_ID VARCHAR(255), - CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - TRANSFER_DESC CLOB NOT NULL, - PRIMARY KEY(TRANSFER_ID), - FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE -); - -CREATE TABLE STATUS -( - STATUS_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY, - EXPERIMENT_ID VARCHAR(255), - NODE_INSTANCE_ID VARCHAR(255), - TRANSFER_ID VARCHAR(255), - TASK_ID VARCHAR(255), - JOB_ID VARCHAR(255), - STATE VARCHAR(255), - STATUS_UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00', - STATUS_TYPE VARCHAR(255), - PRIMARY KEY(STATUS_ID), - FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE, - FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE, - FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE, - FOREIGN KEY (TRANSFER_ID) REFERENCES DATA_TRANSFER_DETAIL(TRANSFER_ID) ON DELETE CASCADE -); - -CREATE TABLE CONFIG_DATA -( - EXPERIMENT_ID VARCHAR(255), - AIRAVATA_AUTO_SCHEDULE SMALLINT NOT NULL, - OVERRIDE_MANUAL_SCHEDULE_PARAMS SMALLINT NOT NULL, - SHARE_EXPERIMENT SMALLINT, - PRIMARY KEY(EXPERIMENT_ID) -); - -CREATE TABLE COMPUTATIONAL_RESOURCE_SCHEDULING -( - RESOURCE_SCHEDULING_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY, - EXPERIMENT_ID VARCHAR(255), - TASK_ID VARCHAR(255), - RESOURCE_HOST_ID VARCHAR(255), - CPU_COUNT INTEGER, - NODE_COUNT INTEGER, - NO_OF_THREADS INTEGER, - QUEUE_NAME VARCHAR(255), - WALLTIME_LIMIT INTEGER, - JOB_START_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00', - TOTAL_PHYSICAL_MEMORY INTEGER, - COMPUTATIONAL_PROJECT_ACCOUNT VARCHAR(255), - PRIMARY KEY(RESOURCE_SCHEDULING_ID), - FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE, - FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE -); - -CREATE TABLE ADVANCE_INPUT_DATA_HANDLING -( - INPUT_DATA_HANDLING_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY, - EXPERIMENT_ID VARCHAR(255), - TASK_ID VARCHAR(255), - WORKING_DIR_PARENT VARCHAR(255), - UNIQUE_WORKING_DIR VARCHAR(255), - STAGE_INPUT_FILES_TO_WORKING_DIR SMALLINT, - CLEAN_AFTER_JOB SMALLINT, - PRIMARY KEY(INPUT_DATA_HANDLING_ID), - FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE, - FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE -); - -CREATE TABLE ADVANCE_OUTPUT_DATA_HANDLING -( - OUTPUT_DATA_HANDLING_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY, - EXPERIMENT_ID VARCHAR(255), - TASK_ID VARCHAR(255), - OUTPUT_DATA_DIR VARCHAR(255), - DATA_REG_URL VARCHAR (255), - PERSIST_OUTPUT_DATA SMALLINT, - PRIMARY KEY(OUTPUT_DATA_HANDLING_ID), - FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE, - FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE -); - -CREATE TABLE QOS_PARAM -( - QOS_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY, - EXPERIMENT_ID VARCHAR(255), - TASK_ID VARCHAR(255), - START_EXECUTION_AT VARCHAR(255), - EXECUTE_BEFORE VARCHAR(255), - NO_OF_RETRIES INTEGER, - PRIMARY KEY(QOS_ID), - FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE, - FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE -); - -CREATE TABLE COMMUNITY_USER -( - GATEWAY_NAME VARCHAR(256) NOT NULL, - COMMUNITY_USER_NAME VARCHAR(256) NOT NULL, - TOKEN_ID VARCHAR(256) NOT NULL, - COMMUNITY_USER_EMAIL VARCHAR(256) NOT NULL, - PRIMARY KEY (GATEWAY_NAME, COMMUNITY_USER_NAME, TOKEN_ID) -); - -CREATE TABLE CREDENTIALS -( - GATEWAY_ID VARCHAR(256) NOT NULL, - TOKEN_ID VARCHAR(256) NOT NULL, - CREDENTIAL BLOB NOT NULL, - PORTAL_USER_ID VARCHAR(256) NOT NULL, - TIME_PERSISTED TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - PRIMARY KEY (GATEWAY_ID, TOKEN_ID) -); - - http://git-wip-us.apache.org/repos/asf/airavata/blob/4045c094/modules/orchestrator/orchestrator-service/src/test/java/org/apache/airavata/orchestrator/client/util/Initialize.java ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-service/src/test/java/org/apache/airavata/orchestrator/client/util/Initialize.java b/modules/orchestrator/orchestrator-service/src/test/java/org/apache/airavata/orchestrator/client/util/Initialize.java index c5197a8..89df6f1 100644 --- a/modules/orchestrator/orchestrator-service/src/test/java/org/apache/airavata/orchestrator/client/util/Initialize.java +++ b/modules/orchestrator/orchestrator-service/src/test/java/org/apache/airavata/orchestrator/client/util/Initialize.java @@ -41,7 +41,7 @@ import java.util.StringTokenizer; public class Initialize { private static final Logger logger = LoggerFactory.getLogger(Initialize.class); public static final String DERBY_SERVER_MODE_SYS_PROPERTY = "derby.drda.startNetworkServer"; - public String scriptName = "registry-derby.sql"; + public String scriptName = "expcatalog-derby.sql"; private NetworkServerControl server; private static final String delimiter = ";"; public static final String PERSISTANT_DATA = "Configuration";
