airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shame...@apache.org
Subject [19/55] [abbrv] airavata git commit: setting parent uri for data products
Date Fri, 25 Mar 2016 21:22:42 GMT
setting parent uri for data products


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/464c5b4a
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/464c5b4a
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/464c5b4a

Branch: refs/heads/master
Commit: 464c5b4a70cf01fbb32bf56cbc3678134c560db0
Parents: 199c301
Author: scnakandala <supun.nakandala@gmail.com>
Authored: Wed Mar 23 18:08:23 2016 -0400
Committer: scnakandala <supun.nakandala@gmail.com>
Committed: Wed Mar 23 18:08:23 2016 -0400

----------------------------------------------------------------------
 .../java/org/apache/airavata/client/samples/DataCatalogSample.java | 2 +-
 .../airavata/registry/core/data/catalog/impl/DataCatalogImpl.java  | 1 +
 .../registry-core/src/main/resources/datacatalog-mysql.sql         | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/464c5b4a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/DataCatalogSample.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/DataCatalogSample.java
b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/DataCatalogSample.java
index 592eaa1..ed9f8a9 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/DataCatalogSample.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/DataCatalogSample.java
@@ -63,7 +63,7 @@ public class DataCatalogSample {
             System.out.println(productUri);
 
 
-            dataProductModel = client.getDataProduct(authzToken, productUri);
+            dataProductModel = client.getDataProduct(authzToken, "airavata-dp://Eroma2016@seagrid/");
             System.out.println(dataProductModel.getReplicaLocations().size());
         } catch (Exception e) {
             logger.error("Error while connecting with server", e.getMessage());

http://git-wip-us.apache.org/repos/asf/airavata/blob/464c5b4a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/data/catalog/impl/DataCatalogImpl.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/data/catalog/impl/DataCatalogImpl.java
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/data/catalog/impl/DataCatalogImpl.java
index 2c809d6..66b780d 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/data/catalog/impl/DataCatalogImpl.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/data/catalog/impl/DataCatalogImpl.java
@@ -87,6 +87,7 @@ public class DataCatalogImpl implements DataCatalog {
             }
         }
 
+        productModel.setProductUri(parentUri);
         String productUri = DataCatalog.schema + "://" + productModel.getOwnerName() + "@"
+ productModel.getGatewayId()
                 + ":" + productModel.getLogicalPath();
         productModel.setProductUri(productUri);

http://git-wip-us.apache.org/repos/asf/airavata/blob/464c5b4a/modules/registry/registry-core/src/main/resources/datacatalog-mysql.sql
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/datacatalog-mysql.sql b/modules/registry/registry-core/src/main/resources/datacatalog-mysql.sql
index e74c4b8..d612194 100644
--- a/modules/registry/registry-core/src/main/resources/datacatalog-mysql.sql
+++ b/modules/registry/registry-core/src/main/resources/datacatalog-mysql.sql
@@ -27,7 +27,7 @@ CREATE TABLE DATA_PRODUCT
         LOGICAL_PATH VARCHAR (255),
         PRODUCT_DESCRIPTION VARCHAR (255),
         OWNER_NAME VARCHAR (255),
-        PARENT_PRODUCT_ID VARCHAR (255),
+        PARENT_PRODUCT_URI VARCHAR (255),
         PRODUCT_SIZE INT,
         CREATION_TIME TIMESTAMP NULL DEFAULT '0000-00-00 00:00:00',
         LAST_MODIFIED_TIME TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,


Mime
View raw message