Repository: airavata Updated Branches: refs/heads/master 144bb8f6d -> 63f6a53f6
http://git-wip-us.apache.org/repos/asf/airavata/blob/63f6a53f/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/ApplicationInputResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/ApplicationInputResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/ApplicationInputResource.java index 36c52a0..0244066 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/ApplicationInputResource.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/ApplicationInputResource.java @@ -21,7 +21,7 @@ package org.apache.airavata.registry.core.app.catalog.resources; import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.registry.core.app.catalog.model.AppInput_PK; -import org.apache.airavata.registry.core.app.catalog.model.ApplicationInput; +import org.apache.airavata.registry.core.app.catalog.model.ApplicationIntInput; import org.apache.airavata.registry.core.app.catalog.model.ApplicationInterface; import org.apache.airavata.registry.core.app.catalog.util.AppCatalogJPAUtils; import org.apache.airavata.registry.core.app.catalog.util.AppCatalogQueryGenerator; @@ -108,7 +108,7 @@ public class ApplicationInputResource extends AppCatAbstractResource { generator.setParameter(AppInputConstants.INTERFACE_ID, ids.get(AppInputConstants.INTERFACE_ID)); generator.setParameter(AppInputConstants.INPUT_KEY, ids.get(AppInputConstants.INPUT_KEY)); Query q = generator.selectQuery(em); - ApplicationInput applicationInput = (ApplicationInput) q.getSingleResult(); + ApplicationIntInput applicationInput = (ApplicationIntInput) q.getSingleResult(); ApplicationInputResource applicationInputResource = (ApplicationInputResource) AppCatalogJPAUtils.getResource(AppCatalogResourceType.APPLICATION_INPUT , applicationInput); @@ -143,7 +143,7 @@ public class ApplicationInputResource extends AppCatAbstractResource { results = q.getResultList(); if (results.size() != 0) { for (Object result : results) { - ApplicationInput applicationInput = (ApplicationInput) result; + ApplicationIntInput applicationInput = (ApplicationIntInput) result; ApplicationInputResource applicationInputResource = (ApplicationInputResource) AppCatalogJPAUtils.getResource( AppCatalogResourceType.APPLICATION_INPUT, applicationInput); @@ -156,7 +156,7 @@ public class ApplicationInputResource extends AppCatAbstractResource { results = q.getResultList(); if (results.size() != 0) { for (Object result : results) { - ApplicationInput applicationInput = (ApplicationInput) result; + ApplicationIntInput applicationInput = (ApplicationIntInput) result; ApplicationInputResource applicationInputResource = (ApplicationInputResource) AppCatalogJPAUtils.getResource( AppCatalogResourceType.APPLICATION_INPUT, applicationInput); @@ -169,7 +169,7 @@ public class ApplicationInputResource extends AppCatAbstractResource { results = q.getResultList(); if (results.size() != 0) { for (Object result : results) { - ApplicationInput applicationInput = (ApplicationInput) result; + ApplicationIntInput applicationInput = (ApplicationIntInput) result; ApplicationInputResource applicationInputResource = (ApplicationInputResource) AppCatalogJPAUtils.getResource( AppCatalogResourceType.APPLICATION_INPUT, applicationInput); @@ -223,7 +223,7 @@ public class ApplicationInputResource extends AppCatAbstractResource { results = q.getResultList(); if (results.size() != 0) { for (Object result : results) { - ApplicationInput applicationInput = (ApplicationInput) result; + ApplicationIntInput applicationInput = (ApplicationIntInput) result; appInputResourceIDs.add(applicationInput.getInterfaceID()); } } @@ -233,7 +233,7 @@ public class ApplicationInputResource extends AppCatAbstractResource { results = q.getResultList(); if (results.size() != 0) { for (Object result : results) { - ApplicationInput applicationInput = (ApplicationInput) result; + ApplicationIntInput applicationInput = (ApplicationIntInput) result; appInputResourceIDs.add(applicationInput.getInterfaceID()); } } @@ -243,7 +243,7 @@ public class ApplicationInputResource extends AppCatAbstractResource { results = q.getResultList(); if (results.size() != 0) { for (Object result : results) { - ApplicationInput applicationInput = (ApplicationInput) result; + ApplicationIntInput applicationInput = (ApplicationIntInput) result; appInputResourceIDs.add(applicationInput.getInterfaceID()); } } @@ -273,13 +273,13 @@ public class ApplicationInputResource extends AppCatAbstractResource { EntityManager em = null; try { em = AppCatalogJPAUtils.getEntityManager(); - ApplicationInput existingApplicationInput = em.find(ApplicationInput.class, new AppInput_PK(interfaceID, inputKey)); + ApplicationIntInput existingApplicationInput = em.find(ApplicationIntInput.class, new AppInput_PK(interfaceID, inputKey)); em.close(); - ApplicationInput applicationInput; + ApplicationIntInput applicationInput; em = AppCatalogJPAUtils.getEntityManager(); em.getTransaction().begin(); if (existingApplicationInput == null) { - applicationInput = new ApplicationInput(); + applicationInput = new ApplicationIntInput(); } else { applicationInput=existingApplicationInput; } @@ -329,7 +329,7 @@ public class ApplicationInputResource extends AppCatAbstractResource { EntityManager em = null; try { em = AppCatalogJPAUtils.getEntityManager(); - ApplicationInput applicationInput = em.find(ApplicationInput.class, new AppInput_PK( + ApplicationIntInput applicationInput = em.find(ApplicationIntInput.class, new AppInput_PK( ids.get(AppInputConstants.INTERFACE_ID), ids.get(AppInputConstants.INPUT_KEY))); http://git-wip-us.apache.org/repos/asf/airavata/blob/63f6a53f/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/ApplicationOutputResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/ApplicationOutputResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/ApplicationOutputResource.java index b78ed41..043bdb6 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/ApplicationOutputResource.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/ApplicationOutputResource.java @@ -21,8 +21,8 @@ package org.apache.airavata.registry.core.app.catalog.resources; import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.registry.core.app.catalog.model.AppOutput_PK; +import org.apache.airavata.registry.core.app.catalog.model.ApplicationIntOutput; import org.apache.airavata.registry.core.app.catalog.model.ApplicationInterface; -import org.apache.airavata.registry.core.app.catalog.model.ApplicationOutput; import org.apache.airavata.registry.core.app.catalog.util.AppCatalogJPAUtils; import org.apache.airavata.registry.core.app.catalog.util.AppCatalogQueryGenerator; import org.apache.airavata.registry.core.app.catalog.util.AppCatalogResourceType; @@ -106,7 +106,7 @@ public class ApplicationOutputResource extends AppCatAbstractResource { generator.setParameter(AppOutputConstants.INTERFACE_ID, ids.get(AppOutputConstants.INTERFACE_ID)); generator.setParameter(AppOutputConstants.OUTPUT_KEY, ids.get(AppOutputConstants.OUTPUT_KEY)); Query q = generator.selectQuery(em); - ApplicationOutput applicationOutput = (ApplicationOutput) q.getSingleResult(); + ApplicationIntOutput applicationOutput = (ApplicationIntOutput) q.getSingleResult(); ApplicationOutputResource applicationOutputResource = (ApplicationOutputResource) AppCatalogJPAUtils.getResource(AppCatalogResourceType.APPLICATION_OUTPUT , applicationOutput); @@ -141,7 +141,7 @@ public class ApplicationOutputResource extends AppCatAbstractResource { results = q.getResultList(); if (results.size() != 0) { for (Object result : results) { - ApplicationOutput applicationOutput = (ApplicationOutput) result; + ApplicationIntOutput applicationOutput = (ApplicationIntOutput) result; ApplicationOutputResource applicationOutputResource = (ApplicationOutputResource) AppCatalogJPAUtils.getResource( AppCatalogResourceType.APPLICATION_OUTPUT, applicationOutput); @@ -154,7 +154,7 @@ public class ApplicationOutputResource extends AppCatAbstractResource { results = q.getResultList(); if (results.size() != 0) { for (Object result : results) { - ApplicationOutput applicationOutput = (ApplicationOutput) result; + ApplicationIntOutput applicationOutput = (ApplicationIntOutput) result; ApplicationOutputResource applicationOutputResource = (ApplicationOutputResource) AppCatalogJPAUtils.getResource( AppCatalogResourceType.APPLICATION_OUTPUT, applicationOutput); @@ -167,7 +167,7 @@ public class ApplicationOutputResource extends AppCatAbstractResource { results = q.getResultList(); if (results.size() != 0) { for (Object result : results) { - ApplicationOutput applicationOutput = (ApplicationOutput) result; + ApplicationIntOutput applicationOutput = (ApplicationIntOutput) result; ApplicationOutputResource applicationOutputResource = (ApplicationOutputResource) AppCatalogJPAUtils.getResource( AppCatalogResourceType.APPLICATION_OUTPUT, applicationOutput); @@ -221,7 +221,7 @@ public class ApplicationOutputResource extends AppCatAbstractResource { results = q.getResultList(); if (results.size() != 0) { for (Object result : results) { - ApplicationOutput applicationOutput = (ApplicationOutput) result; + ApplicationIntOutput applicationOutput = (ApplicationIntOutput) result; appOutputResourceIDs.add(applicationOutput.getInterfaceID()); } } @@ -232,7 +232,7 @@ public class ApplicationOutputResource extends AppCatAbstractResource { results = q.getResultList(); if (results.size() != 0) { for (Object result : results) { - ApplicationOutput applicationOutput = (ApplicationOutput) result; + ApplicationIntOutput applicationOutput = (ApplicationIntOutput) result; appOutputResourceIDs.add(applicationOutput.getInterfaceID()); } } @@ -242,7 +242,7 @@ public class ApplicationOutputResource extends AppCatAbstractResource { results = q.getResultList(); if (results.size() != 0) { for (Object result : results) { - ApplicationOutput applicationOutput = (ApplicationOutput) result; + ApplicationIntOutput applicationOutput = (ApplicationIntOutput) result; appOutputResourceIDs.add(applicationOutput.getInterfaceID()); } } @@ -272,15 +272,15 @@ public class ApplicationOutputResource extends AppCatAbstractResource { EntityManager em = null; try { em = AppCatalogJPAUtils.getEntityManager(); - ApplicationOutput existingApplicationOutput = em.find(ApplicationOutput.class, + ApplicationIntOutput existingApplicationOutput = em.find(ApplicationIntOutput.class, new AppOutput_PK(interfaceID, outputKey)); em.close(); - ApplicationOutput applicationOutput; + ApplicationIntOutput applicationOutput; em = AppCatalogJPAUtils.getEntityManager(); em.getTransaction().begin(); if (existingApplicationOutput == null) { - applicationOutput = new ApplicationOutput(); + applicationOutput = new ApplicationIntOutput(); } else { applicationOutput = existingApplicationOutput; } @@ -324,7 +324,7 @@ public class ApplicationOutputResource extends AppCatAbstractResource { EntityManager em = null; try { em = AppCatalogJPAUtils.getEntityManager(); - ApplicationOutput applicationOutput = em.find(ApplicationOutput.class, new AppOutput_PK( + ApplicationIntOutput applicationOutput = em.find(ApplicationIntOutput.class, new AppOutput_PK( ids.get(AppOutputConstants.INTERFACE_ID), ids.get(AppOutputConstants.OUTPUT_KEY))); http://git-wip-us.apache.org/repos/asf/airavata/blob/63f6a53f/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java index 7a40013..bd86bcb 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java @@ -28,10 +28,7 @@ import org.apache.airavata.registry.core.app.catalog.resources.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; -import javax.persistence.PersistenceContext; +import javax.persistence.*; import java.util.HashMap; import java.util.Map; @@ -44,8 +41,10 @@ public class AppCatalogJPAUtils { private static final String APPCATALOG_JDBC_PWD = "appcatalog.jdbc.password"; private static final String APPCATALOG_VALIDATION_QUERY = "appcatalog.validationQuery"; private static final String JPA_CACHE_SIZE = "jpa.cache.size"; - @PersistenceContext(unitName="appcatalog_data") + @PersistenceUnit(unitName="appcatalog_data") protected static EntityManagerFactory factory; + @PersistenceContext(unitName="appcatalog_data") + private static EntityManager appCatEntityManager; public static EntityManager getEntityManager() throws ApplicationSettingsException { if (factory == null) { @@ -56,7 +55,6 @@ public class AppCatalogJPAUtils { ",validationQuery=" + readServerProperties(APPCATALOG_VALIDATION_QUERY); System.out.println(connectionProperties); Map<String, String> properties = new HashMap<String, String>(); - properties.put("persistenceXmlLocation", "META-INF/persistence.xml"); properties.put("openjpa.ConnectionDriverName", "org.apache.commons.dbcp.BasicDataSource"); properties.put("openjpa.ConnectionProperties", connectionProperties); properties.put("openjpa.DynamicEnhancementAgent", "true"); @@ -65,12 +63,13 @@ public class AppCatalogJPAUtils { properties.put("openjpa.QueryCache","true(CacheSize=" + Integer.valueOf(readServerProperties(JPA_CACHE_SIZE)) + ", SoftReferenceSize=0)"); properties.put("openjpa.RemoteCommitProvider","sjvm"); properties.put("openjpa.Log","DefaultLevel=INFO, Runtime=INFO, Tool=INFO, SQL=INFO"); - properties.put("openjpa.jdbc.SynchronizeMappings", "buildSchema(ForeignKeys=true)"); +// properties.put("openjpa.jdbc.SynchronizeMappings", "buildSchema(ForeignKeys=true)"); properties.put("openjpa.jdbc.QuerySQLCache", "false"); properties.put("openjpa.ConnectionFactoryProperties", "PrettyPrint=true, PrettyPrintLineLength=72, PrintParameters=true, MaxActive=10, MaxIdle=5, MinIdle=2, MaxWait=31536000, autoReconnect=true"); factory = Persistence.createEntityManagerFactory(PERSISTENCE_UNIT_NAME, properties); } - return factory.createEntityManager(); + appCatEntityManager = factory.createEntityManager(); + return appCatEntityManager; } private static String readServerProperties (String propertyName) throws ApplicationSettingsException { @@ -259,8 +258,8 @@ public class AppCatalogJPAUtils { throw new IllegalArgumentException("Object should be a AppModuleMapping."); } case APPLICATION_OUTPUT: - if (o instanceof ApplicationOutput){ - return createApplicationOutput((ApplicationOutput) o); + if (o instanceof ApplicationIntOutput){ + return createApplicationOutput((ApplicationIntOutput) o); }else { logger.error("Object should be a ApplicationOutput.", new IllegalArgumentException()); throw new IllegalArgumentException("Object should be a ApplicationOutput."); @@ -280,8 +279,8 @@ public class AppCatalogJPAUtils { throw new IllegalArgumentException("Object should be a Compute Resource Preference."); } case APPLICATION_INPUT: - if (o instanceof ApplicationInput){ - return createApplicationInput((ApplicationInput) o); + if (o instanceof ApplicationIntInput){ + return createApplicationInput((ApplicationIntInput) o); }else { logger.error("Object should be a ApplicationInput.", new IllegalArgumentException()); throw new IllegalArgumentException("Object should be a ApplicationInput."); @@ -776,7 +775,7 @@ public class AppCatalogJPAUtils { return resource; } - private static AppCatalogResource createApplicationInput(ApplicationInput o) { + private static AppCatalogResource createApplicationInput(ApplicationIntInput o) { ApplicationInputResource resource = new ApplicationInputResource(); if (o != null){ resource.setInterfaceID(o.getInterfaceID()); @@ -818,7 +817,7 @@ public class AppCatalogJPAUtils { return resource; } - private static AppCatalogResource createApplicationOutput(ApplicationOutput o) { + private static AppCatalogResource createApplicationOutput(ApplicationIntOutput o) { ApplicationOutputResource resource = new ApplicationOutputResource(); if (o != null){ resource.setInterfaceID(o.getInterfaceID()); http://git-wip-us.apache.org/repos/asf/airavata/blob/63f6a53f/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/ExpCatResourceUtils.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/ExpCatResourceUtils.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/ExpCatResourceUtils.java index 7aa3b62..6b2aa5c 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/ExpCatResourceUtils.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/ExpCatResourceUtils.java @@ -36,18 +36,21 @@ import java.util.Map; public class ExpCatResourceUtils { private final static Logger logger = LoggerFactory.getLogger(ExpCatResourceUtils.class); private static final String PERSISTENCE_UNIT_NAME = "experiment_data"; + @PersistenceUnit(unitName="experiment_data") + protected static EntityManagerFactory expCatFactory; @PersistenceContext(unitName="experiment_data") - protected static EntityManagerFactory factory; + private static EntityManager expCatEntityManager; public static void reset(){ - factory=null; + expCatFactory=null; } public static EntityManager getEntityManager(){ - if (factory == null) { - String connectionProperties = "DriverClassName=" + Utils.getJDBCDriver() + "," + "Url=" + Utils.getJDBCURL() + "?autoReconnect=true,," + - "Username=" + Utils.getJDBCUser() + "," + "Password=" + Utils.getJDBCPassword() + ",validationQuery=" + - Utils.getValidationQuery(); + if (expCatFactory == null) { + String connectionProperties = "DriverClassName=" + Utils.getJDBCDriver() + "," + "Url=" + + Utils.getJDBCURL() + "?autoReconnect=true," + + "Username=" + Utils.getJDBCUser() + "," + "Password=" + Utils.getJDBCPassword() + + ",validationQuery=" + Utils.getValidationQuery(); System.out.println(connectionProperties); Map<String, String> properties = new HashMap<String, String>(); properties.put("openjpa.ConnectionDriverName", "org.apache.commons.dbcp.BasicDataSource"); @@ -58,17 +61,13 @@ public class ExpCatResourceUtils { properties.put("openjpa.QueryCache","" + Utils.isCachingEnabled() + "(CacheSize=" + Utils.getJPACacheSize() + ", SoftReferenceSize=0)"); properties.put("openjpa.RemoteCommitProvider","sjvm"); properties.put("openjpa.Log","DefaultLevel=INFO, Runtime=INFO, Tool=INFO, SQL=INFO"); - properties.put("openjpa.jdbc.DBDictionary","SupportsMultipleNontransactionalResultSets=false"); -// properties.put("openjpa.ReadLockLevel", "none"); -// properties.put("openjpa.WriteLockLevel", "none"); -// properties.put("openjpa.LockTimeout", "30000"); -// properties.put("openjpa.LockManager", "none"); - properties.put("openjpa.jdbc.SynchronizeMappings", "buildSchema(ForeignKeys=true)"); +// properties.put("openjpa.jdbc.SynchronizeMappings", "buildSchema(ForeignKeys=true)"); properties.put("openjpa.ConnectionFactoryProperties", "PrettyPrint=true, PrettyPrintLineLength=72, PrintParameters=true, MaxActive=10, MaxIdle=5, MinIdle=2, MaxWait=31536000, autoReconnect=true"); properties.put("openjpa.jdbc.QuerySQLCache", "false"); - factory = Persistence.createEntityManagerFactory(PERSISTENCE_UNIT_NAME, properties); + expCatFactory = Persistence.createEntityManagerFactory(PERSISTENCE_UNIT_NAME, properties); } - return factory.createEntityManager(); + expCatEntityManager = expCatFactory.createEntityManager(); + return expCatEntityManager; } /** http://git-wip-us.apache.org/repos/asf/airavata/blob/63f6a53f/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 438aab4..89ecd0e 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 @@ -46,8 +46,8 @@ <class>org.apache.airavata.registry.core.app.catalog.model.AppEnvironment</class> <class>org.apache.airavata.registry.core.app.catalog.model.ApplicationInterface</class> <class>org.apache.airavata.registry.core.app.catalog.model.AppModuleMapping</class> - <class>org.apache.airavata.registry.core.app.catalog.model.ApplicationInput</class> - <class>org.apache.airavata.registry.core.app.catalog.model.ApplicationOutput</class> + <class>org.apache.airavata.registry.core.app.catalog.model.ApplicationIntInput</class> + <class>org.apache.airavata.registry.core.app.catalog.model.ApplicationIntOutput</class> <class>org.apache.airavata.registry.core.app.catalog.model.GatewayProfile</class> <class>org.apache.airavata.registry.core.app.catalog.model.ComputeResourcePreference</class> <class>org.apache.airavata.registry.core.app.catalog.model.BatchQueue</class>
