Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OPENJPA-927 Committing code contributed by Dianne Richards 

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@750117 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jeremy Bauer 2009-03-04 19:24:00 +00:00
parent 3e8f626668
commit deda5b3a40
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java
View File

@ -340,6 +340,7 @@ public class OpenJPAConfigurationImpl
connectionPassword = addString("ConnectionPassword"); connectionPassword = addString("ConnectionPassword");
connectionPassword.addEquivalentKey("javax.persistence.jdbc.password"); connectionPassword.addEquivalentKey("javax.persistence.jdbc.password");
connectionPassword.setVisible(false);
connectionURL = addString("ConnectionURL"); connectionURL = addString("ConnectionURL");
connectionURL.addEquivalentKey("javax.persistence.jdbc.url"); connectionURL.addEquivalentKey("javax.persistence.jdbc.url");
@ -352,6 +353,7 @@ public class OpenJPAConfigurationImpl
connectionFactoryProperties = addString("ConnectionFactoryProperties"); connectionFactoryProperties = addString("ConnectionFactoryProperties");
connection2UserName = addString("Connection2UserName"); connection2UserName = addString("Connection2UserName");
connection2Password = addString("Connection2Password"); connection2Password = addString("Connection2Password");
connection2Password.setVisible(false);
connection2URL = addString("Connection2URL"); connection2URL = addString("Connection2URL");
connection2DriverName = addString("Connection2DriverName"); connection2DriverName = addString("Connection2DriverName");
connection2Properties = addString("Connection2Properties"); connection2Properties = addString("Connection2Properties");
@ -446,7 +448,6 @@ public class OpenJPAConfigurationImpl
lockTimeout = addInt("LockTimeout"); lockTimeout = addInt("LockTimeout");
lockTimeout.addEquivalentKey("javax.persistence.lock.timeout"); lockTimeout.addEquivalentKey("javax.persistence.lock.timeout");
lockTimeout.setDefault("-1"); lockTimeout.setDefault("-1");
lockTimeout.set(-1);
lockTimeout.setDynamic(true); lockTimeout.setDynamic(true);
readLockLevel = addInt("ReadLockLevel"); readLockLevel = addInt("ReadLockLevel");
@ -549,9 +550,8 @@ public class OpenJPAConfigurationImpl
specification.setInstantiatingGetter("getSpecificationInstance"); specification.setInstantiatingGetter("getSpecificationInstance");
queryTimeout = addInt("javax.persistence.query.timeout"); queryTimeout = addInt("javax.persistence.query.timeout");
queryTimeout.setLoadKey("javax.persistence.query.timeout"); queryTimeout.addEquivalentKey("javax.persistence.query.timeout");
queryTimeout.setDefault("-1"); queryTimeout.setDefault("-1");
queryTimeout.set(-1);
queryTimeout.setDynamic(true); queryTimeout.setDynamic(true);
// initialize supported options that some runtimes may not support // initialize supported options that some runtimes may not support