You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2015/12/16 04:51:34 UTC

[47/50] [abbrv] airavata git commit: fixing merge issues

http://git-wip-us.apache.org/repos/asf/airavata/blob/81b54855/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java
index 8ce13a3..3dbf671 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java
@@ -23,6 +23,7 @@ package org.apache.airavata.registry.core.app.catalog.impl;
 
 import org.apache.airavata.model.appcatalog.computeresource.*;
 import org.apache.airavata.model.data.movement.*;
+import org.apache.airavata.model.data.movement.DMType;
 import org.apache.airavata.registry.core.app.catalog.resources.*;
 import org.apache.airavata.registry.core.app.catalog.util.AppCatalogThriftConversion;
 import org.apache.airavata.registry.core.app.catalog.util.AppCatalogUtils;

http://git-wip-us.apache.org/repos/asf/airavata/blob/81b54855/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ComputeResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ComputeResource.java b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ComputeResource.java
index d66126f..3089996 100644
--- a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ComputeResource.java
+++ b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ComputeResource.java
@@ -21,6 +21,7 @@ package org.apache.airavata.registry.cpi;
 
 import org.apache.airavata.model.appcatalog.computeresource.*;
 import org.apache.airavata.model.data.movement.*;
+import org.apache.airavata.model.data.movement.DMType;
 
 import java.util.List;
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/airavata/blob/81b54855/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e83c5c7..0f320b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -556,7 +556,6 @@
 				<module>modules/registry</module>
 				<module>modules/security</module>
 				<module>modules/credential-store</module>
-				<module>modules/data-manager</module>
 				<module>modules/orchestrator</module>
 				<module>modules/server</module>
 				<module>modules/test-suite</module>