This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch group-based-auth
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/group-based-auth by this push:
new dfbc1f8 Updating persistence unit name to not conflict with
registry-core persistence.xml
dfbc1f8 is described below
commit dfbc1f8b2788339a09ec2e983bd3ee1a6062625e
Author: Marcus Christie <machris...@apache.org>
AuthorDate: Fri Apr 6 16:57:51 2018 -0400
Updating persistence unit name to not conflict with registry-core
persistence.xml
---
.../airavata/registry/core/utils/JPAUtil/RepCatalogJPAUtils.java | 3 ++-
.../registry-refactoring/src/main/resources/META-INF/persistence.xml | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git
a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/JPAUtil/RepCatalogJPAUtils.java
b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/JPAUtil/RepCatalogJPAUtils.java
index b523f09..234db06 100644
---
a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/JPAUtil/RepCatalogJPAUtils.java
+++
b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/JPAUtil/RepCatalogJPAUtils.java
@@ -31,7 +31,8 @@ import java.util.Map;
public class RepCatalogJPAUtils {
private final static Logger logger =
LoggerFactory.getLogger(RepCatalogJPAUtils.class);
- private static final String PERSISTENCE_UNIT_NAME = "replicacatalog_data";
+ // TODO: we can rename this back to replicacatalog_data once we completely
replace the other replicacatalog_data persistence context in
airavata-registry-core
+ private static final String PERSISTENCE_UNIT_NAME =
"replicacatalog_data_new";
private static final String REPLICACATALOG_JDBC_DRIVER =
"replicacatalog.jdbc.driver";
private static final String REPLICACATALOG_JDBC_URL =
"replicacatalog.jdbc.url";
private static final String REPLICACATALOG_JDBC_USER =
"replicacatalog.jdbc.user";
diff --git
a/modules/registry-refactoring/src/main/resources/META-INF/persistence.xml
b/modules/registry-refactoring/src/main/resources/META-INF/persistence.xml
index 698f48b..d8d52ff 100644
--- a/modules/registry-refactoring/src/main/resources/META-INF/persistence.xml
+++ b/modules/registry-refactoring/src/main/resources/META-INF/persistence.xml
@@ -73,7 +73,7 @@
<class>org.apache.airavata.registry.core.entities.appcatalog.UserStoragePreferenceEntity</class>
<exclude-unlisted-classes>true</exclude-unlisted-classes>
</persistence-unit>
- <persistence-unit name="replicacatalog_data">
+ <persistence-unit name="replicacatalog_data_new">
<class>org.apache.airavata.registry.core.entities.replicacatalog.ConfigurationEntity</class>
<class>org.apache.airavata.registry.core.entities.replicacatalog.DataProductEntity</class>
<class>org.apache.airavata.registry.core.entities.replicacatalog.DataProductMetadataEntity</class>
@@ -98,7 +98,7 @@
<class>org.apache.airavata.registry.core.entities.workflowcatalog.WorkflowOutputEntity</class>
<class>org.apache.airavata.registry.core.entities.workflowcatalog.WorkflowStatusEntity</class>
</persistence-unit>
- <persistence-unit name="experiment_data">
+ <persistence-unit name="experiment_data_new">
<class>org.apache.airavata.registry.core.entities.expcatalog.ComputeResourceSchedulingEntity</class>
<class>org.apache.airavata.registry.core.entities.expcatalog.ExperimentEntity</class>
<class>org.apache.airavata.registry.core.entities.expcatalog.ExperimentErrorEntity</class>
--
To stop receiving notification emails like this one, please contact
machris...@apache.org.
