Repository: airavata Updated Branches: refs/heads/develop b2740e74d -> 18cd83c37
http://git-wip-us.apache.org/repos/asf/airavata/blob/18cd83c3/modules/registry/registry-core/src/main/resources/META-INF/persistence.xml ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/resources/META-INF/persistence.xml b/modules/registry/registry-core/src/main/resources/META-INF/persistence.xml index 2d8eb7d..f38cdc6 100644 --- a/modules/registry/registry-core/src/main/resources/META-INF/persistence.xml +++ b/modules/registry/registry-core/src/main/resources/META-INF/persistence.xml @@ -93,7 +93,7 @@ <class>org.apache.airavata.registry.core.experiment.catalog.model.JobStatus</class> <exclude-unlisted-classes>true</exclude-unlisted-classes> </persistence-unit> - <persistence-unit name="datacatalog_data"> + <persistence-unit name="replicacatalog_data"> <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider> <class>org.apache.airavata.registry.core.replica.catalog.model.DataProduct</class> <class>org.apache.airavata.registry.core.replica.catalog.model.DataReplicaLocation</class> http://git-wip-us.apache.org/repos/asf/airavata/blob/18cd83c3/modules/registry/registry-core/src/test/java/org/apache/airavata/replica/catalog/ReplicaCatalogTest.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/replica/catalog/ReplicaCatalogTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/replica/catalog/ReplicaCatalogTest.java index ff30d43..1bfa014 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/replica/catalog/ReplicaCatalogTest.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/replica/catalog/ReplicaCatalogTest.java @@ -37,7 +37,7 @@ import java.util.HashMap; public class ReplicaCatalogTest { private final static Logger logger = LoggerFactory.getLogger(ReplicaCatalogTest.class); private static Initialize initialize; - private static ReplicaCatalog datacatalog; + private static ReplicaCatalog replicacatalog; private static DataProductModel dataProductModel; private static DataReplicaLocationModel replicaLocationModel; @@ -47,7 +47,7 @@ public class ReplicaCatalogTest { System.out.println("********** SET UP ************"); initialize = new Initialize("replicacatalog-derby.sql"); initialize.initializeDB(); - datacatalog = RegistryFactory.getReplicaCatalog(); + replicacatalog = RegistryFactory.getReplicaCatalog(); dataProductModel = new DataProductModel(); dataProductModel.setProductName("test-file.txt"); dataProductModel.setOwnerName("scnakandala"); @@ -80,17 +80,17 @@ public class ReplicaCatalogTest { @Test public void testReplicaCatalog(){ try { - String productUri = datacatalog.registerDataProduct(dataProductModel); + String productUri = replicacatalog.registerDataProduct(dataProductModel); org.junit.Assert.assertNotNull(productUri); - dataProductModel = datacatalog.getDataProduct(productUri); + dataProductModel = replicacatalog.getDataProduct(productUri); Assert.assertNotNull(dataProductModel); - boolean result = datacatalog.removeDataProduct(productUri); + boolean result = replicacatalog.removeDataProduct(productUri); Assert.assertTrue(result); - productUri = datacatalog.registerDataProduct(dataProductModel); + productUri = replicacatalog.registerDataProduct(dataProductModel); Assert.assertNotNull(productUri); - result = datacatalog.removeDataProduct(productUri); + result = replicacatalog.removeDataProduct(productUri); Assert.assertTrue(result); - result = datacatalog.removeDataProduct(productUri); + result = replicacatalog.removeDataProduct(productUri); Assert.assertFalse(result); } catch (ReplicaCatalogException e) { e.printStackTrace(); http://git-wip-us.apache.org/repos/asf/airavata/blob/18cd83c3/modules/registry/registry-core/src/test/java/org/apache/airavata/replica/catalog/util/Initialize.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/replica/catalog/util/Initialize.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/replica/catalog/util/Initialize.java index c05003b..a47eaaf 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/replica/catalog/util/Initialize.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/replica/catalog/util/Initialize.java @@ -94,10 +94,10 @@ public class Initialize { public void initializeDB() { try{ - jdbcDriver = ServerSettings.getSetting("datacatalog.jdbc.driver"); - jdbcUrl = ServerSettings.getSetting("datacatalog.jdbc.url"); - jdbcUser = ServerSettings.getSetting("datacatalog.jdbc.user"); - jdbcPassword = ServerSettings.getSetting("datacatalog.jdbc.password"); + jdbcDriver = ServerSettings.getSetting("replicacatalog.jdbc.driver"); + jdbcUrl = ServerSettings.getSetting("replicacatalog.jdbc.url"); + jdbcUser = ServerSettings.getSetting("replicacatalog.jdbc.user"); + jdbcPassword = ServerSettings.getSetting("replicacatalog.jdbc.password"); jdbcUrl = jdbcUrl + "?" + "user=" + jdbcUser + "&" + "password=" + jdbcPassword; } catch (ApplicationSettingsException e) { logger.error("Unable to read properties", e);
