You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2014/06/03 19:51:47 UTC
git commit: removing unnecessary properties from OpenJPA configuration
Repository: airavata
Updated Branches:
refs/heads/master 8b5f2724e -> ace68a6e7
removing unnecessary properties from OpenJPA configuration
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ace68a6e
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ace68a6e
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ace68a6e
Branch: refs/heads/master
Commit: ace68a6e72d672390fa8fda08a113ba576420ac9
Parents: 8b5f272
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Tue Jun 3 13:51:41 2014 -0400
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Tue Jun 3 13:51:41 2014 -0400
----------------------------------------------------------------------
.../server/src/main/resources/airavata-server.properties | 2 +-
.../airavata/persistance/registry/jpa/ResourceUtils.java | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/ace68a6e/modules/configuration/server/src/main/resources/airavata-server.properties
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/airavata-server.properties b/modules/configuration/server/src/main/resources/airavata-server.properties
index a617a21..d1335f7 100644
--- a/modules/configuration/server/src/main/resources/airavata-server.properties
+++ b/modules/configuration/server/src/main/resources/airavata-server.properties
@@ -63,7 +63,7 @@ registry.jdbc.user=airavata
registry.jdbc.password=airavata
start.derby.server.mode=true
validationQuery=SELECT 1 from CONFIGURATION
-jpa.connection.properties=MaxActive=10,MaxIdle=5,MinIdle=2,MaxWait=60000,testWhileIdle=true,testOnBorrow=true
+#jpa.connection.properties=MaxActive=10,MaxIdle=5,MinIdle=2,MaxWait=60000,testWhileIdle=true,testOnBorrow=true
# Properties to setup registry service
default.registry.user=admin
default.registry.password=admin
http://git-wip-us.apache.org/repos/asf/airavata/blob/ace68a6e/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/ResourceUtils.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/ResourceUtils.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/ResourceUtils.java
index 7d81c7b..141cb3e 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/ResourceUtils.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/ResourceUtils.java
@@ -63,12 +63,12 @@ public class ResourceUtils {
properties.put("openjpa.QueryCache","true(CacheSize=5000, SoftReferenceSize=0)");
properties.put("openjpa.RemoteCommitProvider","sjvm");
properties.put("openjpa.Log","DefaultLevel=INFO, Runtime=INFO, Tool=INFO, SQL=INFO");
- properties.put("openjpa.ReadLockLevel", "none");
- properties.put("openjpa.WriteLockLevel", "none");
- properties.put("openjpa.LockTimeout", "30000");
- properties.put("openjpa.LockManager", "none");
+// 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.ConnectionFactoryProperties", "PrettyPrint=true, PrettyPrintLineLength=72, PrintParameters=true, MaxActive=10, MaxIdle=5, MinIdle=2, MaxWait=60000");
+// properties.put("openjpa.ConnectionFactoryProperties", "PrettyPrint=true, PrettyPrintLineLength=72, PrintParameters=true, MaxActive=10, MaxIdle=5, MinIdle=2, MaxWait=60000");
properties.put("openjpa.jdbc.QuerySQLCache", "false");
factory = Persistence.createEntityManagerFactory(PERSISTENCE_UNIT_NAME, properties);
}