You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2019/01/24 15:20:16 UTC
[airavata] branch
airavata-2938-change-db-initialization-in-registry-server-to-use-registry-refactoring-code
updated: AIRAVATA-2938 Removing dependency on registry-core
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch airavata-2938-change-db-initialization-in-registry-server-to-use-registry-refactoring-code
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/airavata-2938-change-db-initialization-in-registry-server-to-use-registry-refactoring-code by this push:
new 4f78e58 AIRAVATA-2938 Removing dependency on registry-core
4f78e58 is described below
commit 4f78e587bb65ce1ca0d038db66049ff38a6403d6
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Thu Jan 24 10:19:40 2019 -0500
AIRAVATA-2938 Removing dependency on registry-core
---
modules/integration-tests/pom.xml | 16 ----------------
modules/workflow-model/workflow-engine/pom.xml | 10 ----------
modules/workflow/workflow-core/pom.xml | 7 +------
.../airavata/workflow/core/WorkflowInterpreter.java | 3 +--
modules/xbaya-gui/pom.xml | 5 -----
5 files changed, 2 insertions(+), 39 deletions(-)
diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml
index 4b21d5e..744bc45 100644
--- a/modules/integration-tests/pom.xml
+++ b/modules/integration-tests/pom.xml
@@ -192,17 +192,6 @@
<type>zip</type>
</dependency-->
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-registry-core</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<!--<dependency>-->
<!--<groupId>org.apache.airavata</groupId>-->
<!--<artifactId>airavata-client-api</artifactId>-->
@@ -226,11 +215,6 @@
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-registry-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
<artifactId>airavata-registry-cpi</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/modules/workflow-model/workflow-engine/pom.xml b/modules/workflow-model/workflow-engine/pom.xml
index 4a34431..49a5b99 100644
--- a/modules/workflow-model/workflow-engine/pom.xml
+++ b/modules/workflow-model/workflow-engine/pom.xml
@@ -224,11 +224,6 @@
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-registry-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
<artifactId>airavata-workflow-model-component</artifactId>
<version>${project.version}</version>
</dependency>
@@ -262,11 +257,6 @@
<!--<artifactId>airavata-workflow-tracking</artifactId>-->
<!--<version>${project.version}</version>-->
<!--</dependency>-->
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-registry-core</artifactId>
- <version>${project.version}</version>
- </dependency>
<!-- JCR Support -->
<!-- TODO need clean up -->
<dependency>
diff --git a/modules/workflow/workflow-core/pom.xml b/modules/workflow/workflow-core/pom.xml
index 1b67564..412e230 100644
--- a/modules/workflow/workflow-core/pom.xml
+++ b/modules/workflow/workflow-core/pom.xml
@@ -46,11 +46,6 @@
<artifactId>airavata-model-utils</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-registry-core</artifactId>
- <version>${project.version}</version>
- </dependency>
<!--Workflow Interpreter dependency-->
<dependency>
@@ -92,4 +87,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/WorkflowInterpreter.java b/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/WorkflowInterpreter.java
index 901c589..4f85153 100644
--- a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/WorkflowInterpreter.java
+++ b/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/WorkflowInterpreter.java
@@ -33,7 +33,6 @@ import org.apache.airavata.model.status.ProcessState;
import org.apache.airavata.registry.api.RegistryService;
import org.apache.airavata.registry.api.client.RegistryServiceClientFactory;
import org.apache.airavata.registry.api.exception.RegistryServiceException;
-import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory;
import org.apache.airavata.registry.cpi.AppCatalogException;
import org.apache.airavata.registry.cpi.ExperimentCatalogModelType;
import org.apache.airavata.registry.cpi.Registry;
@@ -126,7 +125,7 @@ class WorkflowInterpreter {
}
private String getWorkflow() throws AppCatalogException, WorkflowCatalogException {
- WorkflowCatalog workflowCatalog = RegistryFactory.getAppCatalog().getWorkflowCatalog();
+ // WorkflowCatalog workflowCatalog = RegistryFactory.getAppCatalog().getWorkflowCatalog();
//FIXME: parse workflowTemplateId or experimentId
// workflowCatalog.getWorkflow("");
return "";
diff --git a/modules/xbaya-gui/pom.xml b/modules/xbaya-gui/pom.xml
index ccf596d..78dffaf 100644
--- a/modules/xbaya-gui/pom.xml
+++ b/modules/xbaya-gui/pom.xml
@@ -231,11 +231,6 @@
<artifactId>airavata-orchestrator-client</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-registry-core</artifactId>
- <version>${project.version}</version>
- </dependency>
<!-- JCR Support -->
<!-- TODO need clean up -->