svn commit: r750117 - /openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java

[jrbauer]

Author: jrbauer
Date: Wed Mar  4 19:24:00 2009
New Revision: 750117

URL: http://svn.apache.org/viewvc?rev=750117&view=rev
Log:
OPENJPA-927 Committing code contributed by Dianne Richards

Modified:
    
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java

Modified: 
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java?rev=750117&r1=750116&r2=750117&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java
 (original)
+++ 
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java
 Wed Mar  4 19:24:00 2009
@@ -340,6 +340,7 @@
         
         connectionPassword = addString("ConnectionPassword");
         connectionPassword.addEquivalentKey("javax.persistence.jdbc.password");
+        connectionPassword.setVisible(false);
 
         connectionURL = addString("ConnectionURL");
         connectionURL.addEquivalentKey("javax.persistence.jdbc.url");
@@ -352,6 +353,7 @@
         connectionFactoryProperties = addString("ConnectionFactoryProperties");
         connection2UserName = addString("Connection2UserName");
         connection2Password = addString("Connection2Password");
+        connection2Password.setVisible(false);
         connection2URL = addString("Connection2URL");
         connection2DriverName = addString("Connection2DriverName");
         connection2Properties = addString("Connection2Properties");
@@ -446,7 +448,6 @@
         lockTimeout = addInt("LockTimeout");
         lockTimeout.addEquivalentKey("javax.persistence.lock.timeout");
         lockTimeout.setDefault("-1");
-        lockTimeout.set(-1);
         lockTimeout.setDynamic(true);
         
         readLockLevel = addInt("ReadLockLevel");
@@ -549,9 +550,8 @@
         specification.setInstantiatingGetter("getSpecificationInstance");
         
         queryTimeout = addInt("javax.persistence.query.timeout");
-        queryTimeout.setLoadKey("javax.persistence.query.timeout");
+        queryTimeout.addEquivalentKey("javax.persistence.query.timeout");
         queryTimeout.setDefault("-1");
-        queryTimeout.set(-1);
         queryTimeout.setDynamic(true);
         
         // initialize supported options that some runtimes may not support