http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/app-catalog/app-catalog-data/pom.xml ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/pom.xml b/modules/app-catalog/app-catalog-data/pom.xml deleted file mode 100644 index 9bcbc4b..0000000 --- a/modules/app-catalog/app-catalog-data/pom.xml +++ /dev/null @@ -1,142 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!--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. --> - -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - - <parent> - <groupId>org.apache.airavata</groupId> - <artifactId>app-catalog</artifactId> - <version>0.16-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>app-catalog-data</artifactId> - <packaging>jar</packaging> - <name>Airavata Application Catalog Data</name> - <url>http://airavata.apache.org/</url> - - <dependencies> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-data-models</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-common-utils</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-server-configuration</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>app-catalog-cpi</artifactId> - <version>${project.version}</version> - </dependency> - <!-- Test --> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa-all</artifactId> - <version>2.2.0</version> - </dependency> - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - <version>${derby.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derbyclient</artifactId> - <version>${derby.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derbynet</artifactId> - <version>${derby.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derbytools</artifactId> - <version>${derby.version}</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>${antrun.version}</version> - <executions> - <execution> - <phase>process-classes</phase> - <configuration> - <tasks> - <taskdef name="openjpac" classname="org.apache.openjpa.ant.PCEnhancerTask" classpathref="maven.compile.classpath" /> - <openjpac> - <classpath refid="maven.compile.classpath" /> - </openjpac> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>${surefire.version}</version> - <inherited>true</inherited> - <configuration> - <failIfNoTests>false</failIfNoTests> - <skipTests>${skipTests}</skipTests> - <workingDirectory>${project.build.testOutputDirectory}</workingDirectory> - <!-- making sure that the sure-fire plugin doesn't run the integration tests--> - <!-- Integration tests are run using the fail-safe plugin in the module pom--> - <excludes> - <exclude>**/TaskDetailResourceTest.java</exclude> - <exclude>**/WorkflowNodeDetailResourceTest.java</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - -</project>
http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/app-catalog/app-catalog-data/src/test/resources/appcatalog-derby.sql ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/test/resources/appcatalog-derby.sql b/modules/app-catalog/app-catalog-data/src/test/resources/appcatalog-derby.sql deleted file mode 100644 index 8171968..0000000 --- a/modules/app-catalog/app-catalog-data/src/test/resources/appcatalog-derby.sql +++ /dev/null @@ -1,470 +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 COMPUTE_RESOURCE -( - RESOURCE_ID VARCHAR (255) NOT NULL, - HOST_NAME VARCHAR (255) NOT NULL, - RESOURCE_DESCRIPTION VARCHAR (255), - CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00', - MAX_MEMORY_NODE INTEGER, - PRIMARY KEY (RESOURCE_ID) -); - -CREATE TABLE HOST_ALIAS -( - RESOURCE_ID VARCHAR(255), - ALIAS VARCHAR(255), - PRIMARY KEY(RESOURCE_ID,ALIAS), - FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE -); - -CREATE TABLE HOST_IPADDRESS -( - RESOURCE_ID VARCHAR(255), - IP_ADDRESS VARCHAR(255), - PRIMARY KEY(RESOURCE_ID,IP_ADDRESS), - FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE -); - -CREATE TABLE GSISSH_SUBMISSION -( - SUBMISSION_ID VARCHAR(255), - RESOURCE_JOB_MANAGER VARCHAR(255), - SSH_PORT INTEGER, - INSTALLED_PATH VARCHAR(255), - MONITOR_MODE VARCHAR(255), - PRIMARY KEY(SUBMISSION_ID) -); - -CREATE TABLE GSISSH_EXPORT -( - SUBMISSION_ID VARCHAR(255), - EXPORT VARCHAR(255), - PRIMARY KEY(SUBMISSION_ID, EXPORT), - FOREIGN KEY (SUBMISSION_ID) REFERENCES GSISSH_SUBMISSION(SUBMISSION_ID) ON DELETE CASCADE -); - - - -CREATE TABLE GLOBUS_SUBMISSION -( - SUBMISSION_ID VARCHAR(255), - RESOURCE_JOB_MANAGER VARCHAR(255), - SECURITY_PROTOCAL VARCHAR(255), - PRIMARY KEY(SUBMISSION_ID) -); - -CREATE TABLE UNICORE_SUBMISSION -( - SUBMISSION_ID VARCHAR(255), - SECURITY_PROTOCAL VARCHAR(255), - UNICORE_ENDPOINT_URL VARCHAR(255), - PRIMARY KEY(SUBMISSION_ID) -); - -CREATE TABLE UNICORE_DATAMOVEMENT -( - DATAMOVEMENT_ID VARCHAR(255), - SECURITY_PROTOCAL VARCHAR(255), - UNICORE_ENDPOINT_URL VARCHAR(255), - PRIMARY KEY(DATAMOVEMENT_ID) -); - - -CREATE TABLE GLOBUS_GK_ENDPOINT -( - SUBMISSION_ID VARCHAR(255), - ENDPOINT VARCHAR(255), - PRIMARY KEY(SUBMISSION_ID, ENDPOINT), - FOREIGN KEY (SUBMISSION_ID) REFERENCES GLOBUS_SUBMISSION(SUBMISSION_ID) ON DELETE CASCADE -); - -CREATE TABLE RESOURCE_JOB_MANAGER -( - RESOURCE_JOB_MANAGER_ID VARCHAR (255) NOT NULL, - PUSH_MONITORING_ENDPOINT VARCHAR (255), - JOB_MANAGER_BIN_PATH VARCHAR (255), - RESOURCE_JOB_MANAGER_TYPE VARCHAR (255) NOT NULL, - CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00', - PRIMARY KEY (RESOURCE_JOB_MANAGER_ID) -); - - - -CREATE TABLE SSH_JOB_SUBMISSION -( - RESOURCE_JOB_MANAGER_ID VARCHAR (255) NOT NULL, - JOB_SUBMISSION_INTERFACE_ID VARCHAR (255) NOT NULL, - ALTERNATIVE_SSH_HOSTNAME VARCHAR (255), - SECURITY_PROTOCOL VARCHAR (255) NOT NULL, - SSH_PORT INTEGER, - MONITOR_MODE VARCHAR (255), - CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00', - PRIMARY KEY (JOB_SUBMISSION_INTERFACE_ID), - FOREIGN KEY (RESOURCE_JOB_MANAGER_ID) REFERENCES RESOURCE_JOB_MANAGER(RESOURCE_JOB_MANAGER_ID) -); - -CREATE TABLE EMAIL_MONITOR_PROPERTY -( - JOB_SUBMISSION_INTERFACE_ID VARCHAR (255) NOT NULL, - HOST VARCHAR(255), - EMAIL_ADDRESS VARCHAR(255), - PASSWORD VARCHAR(255), - FOLDER_NAME VARCHAR(255), - EMAIL_PROTOCOL VARCHAR(255), - PRIMARY KEY(JOB_SUBMISSION_INTERFACE_ID), - FOREIGN KEY (JOB_SUBMISSION_INTERFACE_ID) REFERENCES SSH_JOB_SUBMISSION(JOB_SUBMISSION_INTERFACE_ID) -); - -CREATE TABLE SCP_DATA_MOVEMENT -( - QUEUE_DESCRIPTION VARCHAR (255), - DATA_MOVEMENT_INTERFACE_ID VARCHAR (255) NOT NULL, - SECURITY_PROTOCOL VARCHAR (255) NOT NULL, - ALTERNATIVE_SCP_HOSTNAME VARCHAR (255), - SSH_PORT INTEGER, - CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00', - PRIMARY KEY (DATA_MOVEMENT_INTERFACE_ID) -); - -CREATE TABLE GRIDFTP_DATA_MOVEMENT -( - DATA_MOVEMENT_INTERFACE_ID VARCHAR (255) NOT NULL, - SECURITY_PROTOCOL VARCHAR (255) NOT NULL, - CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00', - PRIMARY KEY (DATA_MOVEMENT_INTERFACE_ID) -); - -CREATE TABLE GRIDFTP_ENDPOINT -( - ENDPOINT VARCHAR (255) NOT NULL, - DATA_MOVEMENT_INTERFACE_ID VARCHAR (255) NOT NULL, - PRIMARY KEY (DATA_MOVEMENT_INTERFACE_ID,ENDPOINT), - CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00', - FOREIGN KEY (DATA_MOVEMENT_INTERFACE_ID) REFERENCES GRIDFTP_DATA_MOVEMENT(DATA_MOVEMENT_INTERFACE_ID) ON DELETE CASCADE -); - ---CREATE TABLE JOB_SUBMISSION_PROTOCOL ---( --- RESOURCE_ID VARCHAR(255), --- SUBMISSION_ID VARCHAR(255), --- JOB_TYPE VARCHAR(255), --- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, --- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00', --- PRIMARY KEY(RESOURCE_ID,SUBMISSION_ID,JOB_TYPE), --- FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE ---); --- ---CREATE TABLE DATA_MOVEMENT_PROTOCOL ---( --- RESOURCE_ID VARCHAR(255), --- DATA_MOVE_ID VARCHAR(255), --- DATA_MOVE_TYPE VARCHAR(255), --- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, --- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00', --- PRIMARY KEY(RESOURCE_ID,DATA_MOVE_ID,DATA_MOVE_TYPE), --- FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE ---); - -CREATE TABLE APPLICATION_MODULE -( - MODULE_ID VARCHAR(255), - MODULE_NAME VARCHAR(255), - MODULE_VERSION VARCHAR(255), - MODULE_DESC VARCHAR(255), - GATEWAY_ID VARCHAR (255), - CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00', - PRIMARY KEY(MODULE_ID) -); - -CREATE TABLE APPLICATION_DEPLOYMENT -( - DEPLOYMENT_ID VARCHAR(255), - APP_MODULE_ID VARCHAR(255), - COMPUTE_HOSTID VARCHAR(255), - EXECUTABLE_PATH VARCHAR(255), - PARALLELISM VARCHAR(255), - APPLICATION_DESC VARCHAR(255), - CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00', - GATEWAY_ID VARCHAR(255), - PRIMARY KEY(DEPLOYMENT_ID), - FOREIGN KEY (COMPUTE_HOSTID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE, - FOREIGN KEY (APP_MODULE_ID) REFERENCES APPLICATION_MODULE(MODULE_ID) ON DELETE CASCADE -); - -CREATE TABLE MODULE_LOAD_CMD -( - CMD VARCHAR (255) NOT NULL, - APP_DEPLOYMENT_ID VARCHAR (255) NOT NULL, - PRIMARY KEY (APP_DEPLOYMENT_ID,CMD), - FOREIGN KEY (APP_DEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT(DEPLOYMENT_ID) ON DELETE CASCADE -); - -CREATE TABLE PREJOB_COMMAND -( - APPDEPLOYMENT_ID VARCHAR(255), - COMMAND VARCHAR(255), - PRIMARY KEY(APPDEPLOYMENT_ID, COMMAND), - FOREIGN KEY (APPDEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT(DEPLOYMENT_ID) ON DELETE CASCADE -); - -CREATE TABLE POSTJOB_COMMAND -( - APPDEPLOYMENT_ID VARCHAR(255), - COMMAND VARCHAR(255), - PRIMARY KEY(APPDEPLOYMENT_ID, COMMAND), - FOREIGN KEY (APPDEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT(DEPLOYMENT_ID) ON DELETE CASCADE -); - -CREATE TABLE LIBRARY_PREPAND_PATH -( - DEPLOYMENT_ID VARCHAR(255), - NAME VARCHAR(255), - VALUE VARCHAR(255), - PRIMARY KEY(DEPLOYMENT_ID, NAME), - FOREIGN KEY (DEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT(DEPLOYMENT_ID) ON DELETE CASCADE -); - -CREATE TABLE LIBRARY_APEND_PATH -( - DEPLOYMENT_ID VARCHAR(255), - NAME VARCHAR(255), - VALUE VARCHAR(255), - PRIMARY KEY(DEPLOYMENT_ID, NAME), - FOREIGN KEY (DEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT(DEPLOYMENT_ID) ON DELETE CASCADE -); - -CREATE TABLE APP_ENVIRONMENT -( - DEPLOYMENT_ID VARCHAR(255), - NAME VARCHAR(255), - VALUE VARCHAR(255), - PRIMARY KEY(DEPLOYMENT_ID, NAME), - FOREIGN KEY (DEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT(DEPLOYMENT_ID) ON DELETE CASCADE -); - -CREATE TABLE APPLICATION_INTERFACE -( - INTERFACE_ID VARCHAR(255), - APPLICATION_NAME VARCHAR(255), - APPLICATION_DESCRIPTION VARCHAR(255), - GATEWAY_ID VARCHAR(255), - CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00', - PRIMARY KEY(INTERFACE_ID) -); - -CREATE TABLE APP_MODULE_MAPPING -( - INTERFACE_ID VARCHAR(255), - MODULE_ID VARCHAR(255), - PRIMARY KEY(INTERFACE_ID, MODULE_ID), - FOREIGN KEY (INTERFACE_ID) REFERENCES APPLICATION_INTERFACE(INTERFACE_ID) ON DELETE CASCADE, - FOREIGN KEY (MODULE_ID) REFERENCES APPLICATION_MODULE(MODULE_ID) ON DELETE CASCADE -); - -CREATE TABLE APPLICATION_INPUT -( - INTERFACE_ID VARCHAR(255), - INPUT_KEY VARCHAR(255), - INPUT_VALUE VARCHAR(255), - DATA_TYPE VARCHAR(255), - METADATA VARCHAR(255), - APP_ARGUMENT VARCHAR(255), - STANDARD_INPUT SMALLINT, - INPUT_ORDER INTEGER, - IS_REQUIRED SMALLINT, - REQUIRED_TO_COMMANDLINE SMALLINT, - DATA_STAGED SMALLINT, - USER_FRIENDLY_DESC VARCHAR(255), - PRIMARY KEY(INTERFACE_ID,INPUT_KEY), - FOREIGN KEY (INTERFACE_ID) REFERENCES APPLICATION_INTERFACE(INTERFACE_ID) ON DELETE CASCADE -); - -CREATE TABLE APPLICATION_OUTPUT -( - INTERFACE_ID VARCHAR(255), - OUTPUT_KEY VARCHAR(255), - OUTPUT_VALUE VARCHAR(255), - DATA_TYPE 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(INTERFACE_ID,OUTPUT_KEY), - FOREIGN KEY (INTERFACE_ID) REFERENCES APPLICATION_INTERFACE(INTERFACE_ID) ON DELETE CASCADE -); - -CREATE TABLE GATEWAY_PROFILE -( - GATEWAY_ID VARCHAR(255), - CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00', - PRIMARY KEY(GATEWAY_ID) -); - -CREATE TABLE COMPUTE_RESOURCE_PREFERENCE -( - GATEWAY_ID VARCHAR(255), - RESOURCE_ID VARCHAR(255), - OVERRIDE_BY_AIRAVATA SMALLINT, - PREFERED_JOB_SUB_PROTOCOL VARCHAR(255), - PREFERED_DATA_MOVE_PROTOCOL VARCHAR(255), - PREFERED_BATCH_QUEUE VARCHAR(255), - SCRATCH_LOCATION VARCHAR(255), - ALLOCATION_PROJECT_NUMBER VARCHAR(255), - LOGIN_USERNAME VARCHAR(255), - PRIMARY KEY(GATEWAY_ID,RESOURCE_ID), - FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE, - FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY_PROFILE(GATEWAY_ID) ON DELETE CASCADE -); - -CREATE TABLE BATCH_QUEUE -( - COMPUTE_RESOURCE_ID VARCHAR(255) NOT NULL, - MAX_RUNTIME INTEGER, - MAX_JOB_IN_QUEUE INTEGER, - QUEUE_DESCRIPTION VARCHAR(255), - QUEUE_NAME VARCHAR(255) NOT NULL, - MAX_PROCESSORS INTEGER, - MAX_NODES INTEGER, - MAX_MEMORY INTEGER, - PRIMARY KEY (COMPUTE_RESOURCE_ID,QUEUE_NAME), - FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE -); - -CREATE TABLE COMPUTE_RESOURCE_FILE_SYSTEM -( - COMPUTE_RESOURCE_ID VARCHAR (255) NOT NULL, - PATH VARCHAR (255), - FILE_SYSTEM VARCHAR (255) NOT NULL, - PRIMARY KEY (COMPUTE_RESOURCE_ID,FILE_SYSTEM), - FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE - ); - -CREATE TABLE JOB_SUBMISSION_INTERFACE -( - JOB_SUBMISSION_INTERFACE_ID VARCHAR (255) NOT NULL, - COMPUTE_RESOURCE_ID VARCHAR (255) NOT NULL, - JOB_SUBMISSION_PROTOCOL VARCHAR (255) NOT NULL, - PRIORITY_ORDER INTEGER, - CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00', - PRIMARY KEY (COMPUTE_RESOURCE_ID,JOB_SUBMISSION_INTERFACE_ID), - FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE -); - -CREATE TABLE DATA_MOVEMENT_INTERFACE -( - COMPUTE_RESOURCE_ID VARCHAR (255) NOT NULL, - DATA_MOVEMENT_PROTOCOL VARCHAR (255) NOT NULL, - DATA_MOVEMENT_INTERFACE_ID VARCHAR (255) NOT NULL, - PRIORITY_ORDER INTEGER, - CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00', - PRIMARY KEY (COMPUTE_RESOURCE_ID,DATA_MOVEMENT_INTERFACE_ID), - FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE -); - -CREATE TABLE JOB_MANAGER_COMMAND -( - RESOURCE_JOB_MANAGER_ID VARCHAR (255) NOT NULL, - COMMAND_TYPE VARCHAR (255) NOT NULL, - COMMAND VARCHAR (255), - PRIMARY KEY (RESOURCE_JOB_MANAGER_ID,COMMAND_TYPE), - FOREIGN KEY (RESOURCE_JOB_MANAGER_ID) REFERENCES RESOURCE_JOB_MANAGER(RESOURCE_JOB_MANAGER_ID) ON DELETE CASCADE -); - -CREATE TABLE LOCAL_SUBMISSION -( - RESOURCE_JOB_MANAGER_ID VARCHAR (255) NOT NULL, - JOB_SUBMISSION_INTERFACE_ID VARCHAR (255) NOT NULL, - CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00', - PRIMARY KEY (JOB_SUBMISSION_INTERFACE_ID), - FOREIGN KEY (RESOURCE_JOB_MANAGER_ID) REFERENCES RESOURCE_JOB_MANAGER(RESOURCE_JOB_MANAGER_ID) - ); - -CREATE TABLE LOCAL_DATA_MOVEMENT -( - DATA_MOVEMENT_INTERFACE_ID VARCHAR (255) NOT NULL, - PRIMARY KEY (DATA_MOVEMENT_INTERFACE_ID) -); - -CREATE TABLE WORKFLOW -( - WF_TEMPLATE_ID VARCHAR (255) NOT NULL, - WF_NAME VARCHAR (255) NOT NULL, - GRAPH CLOB, - OWNER VARCHAR(255), - GATEWAY_ID VARCHAR(255), - CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00', - IMAGE BLOB, - PRIMARY KEY (WF_TEMPLATE_ID) -); - -CREATE TABLE WORKFLOW_INPUT -( - WF_TEMPLATE_ID VARCHAR(255), - INPUT_KEY VARCHAR(255), - INPUT_VALUE CLOB, - DATA_TYPE VARCHAR(255), - METADATA VARCHAR(255), - APP_ARGUMENT VARCHAR(255), - STANDARD_INPUT SMALLINT, - USER_FRIENDLY_DESC VARCHAR(255), - PRIMARY KEY(WF_TEMPLATE_ID,INPUT_KEY), - FOREIGN KEY (WF_TEMPLATE_ID) REFERENCES WORKFLOW(WF_TEMPLATE_ID) ON DELETE CASCADE -); - -CREATE TABLE WORKFLOW_OUTPUT -( - WF_TEMPLATE_ID VARCHAR(255), - OUTPUT_KEY VARCHAR(255), - OUTPUT_VALUE CLOB, - DATA_TYPE VARCHAR(255), - PRIMARY KEY(WF_TEMPLATE_ID,OUTPUT_KEY), - FOREIGN KEY (WF_TEMPLATE_ID) REFERENCES WORKFLOW(WF_TEMPLATE_ID) ON DELETE CASCADE -); - -CREATE TABLE CONFIGURATION -( - CONFIG_KEY VARCHAR(255), - CONFIG_VAL VARCHAR(255), - PRIMARY KEY(CONFIG_KEY, CONFIG_VAL) -); - -INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL) VALUES('app_catalog_version', '0.15'); - - - http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/app-catalog/pom.xml ---------------------------------------------------------------------- diff --git a/modules/app-catalog/pom.xml b/modules/app-catalog/pom.xml deleted file mode 100644 index 284d492..0000000 --- a/modules/app-catalog/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!--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. --> - -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - - <parent> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata</artifactId> - <version>0.16-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>app-catalog</artifactId> - <packaging>pom</packaging> - <name>Airavata Application Catalog</name> - <url>http://airavata.apache.org/</url> - - <profiles> - <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <modules> - <module>app-catalog-data</module> - <module>app-catalog-cpi</module> - </modules> - </profile> - </profiles> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - </properties> -</project> http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/gfac/gfac-core/pom.xml ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/pom.xml b/modules/gfac/gfac-core/pom.xml index 1004ba9..2b22ac0 100644 --- a/modules/gfac/gfac-core/pom.xml +++ b/modules/gfac/gfac-core/pom.xml @@ -35,19 +35,14 @@ <artifactId>airavata-registry-cpi</artifactId> <version>${project.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>app-catalog-data</artifactId> + <artifactId>airavata-registry-core</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>app-catalog-cpi</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-registry-core</artifactId> + <artifactId>airavata-registry-cpi</artifactId> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java index fb20b64..65c305b 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java @@ -22,7 +22,6 @@ package org.apache.airavata.gfac.core; import org.apache.airavata.registry.cpi.AppCatalog; import org.apache.airavata.registry.cpi.AppCatalogException; -import org.apache.aiaravata.application.catalog.data.impl.AppCatalogFactory; import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.common.utils.AiravataZKUtils; import org.apache.airavata.common.utils.DBUtil; @@ -615,7 +614,7 @@ public class GFacUtils { public static LOCALSubmission getLocalJobSubmission (String submissionId) throws AppCatalogException{ try { - AppCatalog appCatalog = AppCatalogFactory.getAppCatalog(); + AppCatalog appCatalog = RegistryFactory.getAppCatalog(); return appCatalog.getComputeResource().getLocalJobSubmission(submissionId); }catch (Exception e){ String errorMsg = "Error while retrieving local job submission with submission id : " + submissionId; @@ -626,7 +625,7 @@ public class GFacUtils { public static UnicoreJobSubmission getUnicoreJobSubmission (String submissionId) throws AppCatalogException{ try { - AppCatalog appCatalog = AppCatalogFactory.getAppCatalog(); + AppCatalog appCatalog = RegistryFactory.getAppCatalog(); return appCatalog.getComputeResource().getUNICOREJobSubmission(submissionId); }catch (Exception e){ String errorMsg = "Error while retrieving UNICORE job submission with submission id : " + submissionId; @@ -637,7 +636,7 @@ public class GFacUtils { public static SSHJobSubmission getSSHJobSubmission (String submissionId) throws AppCatalogException{ try { - AppCatalog appCatalog = AppCatalogFactory.getAppCatalog(); + AppCatalog appCatalog = RegistryFactory.getAppCatalog(); return appCatalog.getComputeResource().getSSHJobSubmission(submissionId); }catch (Exception e){ String errorMsg = "Error while retrieving SSH job submission with submission id : " + submissionId; @@ -683,7 +682,7 @@ public class GFacUtils { } public static ExperimentState updateExperimentStatus(String experimentId, ExperimentState state) throws RegistryException { - ExperimentCatalog airavataExperimentCatalog = RegistryFactory.getDefaultRegistry(); + ExperimentCatalog airavataExperimentCatalog = RegistryFactory.getDefaultExpCatalog(); Experiment details = (Experiment) airavataExperimentCatalog.get(ExperimentCatalogModelType.EXPERIMENT, experimentId); if (details == null) { details = new Experiment(); http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/JobExecutionContext.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/JobExecutionContext.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/JobExecutionContext.java index 88aaf72..8183dec 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/JobExecutionContext.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/JobExecutionContext.java @@ -27,9 +27,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory; import org.apache.airavata.registry.cpi.AppCatalog; import org.apache.airavata.registry.cpi.AppCatalogException; -import org.apache.aiaravata.application.catalog.data.impl.AppCatalogFactory; import org.apache.airavata.common.utils.MonitorPublisher; import org.apache.airavata.gfac.core.GFacConfiguration; import org.apache.airavata.gfac.core.GFacException; @@ -175,7 +175,7 @@ public class JobExecutionContext extends AbstractContext implements Serializable public void setAppCatalog(AppCatalog appCatalog) { if (appCatalog == null) { try { - this.appCatalog = AppCatalogFactory.getAppCatalog(); + this.appCatalog = RegistryFactory.getAppCatalog(); } catch (AppCatalogException e) { log.error("Unable to create app catalog instance", e); } http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/AbstractHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/AbstractHandler.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/AbstractHandler.java index 21c5d06..fcfd7f1 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/AbstractHandler.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/AbstractHandler.java @@ -51,7 +51,7 @@ public abstract class AbstractHandler implements GFacHandler { experimentCatalog = jobExecutionContext.getExperimentCatalog(); if(experimentCatalog == null){ try { - experimentCatalog = RegistryFactory.getDefaultRegistry(); + experimentCatalog = RegistryFactory.getDefaultExpCatalog(); } catch (RegistryException e) { throw new GFacHandlerException("unable to create registry instance", e); } http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/provider/AbstractProvider.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/provider/AbstractProvider.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/provider/AbstractProvider.java index f1b368b..442b0fd 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/provider/AbstractProvider.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/provider/AbstractProvider.java @@ -43,7 +43,7 @@ public abstract class AbstractProvider implements GFacProvider{ log.debug("Initializing " + this.getClass().getName()); if(jobExecutionContext.getExperimentCatalog() == null) { try { - experimentCatalog = RegistryFactory.getDefaultRegistry(); + experimentCatalog = RegistryFactory.getDefaultExpCatalog(); } catch (RegistryException e) { throw new GFacException("Unable to create registry instance", e); } http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/BetterGfacImpl.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/BetterGfacImpl.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/BetterGfacImpl.java index c7783f6..ad9e62a 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/BetterGfacImpl.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/BetterGfacImpl.java @@ -20,9 +20,9 @@ */ package org.apache.airavata.gfac.impl; +import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory; import org.apache.airavata.registry.cpi.AppCatalog; import org.apache.airavata.registry.cpi.AppCatalogException; -import org.apache.aiaravata.application.catalog.data.impl.AppCatalogFactory; import org.apache.airavata.common.utils.AiravataZKUtils; import org.apache.airavata.common.utils.MonitorPublisher; import org.apache.airavata.common.utils.ServerSettings; @@ -188,7 +188,7 @@ public class BetterGfacImpl implements GFac { throw new GFacException("Error executing the job. The required Application deployment Id is missing"); } - AppCatalog appCatalog = AppCatalogFactory.getAppCatalog(); + AppCatalog appCatalog = RegistryFactory.getAppCatalog(); //fetch the compute resource, application interface and deployment information from app catalog ApplicationInterfaceDescription applicationInterface = appCatalog. http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/job/AMQPMonitorTest.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/job/AMQPMonitorTest.java b/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/job/AMQPMonitorTest.java index f4da3d0..81f2b60 100644 --- a/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/job/AMQPMonitorTest.java +++ b/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/job/AMQPMonitorTest.java @@ -22,10 +22,10 @@ package org.apache.airavata.job; import com.google.common.eventbus.EventBus; import com.google.common.eventbus.Subscribe; +import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory; import org.apache.airavata.gfac.core.cluster.RemoteCluster; import org.apache.airavata.gfac.gsi.ssh.impl.HPCRemoteCluster; import org.apache.airavata.registry.cpi.AppCatalog; -import org.apache.aiaravata.application.catalog.data.impl.AppCatalogFactory; import org.apache.airavata.common.utils.MonitorPublisher; import org.apache.airavata.gfac.core.JobDescriptor; import org.apache.airavata.gfac.core.SSHApiException; http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java b/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java index 080df26..770eb98 100644 --- a/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java +++ b/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java @@ -22,7 +22,6 @@ package org.apache.airavata.gfac.server; import com.google.common.eventbus.EventBus; import org.apache.airavata.registry.cpi.AppCatalog; -import org.apache.aiaravata.application.catalog.data.impl.AppCatalogFactory; import org.apache.airavata.common.exception.AiravataException; import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.common.logger.AiravataLogger; @@ -114,8 +113,8 @@ public class GfacServerHandler implements GfacService.Iface { + ":" + ServerSettings.getSetting(Constants.GFAC_SERVER_PORT); storeServerConfig(); publisher = new MonitorPublisher(new EventBus()); - experimentCatalog = RegistryFactory.getDefaultRegistry(); - appCatalog = AppCatalogFactory.getAppCatalog(); + experimentCatalog = RegistryFactory.getDefaultExpCatalog(); + appCatalog = RegistryFactory.getAppCatalog(); setGatewayProperties(); startDaemonHandlers(); // initializing Better Gfac Instance http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/gfac/gfac-service/src/test/java/org/apache/airavata/gfac/client/GfacClientFactoryTest.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-service/src/test/java/org/apache/airavata/gfac/client/GfacClientFactoryTest.java b/modules/gfac/gfac-service/src/test/java/org/apache/airavata/gfac/client/GfacClientFactoryTest.java index ce88c18..4507c41 100644 --- a/modules/gfac/gfac-service/src/test/java/org/apache/airavata/gfac/client/GfacClientFactoryTest.java +++ b/modules/gfac/gfac-service/src/test/java/org/apache/airavata/gfac/client/GfacClientFactoryTest.java @@ -48,7 +48,7 @@ public class GfacClientFactoryTest { try { service = (new GfacServer()); service.start(); - registry = RegistryFactory.getDefaultRegistry(); + registry = RegistryFactory.getDefaultExpCatalog(); } catch (Exception e) { e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. } http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/integration-tests/pom.xml ---------------------------------------------------------------------- diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml index bbc4d9c..d4ad646 100644 --- a/modules/integration-tests/pom.xml +++ b/modules/integration-tests/pom.xml @@ -214,12 +214,12 @@ </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>app-catalog-data</artifactId> + <artifactId>airavata-registry-core</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>app-catalog-cpi</artifactId> + <artifactId>airavata-registry-cpi</artifactId> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java index 2f88c81..d93e2c0 100644 --- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java +++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java @@ -51,7 +51,7 @@ public class OrchestratorUtils { // public static HostDescription getHostDescription(Orchestrator orchestrator, TaskDetails taskDetails)throws OrchestratorException { // JobSubmitter jobSubmitter = ((SimpleOrchestratorImpl) orchestrator).getJobSubmitter(); -// AiravataRegistry2 registry = ((GFACEmbeddedJobSubmitter) jobSubmitter).getOrchestratorContext().getRegistry(); +// AiravataRegistry2 registry = ((GFACEmbeddedJobSubmitter) jobSubmitter).getOrchestratorContext().getExperimentCatalog(); // ComputationalResourceScheduling taskScheduling = taskDetails.getTaskScheduling(); // String resourceHostId = taskScheduling.getResourceHostId(); // try { http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/validator/impl/BatchQueueValidator.java ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/validator/impl/BatchQueueValidator.java b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/validator/impl/BatchQueueValidator.java index e3b2cdc..baada7e 100644 --- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/validator/impl/BatchQueueValidator.java +++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/validator/impl/BatchQueueValidator.java @@ -20,9 +20,6 @@ */ package org.apache.airavata.orchestrator.core.validator.impl; -import org.airavata.appcatalog.cpi.AppCatalog; -import org.airavata.appcatalog.cpi.AppCatalogException; -import org.apache.aiaravata.application.catalog.data.impl.AppCatalogFactory; import org.apache.airavata.model.appcatalog.computeresource.BatchQueue; import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription; import org.apache.airavata.model.error.ValidationResults; @@ -30,8 +27,7 @@ import org.apache.airavata.model.error.ValidatorResult; import org.apache.airavata.model.workspace.experiment.*; import org.apache.airavata.orchestrator.core.validator.JobMetadataValidator; import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory; -import org.apache.airavata.registry.cpi.Registry; -import org.apache.airavata.registry.cpi.RegistryException; +import org.apache.airavata.registry.cpi.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,15 +37,15 @@ import java.util.List; public class BatchQueueValidator implements JobMetadataValidator { private final static Logger logger = LoggerFactory.getLogger(BatchQueueValidator.class); - private Registry registry; + private ExperimentCatalog experimentCatalog; private AppCatalog appCatalog; public BatchQueueValidator() { try { - this.registry = RegistryFactory.getDefaultRegistry(); - this.appCatalog = AppCatalogFactory.getAppCatalog(); + this.experimentCatalog = RegistryFactory.getDefaultExpCatalog(); + this.appCatalog = RegistryFactory.getAppCatalog(); } catch (RegistryException e) { - logger.error("Unable to initialize registry", e); + logger.error("Unable to initialize experimentCatalog", e); } catch (AppCatalogException e) { logger.error("Unable to initialize Application Catalog", e); } http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/AbstractOrchestrator.java ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/AbstractOrchestrator.java b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/AbstractOrchestrator.java index 9835fc5..b72aba2 100644 --- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/AbstractOrchestrator.java +++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/AbstractOrchestrator.java @@ -73,7 +73,7 @@ public abstract class AbstractOrchestrator implements Orchestrator { orchestratorConfiguration = OrchestratorUtils.loadOrchestratorConfiguration(); setGatewayProperties(); /* initializing the Orchestratorcontext object */ -// airavataRegistry = AiravataRegistryFactory.getRegistry(new Gateway(getGatewayName()), new AiravataUser(getAiravataUserName())); +// airavataRegistry = AiravataRegistryFactory.getExperimentCatalog(new Gateway(getGatewayName()), new AiravataUser(getAiravataUserName())); // todo move this code to gfac service mode Jobsubmitter, // todo this is ugly, SHOULD fix these isEmbedded mode code from Orchestrator // if (!orchestratorConfiguration.isEmbeddedMode()) { http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/NewOrchestratorTest.java ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/NewOrchestratorTest.java b/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/NewOrchestratorTest.java index eee0001..f973b3e 100644 --- a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/NewOrchestratorTest.java +++ b/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/NewOrchestratorTest.java @@ -71,7 +71,7 @@ public class NewOrchestratorTest extends BaseOrchestratorTest { // userConfigurationData.setComputationalResourceScheduling(scheduling); // simpleExperiment.setUserConfigurationData(userConfigurationData); // -// Registry defaultRegistry = RegistryFactory.getDefaultRegistry(); +// Registry defaultRegistry = RegistryFactory.getDefaultExpCatalog(); // String experimentId = (String)defaultRegistry.add(ParentDataType.EXPERIMENT, simpleExperiment); // // simpleExperiment.setExperimentID(experimentId); http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/OrchestratorTestWithMyProxyAuth.java ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/OrchestratorTestWithMyProxyAuth.java b/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/OrchestratorTestWithMyProxyAuth.java index 9c39b3f..c9db048 100644 --- a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/OrchestratorTestWithMyProxyAuth.java +++ b/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/OrchestratorTestWithMyProxyAuth.java @@ -69,7 +69,7 @@ public class OrchestratorTestWithMyProxyAuth extends BaseOrchestratorTest { // simpleExperiment.setUserConfigurationData(userConfigurationData); // // WorkflowNodeDetails test = ExperimentModelUtil.createWorkflowNode("test", null); -// Registry registry = RegistryFactory.getDefaultRegistry(); +// Registry registry = RegistryFactory.getDefaultExpCatalog(); // experimentID = (String) registry.add(ParentDataType.EXPERIMENT, simpleExperiment); // tasks = orchestrator.createTasks(experimentID); // http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/ValidatorTest.java ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/ValidatorTest.java b/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/ValidatorTest.java index 2ef4dc5..6bc2c81 100644 --- a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/ValidatorTest.java +++ b/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/ValidatorTest.java @@ -86,7 +86,7 @@ // userConfigurationData.setComputationalResourceScheduling(scheduling); // simpleExperiment.setUserConfigurationData(userConfigurationData); // -// Registry defaultRegistry = RegistryFactory.getDefaultRegistry(); +// Registry defaultRegistry = RegistryFactory.getDefaultExpCatalog(); // String experimentId = (String)defaultRegistry.add(ParentDataType.EXPERIMENT, simpleExperiment); // // simpleExperiment.setExperimentID(experimentId); http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/orchestrator/orchestrator-service/pom.xml ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-service/pom.xml b/modules/orchestrator/orchestrator-service/pom.xml index f0bb400..f43b758 100644 --- a/modules/orchestrator/orchestrator-service/pom.xml +++ b/modules/orchestrator/orchestrator-service/pom.xml @@ -57,12 +57,12 @@ </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>app-catalog-data</artifactId> + <artifactId>airavata-registry-cpi</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>app-catalog-cpi</artifactId> + <artifactId>airavata-registry-core</artifactId> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java b/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java index 694f783..0bb1a25 100644 --- a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java +++ b/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java @@ -21,11 +21,10 @@ package org.apache.airavata.orchestrator.server; +import org.apache.airavata.registry.core.app.catalog.resources.AppCatAbstractResource; import org.apache.airavata.registry.cpi.AppCatalog; import org.apache.airavata.registry.cpi.AppCatalogException; import org.apache.airavata.registry.cpi.ComputeResource; -import org.apache.aiaravata.application.catalog.data.impl.AppCatalogFactory; -import org.apache.aiaravata.application.catalog.data.resources.AbstractResource; import org.apache.airavata.common.exception.AiravataException; import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.common.logger.AiravataLogger; @@ -123,7 +122,7 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface { // first constructing the monitorManager and orchestrator, then fill // the required properties orchestrator = new SimpleOrchestratorImpl(); - experimentCatalog = RegistryFactory.getDefaultRegistry(); + experimentCatalog = RegistryFactory.getDefaultExpCatalog(); orchestrator.initialize(); orchestrator.getOrchestratorContext().setPublisher(this.publisher); startProcessConsumer(); @@ -322,7 +321,7 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface { throws AppCatalogException, OrchestratorException, ClassNotFoundException, ApplicationSettingsException, InstantiationException, IllegalAccessException { - AppCatalog appCatalog = AppCatalogFactory.getAppCatalog(); + AppCatalog appCatalog = RegistryFactory.getAppCatalog(); String selectedModuleId = getModuleId(appCatalog, applicationId); ApplicationDeploymentDescription applicationDeploymentDescription = getAppDeployment( appCatalog, taskData, selectedModuleId); @@ -335,9 +334,9 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface { ApplicationSettingsException, InstantiationException, IllegalAccessException { Map<String, String> moduleIdFilter = new HashMap<String, String>(); - moduleIdFilter.put(AbstractResource.ApplicationDeploymentConstants.APP_MODULE_ID, selectedModuleId); + moduleIdFilter.put(AppCatAbstractResource.ApplicationDeploymentConstants.APP_MODULE_ID, selectedModuleId); if (taskData.getTaskScheduling()!=null && taskData.getTaskScheduling().getResourceHostId() != null) { - moduleIdFilter.put(AbstractResource.ApplicationDeploymentConstants.COMPUTE_HOST_ID, taskData.getTaskScheduling().getResourceHostId()); + moduleIdFilter.put(AppCatAbstractResource.ApplicationDeploymentConstants.COMPUTE_HOST_ID, taskData.getTaskScheduling().getResourceHostId()); } List<ApplicationDeploymentDescription> applicationDeployements = appCatalog.getApplicationDeployment().getApplicationDeployements(moduleIdFilter); Map<ComputeResourceDescription, ApplicationDeploymentDescription> deploymentMap = new HashMap<ComputeResourceDescription, ApplicationDeploymentDescription>(); http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/util/DataModelUtils.java ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/util/DataModelUtils.java b/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/util/DataModelUtils.java index 86ec301..c1fb069 100644 --- a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/util/DataModelUtils.java +++ b/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/util/DataModelUtils.java @@ -23,9 +23,9 @@ package org.apache.airavata.orchestrator.util; import java.util.List; +import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory; import org.apache.airavata.registry.cpi.AppCatalogException; import org.apache.airavata.registry.cpi.ApplicationInterface; -import org.apache.aiaravata.application.catalog.data.impl.AppCatalogFactory; import org.apache.airavata.model.util.ExecutionType; import org.apache.airavata.model.workspace.experiment.Experiment; import org.slf4j.Logger; @@ -36,13 +36,13 @@ public class DataModelUtils { private final static Logger logger = LoggerFactory.getLogger(DataModelUtils.class); public static ExecutionType getExecutionType(String gatewayId, Experiment experiment){ try { - ApplicationInterface applicationInterface = AppCatalogFactory.getAppCatalog().getApplicationInterface(); + ApplicationInterface applicationInterface = RegistryFactory.getAppCatalog().getApplicationInterface(); List<String> allApplicationInterfaceIds = applicationInterface.getAllApplicationInterfaceIds(); String applicationId = experiment.getApplicationId(); if (allApplicationInterfaceIds.contains(applicationId)){ return ExecutionType.SINGLE_APP; } else { - List<String> allWorkflows = AppCatalogFactory.getAppCatalog().getWorkflowCatalog().getAllWorkflows(gatewayId); + List<String> allWorkflows = RegistryFactory.getAppCatalog().getWorkflowCatalog().getAllWorkflows(gatewayId); if (allWorkflows.contains(applicationId)){ return ExecutionType.WORKFLOW; } http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/orchestrator/orchestrator-service/src/test/java/org/apache/airavata/orchestrator/client/OrchestratorClientFactoryTest.java ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-service/src/test/java/org/apache/airavata/orchestrator/client/OrchestratorClientFactoryTest.java b/modules/orchestrator/orchestrator-service/src/test/java/org/apache/airavata/orchestrator/client/OrchestratorClientFactoryTest.java index 3902c9d..7e55b0b 100644 --- a/modules/orchestrator/orchestrator-service/src/test/java/org/apache/airavata/orchestrator/client/OrchestratorClientFactoryTest.java +++ b/modules/orchestrator/orchestrator-service/src/test/java/org/apache/airavata/orchestrator/client/OrchestratorClientFactoryTest.java @@ -46,7 +46,7 @@ public class OrchestratorClientFactoryTest { try { service = (new OrchestratorServer()); service.start(); - registry = RegistryFactory.getDefaultRegistry(); + registry = RegistryFactory.getDefaultExpCatalog(); documentCreator = new DocumentCreatorNew(getAiravataClient()); documentCreator.createLocalHostDocs(); } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/AppCatalogFactory.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/AppCatalogFactory.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/AppCatalogFactory.java deleted file mode 100644 index f5107d1..0000000 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/AppCatalogFactory.java +++ /dev/null @@ -1,46 +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. - * - */ - -package org.apache.airavata.registry.core.app.catalog.impl; - -import org.apache.airavata.registry.cpi.AppCatalog; -import org.apache.airavata.registry.cpi.AppCatalogException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class AppCatalogFactory { - private static AppCatalog appCatalog; - - private static Logger logger = LoggerFactory.getLogger(AppCatalogFactory.class); - - public static AppCatalog getAppCatalog() throws AppCatalogException { - try { - if (appCatalog == null){ - appCatalog = new AppCatalogImpl(); - } - - }catch (Exception e){ - logger.error("Unable to create app catalog instance", e); - throw new AppCatalogException(e); - } - return appCatalog; - } -} http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/AppCatalogImpl.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/AppCatalogImpl.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/AppCatalogImpl.java index 1a4e9ce..279746f 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/AppCatalogImpl.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/AppCatalogImpl.java @@ -25,27 +25,22 @@ package org.apache.airavata.registry.core.app.catalog.impl; import org.apache.airavata.registry.cpi.*; public class AppCatalogImpl implements AppCatalog { - @Override public ComputeResource getComputeResource() { return new ComputeResourceImpl(); } - @Override public ApplicationInterface getApplicationInterface() { return new ApplicationInterfaceImpl(); } - @Override public ApplicationDeployment getApplicationDeployment() { return new ApplicationDeploymentImpl(); } - @Override public GwyResourceProfile getGatewayProfile() throws AppCatalogException { return new GwyResourceProfileImpl(); } - @Override public WorkflowCatalog getWorkflowCatalog() throws AppCatalogException { return new WorkflowCatalogImpl(); } http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/RegistryFactory.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/RegistryFactory.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/RegistryFactory.java index 9cea1c4..c924149 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/RegistryFactory.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/RegistryFactory.java @@ -23,56 +23,82 @@ package org.apache.airavata.registry.core.experiment.catalog.impl; import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.common.utils.ServerSettings; -import org.apache.airavata.registry.cpi.ExperimentCatalog; -import org.apache.airavata.registry.cpi.Registry; -import org.apache.airavata.registry.cpi.RegistryException; +import org.apache.airavata.registry.core.app.catalog.impl.AppCatalogImpl; +import org.apache.airavata.registry.core.impl.RegistryImpl; +import org.apache.airavata.registry.cpi.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class RegistryFactory { private static ExperimentCatalog experimentCatalog; + private static AppCatalog appCatalog; private static Registry registry; private static Logger logger = LoggerFactory.getLogger(RegistryFactory.class); - public static ExperimentCatalog getRegistry(String gateway, String username, String password) throws RegistryException { + public static Registry getRegistry() throws RegistryException { + try { + if (registry == null) { + registry = new RegistryImpl(); + } + } catch (Exception e) { + logger.error("Unable to create registry instance", e); + throw new RegistryException(e); + } + return registry; + } + + public static ExperimentCatalog getExperimentCatalog(String gateway, String username, String password) throws RegistryException { try { if (experimentCatalog == null) { experimentCatalog = new ExperimentCatalogImpl(gateway, username, password); } } catch (RegistryException e) { - logger.error("Unable to create registry instance", e); + logger.error("Unable to create experiment catalog instance", e); throw new RegistryException(e); } return experimentCatalog; } - public static ExperimentCatalog getRegistry(String gateway) throws RegistryException { + public static ExperimentCatalog getExperimentCatalog(String gateway) throws RegistryException { try { if (experimentCatalog == null) { experimentCatalog = new ExperimentCatalogImpl(gateway, ServerSettings.getDefaultUser(), ServerSettings.getDefaultUserPassword()); } } catch (RegistryException e) { - logger.error("Unable to create registry instance", e); + logger.error("Unable to create experiment catalog instance", e); throw new RegistryException(e); } catch (ApplicationSettingsException e) { - logger.error("Unable to create registry instance", e); + logger.error("Unable to create experiment catalog instance", e); throw new RegistryException(e); } return experimentCatalog; } - public static ExperimentCatalog getDefaultRegistry () throws RegistryException { + public static ExperimentCatalog getDefaultExpCatalog() throws RegistryException { try { if (experimentCatalog == null) { experimentCatalog = new ExperimentCatalogImpl(); } } catch (RegistryException e) { - logger.error("Unable to create registry instance", e); + logger.error("Unable to create experiment catalog instance", e); throw new RegistryException(e); } return experimentCatalog; } + public static AppCatalog getAppCatalog() throws AppCatalogException { + try { + if (appCatalog == null) { + appCatalog = new AppCatalogImpl(); + } + } catch (Exception e) { + logger.error("Unable to create app catalog instance", e); + throw new AppCatalogException(e); + } + return appCatalog; + } + + public static ExperimentCatalog getLoggingRegistry() { if(experimentCatalog == null) { experimentCatalog = new LoggingExperimentCatalogImpl(); http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/impl/RegistryImpl.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/impl/RegistryImpl.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/impl/RegistryImpl.java new file mode 100644 index 0000000..989c9ed --- /dev/null +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/impl/RegistryImpl.java @@ -0,0 +1,46 @@ +/* + * + * 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. + * +*/ + +package org.apache.airavata.registry.core.impl; + +import org.apache.airavata.registry.core.app.catalog.impl.AppCatalogImpl; +import org.apache.airavata.registry.core.experiment.catalog.impl.ExperimentCatalogImpl; +import org.apache.airavata.registry.cpi.AppCatalog; +import org.apache.airavata.registry.cpi.ExperimentCatalog; +import org.apache.airavata.registry.cpi.Registry; +import org.apache.airavata.registry.cpi.RegistryException; + +public class RegistryImpl implements Registry { + @Override + public ExperimentCatalog getExperimentCatalog() throws RegistryException { + return new ExperimentCatalogImpl(); + } + + @Override + public ExperimentCatalog getExperimentCatalog(String gatewayId, String username, String password) throws RegistryException { + return new ExperimentCatalogImpl(gatewayId, username, password); + } + + @Override + public AppCatalog getAppCatalog() throws RegistryException { + return new AppCatalogImpl(); + } +} http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/registry/registry-core/src/test/java/org/apache/airavata/app/catalog/AppDeploymentTest.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/app/catalog/AppDeploymentTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/app/catalog/AppDeploymentTest.java index 0bd77f4..f89ac48 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/app/catalog/AppDeploymentTest.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/app/catalog/AppDeploymentTest.java @@ -27,8 +27,8 @@ import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentD import org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule; import org.apache.airavata.model.appcatalog.appdeployment.SetEnvPaths; import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription; -import org.apache.airavata.registry.core.app.catalog.impl.AppCatalogFactory; import org.apache.airavata.registry.core.app.catalog.resources.AppCatAbstractResource; +import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory; import org.apache.airavata.registry.cpi.*; import org.junit.After; import org.junit.Before; @@ -53,7 +53,7 @@ public class AppDeploymentTest { try { initialize = new Initialize("appcatalog-derby.sql"); initialize.initializeDB(); - appcatalog = AppCatalogFactory.getAppCatalog(); + appcatalog = RegistryFactory.getAppCatalog(); } catch (AppCatalogException e) { logger.error(e.getMessage(), e); } http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/registry/registry-core/src/test/java/org/apache/airavata/app/catalog/AppInterfaceTest.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/app/catalog/AppInterfaceTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/app/catalog/AppInterfaceTest.java index e377a02..41ab78d 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/app/catalog/AppInterfaceTest.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/app/catalog/AppInterfaceTest.java @@ -29,8 +29,8 @@ import org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDes import org.apache.airavata.model.appcatalog.appinterface.DataType; import org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType; import org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType; -import org.apache.airavata.registry.core.app.catalog.impl.AppCatalogFactory; import org.apache.airavata.registry.core.app.catalog.resources.AppCatAbstractResource; +import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory; import org.apache.airavata.registry.cpi.AppCatalog; import org.apache.airavata.registry.cpi.AppCatalogException; import org.apache.airavata.registry.cpi.ApplicationInterface; @@ -58,7 +58,7 @@ public class AppInterfaceTest { try { initialize = new Initialize("appcatalog-derby.sql"); initialize.initializeDB(); - appcatalog = AppCatalogFactory.getAppCatalog(); + appcatalog = RegistryFactory.getAppCatalog(); } catch (AppCatalogException e) { logger.error(e.getMessage(), e); } http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/registry/registry-core/src/test/java/org/apache/airavata/app/catalog/ComputeAppCatalogExperimentCatResourceTest.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/app/catalog/ComputeAppCatalogExperimentCatResourceTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/app/catalog/ComputeAppCatalogExperimentCatResourceTest.java index 2c45725..47ec011 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/app/catalog/ComputeAppCatalogExperimentCatResourceTest.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/app/catalog/ComputeAppCatalogExperimentCatResourceTest.java @@ -24,8 +24,8 @@ package org.apache.airavata.app.catalog; import org.apache.airavata.app.catalog.util.Initialize; import org.apache.airavata.model.appcatalog.computeresource.*; -import org.apache.airavata.registry.core.app.catalog.impl.AppCatalogFactory; import org.apache.airavata.registry.core.app.catalog.resources.AppCatAbstractResource; +import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory; import org.apache.airavata.registry.cpi.AppCatalog; import org.apache.airavata.registry.cpi.AppCatalogException; import org.apache.airavata.registry.cpi.ComputeResource; @@ -49,7 +49,7 @@ public class ComputeAppCatalogExperimentCatResourceTest { try { initialize = new Initialize("appcatalog-derby.sql"); initialize.initializeDB(); - appcatalog = AppCatalogFactory.getAppCatalog(); + appcatalog = RegistryFactory.getAppCatalog(); } catch (AppCatalogException e) { logger.error(e.getMessage(), e); } http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/registry/registry-core/src/test/java/org/apache/airavata/app/catalog/GatewayProfileTest.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/app/catalog/GatewayProfileTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/app/catalog/GatewayProfileTest.java index f4aaf19..ae3e11d 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/app/catalog/GatewayProfileTest.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/app/catalog/GatewayProfileTest.java @@ -27,7 +27,7 @@ import org.apache.airavata.model.appcatalog.computeresource.DataMovementProtocol import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol; import org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference; import org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile; -import org.apache.airavata.registry.core.app.catalog.impl.AppCatalogFactory; +import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory; import org.apache.airavata.registry.cpi.AppCatalog; import org.apache.airavata.registry.cpi.AppCatalogException; import org.apache.airavata.registry.cpi.ComputeResource; @@ -53,7 +53,7 @@ public class GatewayProfileTest { try { initialize = new Initialize("appcatalog-derby.sql"); initialize.initializeDB(); - appcatalog = AppCatalogFactory.getAppCatalog(); + appcatalog = RegistryFactory.getAppCatalog(); } catch (AppCatalogException e) { logger.error(e.getMessage(), e); } http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentUseCaseTest.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentUseCaseTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentUseCaseTest.java index 0a9ebff..d486f17 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentUseCaseTest.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentUseCaseTest.java @@ -54,7 +54,7 @@ public class ExperimentUseCaseTest { public static void setupBeforeClass() throws RegistryException, SQLException { initialize = new Initialize("expcatalog-derby.sql"); initialize.initializeDB(); - experimentCatalog = RegistryFactory.getDefaultRegistry(); + experimentCatalog = RegistryFactory.getDefaultExpCatalog(); } @Test http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/Registry.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/Registry.java b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/Registry.java index c53c703..c33b9f2 100644 --- a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/Registry.java +++ b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/Registry.java @@ -23,5 +23,6 @@ package org.apache.airavata.registry.cpi; public interface Registry { public ExperimentCatalog getExperimentCatalog() throws RegistryException; + public ExperimentCatalog getExperimentCatalog(String gatewayId, String username, String password) throws RegistryException; public AppCatalog getAppCatalog() throws RegistryException; } http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/workflow-model/workflow-engine/pom.xml ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-engine/pom.xml b/modules/workflow-model/workflow-engine/pom.xml index 6189254..1361781 100644 --- a/modules/workflow-model/workflow-engine/pom.xml +++ b/modules/workflow-model/workflow-engine/pom.xml @@ -207,12 +207,12 @@ </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>app-catalog-cpi</artifactId> + <artifactId>airavata-registry-cpi</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>app-catalog-data</artifactId> + <artifactId>airavata-registry-core</artifactId> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/catalog/WorkflowCatalogFactory.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/catalog/WorkflowCatalogFactory.java b/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/catalog/WorkflowCatalogFactory.java index 67b7612..e35e6b3 100644 --- a/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/catalog/WorkflowCatalogFactory.java +++ b/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/catalog/WorkflowCatalogFactory.java @@ -21,9 +21,9 @@ package org.apache.airavata.workflow.catalog; +import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory; import org.apache.airavata.registry.cpi.AppCatalogException; import org.apache.airavata.registry.cpi.WorkflowCatalog; -import org.apache.aiaravata.application.catalog.data.impl.AppCatalogFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,7 +34,7 @@ public class WorkflowCatalogFactory { public static WorkflowCatalog getWorkflowCatalog() throws AppCatalogException{ try { if (workflowCatalog==null) { - workflowCatalog = AppCatalogFactory.getAppCatalog().getWorkflowCatalog(); + workflowCatalog = RegistryFactory.getAppCatalog().getWorkflowCatalog(); } return workflowCatalog; } catch (AppCatalogException e) { http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/WorkflowEngineImpl.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/WorkflowEngineImpl.java b/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/WorkflowEngineImpl.java index 875aec1..3d4ca49 100644 --- a/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/WorkflowEngineImpl.java +++ b/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/WorkflowEngineImpl.java @@ -57,7 +57,7 @@ public class WorkflowEngineImpl implements WorkflowEngine { public void launchExperiment(String experimentId, String token) throws WorkflowEngineException { try { - ExperimentCatalog experimentCatalog = RegistryFactory.getDefaultRegistry(); + ExperimentCatalog experimentCatalog = RegistryFactory.getDefaultExpCatalog(); Experiment experiment = (Experiment) experimentCatalog.get(ExperimentCatalogModelType.EXPERIMENT, experimentId); WorkflowCatalog workflowCatalog = WorkflowCatalogFactory.getWorkflowCatalog(); WorkflowInterpreterConfiguration config = new WorkflowInterpreterConfiguration(new Workflow(workflowCatalog.getWorkflow(experiment.getApplicationId()).getGraph())); http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/WorkflowUtils.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/WorkflowUtils.java b/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/WorkflowUtils.java index a3e8fed..ee2eb46 100644 --- a/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/WorkflowUtils.java +++ b/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/WorkflowUtils.java @@ -23,9 +23,9 @@ package org.apache.airavata.workflow.engine; import java.util.List; +import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory; import org.apache.airavata.registry.cpi.AppCatalogException; import org.apache.airavata.registry.cpi.ApplicationInterface; -import org.apache.aiaravata.application.catalog.data.impl.AppCatalogFactory; import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.common.utils.ServerSettings; import org.apache.airavata.model.util.ExecutionType; @@ -38,7 +38,7 @@ public class WorkflowUtils { private static final Logger logger = LoggerFactory.getLogger(WorkflowUtils.class); public static ExecutionType getExecutionType(Experiment experiment){ try { - ApplicationInterface applicationInterface = AppCatalogFactory.getAppCatalog().getApplicationInterface(); + ApplicationInterface applicationInterface = RegistryFactory.getAppCatalog().getApplicationInterface(); List<String> allApplicationInterfaceIds = applicationInterface.getAllApplicationInterfaceIds(); String applicationId = experiment.getApplicationId(); if (allApplicationInterfaceIds.contains(applicationId)){ http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/interpretor/WorkflowInterpreter.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/interpretor/WorkflowInterpreter.java b/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/interpretor/WorkflowInterpreter.java index 054e195..435e758 100644 --- a/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/interpretor/WorkflowInterpreter.java +++ b/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/interpretor/WorkflowInterpreter.java @@ -169,7 +169,7 @@ public class WorkflowInterpreter implements AbstractActivityListener{ private ExperimentCatalog getExperimentCatalog() throws RegistryException{ if (experimentCatalog ==null){ - experimentCatalog = RegistryFactory.getDefaultRegistry(); + experimentCatalog = RegistryFactory.getDefaultExpCatalog(); } return experimentCatalog; // return new TmpRegistry(); @@ -332,7 +332,7 @@ public class WorkflowInterpreter implements AbstractActivityListener{ throw new WorkflowException(e); } - // System.out.println(this.config.getConfiguration().getJcrComponentRegistry().getRegistry().getWorkflowStatus(this.topic)); + // System.out.println(this.config.getConfiguration().getJcrComponentRegistry().getExperimentCatalog().getWorkflowStatus(this.topic)); } } else { if (this.config.isActOnProvenance()) { @@ -434,7 +434,7 @@ public class WorkflowInterpreter implements AbstractActivityListener{ // next run // even if the next run runs before the notification arrives WorkflowNodeDetails workflowNodeDetails = createWorkflowNodeDetails(node); -// workflowNodeDetails.setNodeInstanceId((String)getRegistry().add(ChildDataType.WORKFLOW_NODE_DETAIL, workflowNodeDetails, getExperiment().getExperimentID())); +// workflowNodeDetails.setNodeInstanceId((String)getExperimentCatalog().add(ChildDataType.WORKFLOW_NODE_DETAIL, workflowNodeDetails, getExperiment().getExperimentID())); node.setState(NodeExecutionState.EXECUTING); updateWorkflowNodeStatus(workflowNodeDetails, WorkflowNodeState.EXECUTING); publishNodeStatusChange(WorkflowNodeState.EXECUTING, node.getID(), experiment.getExperimentID());
