Repository: airavata Updated Branches: refs/heads/develop 6c5645d3a -> faabd9713
changes to the data catalog sample Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/faabd971 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/faabd971 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/faabd971 Branch: refs/heads/develop Commit: faabd9713a4d7b9ead35ff44103e9afd71998911 Parents: 6c5645d Author: scnakandala <[email protected]> Authored: Wed Mar 23 14:08:53 2016 -0400 Committer: scnakandala <[email protected]> Committed: Wed Mar 23 14:08:53 2016 -0400 ---------------------------------------------------------------------- .../airavata/client/samples/DataCatalogSample.java | 2 +- .../src/test/resources/airavata-server.properties | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/faabd971/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 c26d371..592eaa1 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 @@ -47,7 +47,7 @@ public class DataCatalogSample { dataProductModel.setGatewayId(DEFAULT_GATEWAY); dataProductModel.setOwnerName(USER_NAME); dataProductModel.setProductName("test-1"); - dataProductModel.setLogicalPath("/test/test/test"); + dataProductModel.setLogicalPath("/test/test/test/" + System.currentTimeMillis()); dataProductModel.setDataProductType(DataProductType.FILE); DataReplicaLocationModel replicaLocationModel = new DataReplicaLocationModel(); http://git-wip-us.apache.org/repos/asf/airavata/blob/faabd971/modules/credential-store/credential-store-service/src/test/resources/airavata-server.properties ---------------------------------------------------------------------- diff --git a/modules/credential-store/credential-store-service/src/test/resources/airavata-server.properties b/modules/credential-store/credential-store-service/src/test/resources/airavata-server.properties index 6158da1..e74016f 100644 --- a/modules/credential-store/credential-store-service/src/test/resources/airavata-server.properties +++ b/modules/credential-store/credential-store-service/src/test/resources/airavata-server.properties @@ -79,19 +79,6 @@ datacatalog.jdbc.password=airavata datacatalog.validationQuery=SELECT 1 from CONFIGURATION ########################################################################### -# Data Catalog DB Configuration -########################################################################### -#for derby [AiravataJPARegistry] -datacatalog.jdbc.driver=org.apache.derby.jdbc.ClientDriver -datacatalog.jdbc.url=jdbc:derby://localhost:1527/data_catalog;create=true;user=airavata;password=airavata -# MySql database configuration -#datacatalog.jdbc.driver=com.mysql.jdbc.Driver -#datacatalog.jdbc.url=jdbc:mysql://localhost:3306/data_catalog -datacatalog.jdbc.user=airavata -datacatalog.jdbc.password=airavata -datacatalog.validationQuery=SELECT 1 from CONFIGURATION - -########################################################################### # Server module Configuration ###########################################################################
