You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by dw...@apache.org on 2010/09/29 19:12:49 UTC

svn commit: r1002745 - in /openjpa/trunk: ./ openjpa-integration/daytrader/ openjpa-integration/jmx/ openjpa-integration/slf4j/ openjpa-integration/validation/ openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/ openjpa-persistence-jdbc/ openjpa...

Author: dwoods
Date: Wed Sep 29 17:12:49 2010
New Revision: 1002745

URL: http://svn.apache.org/viewvc?rev=1002745&view=rev
Log:
OPENJPA-1764 Fix bug in DBCPDriverDataSource.mergeConnectionProperties, move common surefire-plugin systemProperties to parent pom and move the connection user/password to equivalent openjpa.Connection settings

Modified:
    openjpa/trunk/openjpa-integration/daytrader/pom.xml
    openjpa/trunk/openjpa-integration/jmx/pom.xml
    openjpa/trunk/openjpa-integration/slf4j/pom.xml
    openjpa/trunk/openjpa-integration/validation/pom.xml
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DBCPDriverDataSource.java
    openjpa/trunk/openjpa-persistence-jdbc/pom.xml
    openjpa/trunk/openjpa-persistence-locking/pom.xml
    openjpa/trunk/pom.xml

Modified: openjpa/trunk/openjpa-integration/daytrader/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/daytrader/pom.xml?rev=1002745&r1=1002744&r2=1002745&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/daytrader/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/daytrader/pom.xml Wed Sep 29 17:12:49 2010
@@ -181,7 +181,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <argLine>${test.jvm.arguments}</argLine>
                     <excludes>
                         <!-- exclude classes that end with 'Test'; these 
                              are not test cases per OpenJPA standards -->
@@ -192,40 +191,6 @@
                         <exclude>org/apache/openjpa/**/*$*.class</exclude>
                         <exclude>org/apache/openjpa/**/*.*.class</exclude>
                     </excludes>
-                    <systemProperties>
-                        <property>
-                            <name>openjpa.Log</name>
-                            <value>${openjpa.Log}</value>
-                        </property>
-                        <property>
-                            <name>openjpa.DynamicEnhancementAgent</name>
-                            <value>false</value>
-                        </property>
-                        <property>
-                            <name>openjpa.ConnectionDriverName</name>
-                            <value>${connection.driver.name}</value>
-                        </property>
-                        <property>
-                            <name>openjpa.ConnectionURL</name>
-                            <value>${connection.url}</value>
-                        </property>
-                        <property>
-                            <name>derby.stream.error.file</name>
-                            <value>target/derby.log</value>
-                        </property>
-                        <property>
-                            <name>derby.locks.deadlockTimeout</name>
-                            <value>5</value>
-                        </property>
-                        <property>
-                            <name>derby.locks.waitTimeout</name>
-                            <value>6</value>
-                        </property>
-                        <property>
-                            <name>openjpa.ConnectionProperties</name>
-                            <value>Username=${connection.username},Password=${connection.password},${dbcp.args}</value>
-                        </property>
-                    </systemProperties>
                 </configuration>
             </plugin>
         </plugins>

Modified: openjpa/trunk/openjpa-integration/jmx/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/jmx/pom.xml?rev=1002745&r1=1002744&r2=1002745&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/jmx/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/jmx/pom.xml Wed Sep 29 17:12:49 2010
@@ -121,47 +121,6 @@
           <!-- The surefire plugin is used to run the jUnit tests -->
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <argLine>${surefire.jvm.args}</argLine>
-            <systemProperties>
-               <property>
-                   <name>openjpa.Log</name>
-                   <value>${openjpa.Log}</value>
-               </property>
-               <property>
-                   <name>openjpa.DynamicEnhancementAgent</name>
-                   <value>false</value>
-               </property>
-               <property>
-                   <name>openjpa.ConnectionDriverName</name>
-                   <value>${connection.driver.name}</value>
-               </property>
-               <property>
-                   <name>openjpa.ConnectionURL</name>
-                   <value>${connection.url}</value>
-               </property>
-               <property>
-                   <name>derby.stream.error.file</name>
-                   <value>target/derby.log</value>
-               </property>
-               <property>
-                   <name>derby.locks.deadlockTimeout</name>
-                   <value>${derby.locks.deadlockTimeout}</value>
-               </property>
-               <property>
-                   <name>derby.locks.waitTimeout</name>
-                   <value>${derby.locks.waitTimeout}</value>
-               </property>
-               <property>
-                   <name>openjpa.ConnectionProperties</name>
-                   <value>Username=${connection.username},Password=${connection.password},${dbcp.args}</value>
-               </property>
-               <property>
-                   <name>tests.openjpa.allowfailure</name>
-                   <value>${tests.openjpa.allowfailure}</value>
-               </property>
-            </systemProperties>
-          </configuration>
         </plugin>
       </plugins>
   </build>

Modified: openjpa/trunk/openjpa-integration/slf4j/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/slf4j/pom.xml?rev=1002745&r1=1002744&r2=1002745&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/slf4j/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/slf4j/pom.xml Wed Sep 29 17:12:49 2010
@@ -137,7 +137,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <argLine>${test.jvm.arguments}</argLine>
                     <excludes>
                         <!-- exclude classes that end with 'Test'; these 
                              are not test cases per OpenJPA standards -->
@@ -148,44 +147,6 @@
                         <exclude>org/apache/openjpa/**/*$*.class</exclude>
                         <exclude>org/apache/openjpa/**/*.*.class</exclude>
                     </excludes>
-                    <systemProperties>
-                        <property>
-                            <name>openjpa.Log</name>
-                            <value>${openjpa.Log}</value>
-                        </property>
-                        <property>
-                            <name>openjpa.DynamicEnhancementAgent</name>
-                            <value>false</value>
-                        </property>
-                        <property>
-                            <name>openjpa.ConnectionDriverName</name>
-                            <value>${connection.driver.name}</value>
-                        </property>
-                        <property>
-                            <name>openjpa.ConnectionURL</name>
-                            <value>${connection.url}</value>
-                        </property>
-                        <property>
-                            <name>derby.stream.error.file</name>
-                            <value>target/derby.log</value>
-                        </property>
-                        <property>
-                            <name>derby.locks.deadlockTimeout</name>
-                            <value>${derby.locks.deadlockTimeout}</value>
-                        </property>
-                        <property>
-                            <name>derby.locks.waitTimeout</name>
-                            <value>${derby.locks.waitTimeout}</value>
-                        </property>
-                        <property>
-                            <name>openjpa.ConnectionProperties</name>
-                            <value>Username=${connection.username},Password=${connection.password},${dbcp.args}</value>
-                        </property>
-                        <property>
-                            <name>tests.openjpa.allowfailure</name>
-                            <value>${tests.openjpa.allowfailure}</value>
-                        </property>
-                    </systemProperties>
                 </configuration>
             </plugin>
         </plugins>

Modified: openjpa/trunk/openjpa-integration/validation/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/validation/pom.xml?rev=1002745&r1=1002744&r2=1002745&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/validation/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/validation/pom.xml Wed Sep 29 17:12:49 2010
@@ -223,7 +223,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <argLine>${test.jvm.arguments}</argLine>
                     <excludes>
                         <!-- exclude classes that end with 'Test'; these 
                              are not test cases per OpenJPA standards -->
@@ -234,44 +233,6 @@
                         <exclude>org/apache/openjpa/**/*$*.class</exclude>
                         <exclude>org/apache/openjpa/**/*.*.class</exclude>
                     </excludes>
-                    <systemProperties>
-                        <property>
-                            <name>openjpa.Log</name>
-                            <value>${openjpa.Log}</value>
-                        </property>
-                        <property>
-                            <name>openjpa.DynamicEnhancementAgent</name>
-                            <value>false</value>
-                        </property>
-                        <property>
-                            <name>openjpa.ConnectionDriverName</name>
-                            <value>${connection.driver.name}</value>
-                        </property>
-                        <property>
-                            <name>openjpa.ConnectionURL</name>
-                            <value>${connection.url}</value>
-                        </property>
-                        <property>
-                            <name>derby.stream.error.file</name>
-                            <value>target/derby.log</value>
-                        </property>
-                        <property>
-                            <name>derby.locks.deadlockTimeout</name>
-                            <value>${derby.locks.deadlockTimeout}</value>
-                        </property>
-                        <property>
-                            <name>derby.locks.waitTimeout</name>
-                            <value>${derby.locks.waitTimeout}</value>
-                        </property>
-                        <property>
-                            <name>openjpa.ConnectionProperties</name>
-                            <value>Username=${connection.username},Password=${connection.password},${dbcp.args}</value>
-                        </property>
-                        <property>
-                            <name>tests.openjpa.allowfailure</name>
-                            <value>${tests.openjpa.allowfailure}</value>
-                        </property>
-                    </systemProperties>
                 </configuration>
             </plugin>
         </plugins>

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DBCPDriverDataSource.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DBCPDriverDataSource.java?rev=1002745&r1=1002744&r2=1002745&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DBCPDriverDataSource.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DBCPDriverDataSource.java Wed Sep 29 17:12:49 2010
@@ -142,49 +142,49 @@ extends SimpleDriverDataSource implement
         // only perform the following check for the first connection attempt (_driverClassName == null),
         // as multiple connections could be requested (like from SchemaTool) and isDBCPDriver() will be true
         if (isDBCPDataSource()) {
-            String propDriver = hasProperty(dbcpProps, "DriverClassName");
+            String propDriver = hasProperty(dbcpProps, "driverClassName");
             if (propDriver == null || propDriver.trim().isEmpty()) {
                 // if user specified DBCP for the connectionDriverName, then make sure they supplied a DriverClassName
                 throw new RuntimeException(_eloc.get("connection-property-invalid", "DriverClassName",
                     propDriver).getMessage());
             }
-            propDriver = hasProperty(dbcpProps, "Url");
+            propDriver = hasProperty(dbcpProps, "url");
             if (propDriver == null || propDriver.trim().isEmpty()) {
                 // if user specified DBCP for the connectionDriverName, then make sure they supplied a Url
-                throw new RuntimeException(_eloc.get("connection-property-invalid", "Url",
+                throw new RuntimeException(_eloc.get("connection-property-invalid", "URL",
                     propDriver).getMessage());
             }
         } else {
             // set Commons DBCP expected DriverClassName to the original connection driver name
-            dbcpProps.setProperty(hasKey(dbcpProps, "DriverClassName", "DriverClassName"), getConnectionDriverName());
+            dbcpProps.setProperty(hasKey(dbcpProps, "driverClassName", "driverClassName"), getConnectionDriverName());
             // set Commons DBCP expected URL property
-            dbcpProps.setProperty(hasKey(dbcpProps, "Url", "Url"), getConnectionURL());
+            dbcpProps.setProperty(hasKey(dbcpProps, "url", "url"), getConnectionURL());
         }
         
         // Commons DBCP requires non-Null username/password values in the connection properties
-        if (hasKey(dbcpProps, "Username") == null) {
+        if (hasKey(dbcpProps, "username") == null) {
             if (getConnectionUserName() != null)
-                dbcpProps.setProperty("Username", getConnectionUserName());
+                dbcpProps.setProperty("username", getConnectionUserName());
             else
-                dbcpProps.setProperty("Username", "");
+                dbcpProps.setProperty("username", "");
         }
         // Commons DBCP requires non-Null username/password values in the connection properties
-        if (hasKey(dbcpProps, "Password") == null) {
+        if (hasKey(dbcpProps, "password") == null) {
             if (getConnectionPassword() != null)
-                dbcpProps.setProperty("Password", getConnectionPassword());
+                dbcpProps.setProperty("password", getConnectionPassword());
             else
-                dbcpProps.setProperty("Password", "");
+                dbcpProps.setProperty("password", "");
         }
 
         // set some default properties for DBCP
-        if (hasKey(dbcpProps, "MaxIdle") == null) {
-            dbcpProps.setProperty("MaxIdle", "1");
+        if (hasKey(dbcpProps, "maxIdle") == null) {
+            dbcpProps.setProperty("maxIdle", "1");
         }
-        if (hasKey(dbcpProps, "MinIdle") == null) {
-            dbcpProps.setProperty("MinIdle", "0");
+        if (hasKey(dbcpProps, "minIdle") == null) {
+            dbcpProps.setProperty("minIdle", "0");
         }
-        if (hasKey(dbcpProps, "MaxActive") == null) {
-            dbcpProps.setProperty("MaxActive", "10");
+        if (hasKey(dbcpProps, "maxActive") == null) {
+            dbcpProps.setProperty("maxActive", "10");
         }
         
         return dbcpProps;
@@ -202,28 +202,26 @@ extends SimpleDriverDataSource implement
         // need to map "user" to "username" for Commons DBCP
         String uid = removeProperty(mergedProps, "user");
         if (uid != null) {
-            mergedProps.setProperty("Username", uid);
+            mergedProps.setProperty("username", uid);
         }
         
         // now, merge in any passed in properties
         if (props != null && !props.isEmpty()) {
             for (Iterator<Object> itr = props.keySet().iterator(); itr.hasNext();) {
                 String key = (String)itr.next();
-                String value = mergedProps.getProperty(key);
-                if (value != null) {
-                    // need to map "user" to "username" for Commons DBCP
-                    if ("user".equalsIgnoreCase(key)) {
-                        key = "Username";
-                    }
-                    // case-insensitive search for existing key
-                    String existingKey = hasKey(mergedProps, key);
-                    if (existingKey != null) {
-                        // update existing entry
-                        mergedProps.setProperty(existingKey, value);                        
-                    } else {
-                        // add property to the merged set
-                        mergedProps.setProperty(key, value);
-                    }
+                String value = props.getProperty(key);
+                // need to map "user" to "username" for Commons DBCP
+                if ("user".equalsIgnoreCase(key)) {
+                    key = "username";
+                }
+                // case-insensitive search for existing key
+                String existingKey = hasKey(mergedProps, key);
+                if (existingKey != null) {
+                    // update existing entry
+                    mergedProps.setProperty(existingKey, value);                        
+                } else {
+                    // add property to the merged set
+                    mergedProps.setProperty(key, value);
                 }
             }
         }

Modified: openjpa/trunk/openjpa-persistence-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/pom.xml?rev=1002745&r1=1002744&r2=1002745&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/pom.xml (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/pom.xml Wed Sep 29 17:12:49 2010
@@ -46,6 +46,7 @@
             </activation>
             <properties>
                 <build.enhance>false</build.enhance>
+                <openjpa.dynamicEnhance>true</openjpa.dynamicEnhance>
                 <surefire.jvm.args>-Dopenjpa.RuntimeUnenhancedClasses=unsupported ${test.jvm.arguments}</surefire.jvm.args>
             </properties>
             <build>
@@ -54,36 +55,9 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <argLine>${surefire.jvm.args}</argLine>
                     <includes>
                         <include>org/apache/openjpa/persistence/enhance/DynamicEnhancementSuite.java</include>
-                     </includes>
-                    <systemProperties>
-                        <property>
-                            <name>openjpa.Log</name>
-                            <value>${openjpa.Log}</value>
-                        </property>
-                        <property>
-                            <name>openjpa.ConnectionDriverName</name>
-                            <value>${connection.driver.name}</value>
-                        </property>
-                        <property>
-                            <name>openjpa.ConnectionURL</name>
-                            <value>${connection.url}</value>
-                        </property>
-                        <property>
-                            <name>derby.stream.error.file</name>
-                            <value>target/derby.log</value>
-                        </property>
-                        <property>
-                            <name>openjpa.ConnectionProperties</name>
-                            <value>Username=${connection.username},Password=${connection.password},${dbcp.args}</value>
-                        </property>
-                        <property>
-                            <name>tests.openjpa.allowfailure</name>
-                            <value>${tests.openjpa.allowfailure}</value>
-                        </property>
-                    </systemProperties>
+                    </includes>
                 </configuration>
             </plugin>
           </plugins>
@@ -830,7 +804,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <argLine>${surefire.jvm.args}</argLine>
                     <excludes>
                         <!-- exclude classes that end with 'Test'; these 
                              are not test cases per OpenJPA standards -->
@@ -1012,52 +985,6 @@
                         <!-- TestEJBTransactionalClass tests nothing -->
                         <exclude>org/apache/openjpa/persistence/kernel/TestEJBTransactionalClass.java</exclude>
                     </excludes>
-                    <systemProperties>
-                        <property>
-                            <name>openjpa.Log</name>
-                            <value>${openjpa.Log}</value>
-                        </property>
-                        <property>
-                            <name>openjpa.DynamicEnhancementAgent</name>
-                            <value>false</value>
-                        </property>
-                        <property>
-                            <name>openjpa.ConnectionDriverName</name>
-                            <value>${connection.driver.name}</value>
-                        </property>
-                        <property>
-                            <name>openjpa.ConnectionURL</name>
-                            <value>${connection.url}</value>
-                        </property>
-                        <property>
-                            <name>derby.stream.error.file</name>
-                            <value>target/derby.log</value>
-                        </property>
-                        <property>
-                            <name>derby.locks.deadlockTimeout</name>
-                            <value>${derby.locks.deadlockTimeout}</value>
-                        </property>
-                        <property>
-                            <name>derby.locks.waitTimeout</name>
-                            <value>${derby.locks.waitTimeout}</value>
-                        </property>
-                        <property>
-                            <name>derby.storage.pageCacheSize</name>
-                            <value>10000</value>
-                        </property>
-                        <property>
-                            <name>derby.storage.initialPages</name>
-                            <value>10</value>
-                        </property>
-                        <property>
-                            <name>openjpa.ConnectionProperties</name>
-                            <value>Username=${connection.username},Password=${connection.password},${dbcp.args}</value>
-                        </property>
-                        <property>
-                            <name>tests.openjpa.allowfailure</name>
-                            <value>${tests.openjpa.allowfailure}</value>
-                        </property>
-                    </systemProperties>
                 </configuration>
             </plugin>
         </plugins>

Modified: openjpa/trunk/openjpa-persistence-locking/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-locking/pom.xml?rev=1002745&r1=1002744&r2=1002745&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-locking/pom.xml (original)
+++ openjpa/trunk/openjpa-persistence-locking/pom.xml Wed Sep 29 17:12:49 2010
@@ -53,6 +53,7 @@
             </activation>
             <properties>
                 <build.enhance>false</build.enhance>
+                <openjpa.dynamicEnhance>true</openjpa.dynamicEnhance>
                 <surefire.jvm.args>-Dopenjpa.RuntimeUnenhancedClasses=unsupported ${test.jvm.arguments}</surefire.jvm.args>
             </properties>
             <build>
@@ -61,39 +62,12 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
-                            <argLine>${surefire.jvm.args}</argLine>
                             <includes>
                                 <include>org/apache/openjpa/persistence/enhance/DynamicEnhancementSuite.java</include>
                             </includes>
                             <excludes>
                                 <exclude>${surefire.excludes.locking}</exclude>
                             </excludes>
-                            <systemProperties>
-                                <property>
-                                    <name>openjpa.Log</name>
-                                    <value>${openjpa.Log}</value>
-                                </property>
-                                <property>
-                                    <name>openjpa.ConnectionDriverName</name>
-                                    <value>${connection.driver.name}</value>
-                                </property>
-                                <property>
-                                    <name>openjpa.ConnectionURL</name>
-                                    <value>${connection.url}</value>
-                                </property>
-                                <property>
-                                    <name>derby.stream.error.file</name>
-                                    <value>target/derby.log</value>
-                                </property>
-                                <property>
-                                    <name>openjpa.ConnectionProperties</name>
-                                    <value>Username=${connection.username},Password=${connection.password},${dbcp.args}</value>
-                                </property>
-                                <property>
-                                    <name>tests.openjpa.allowfailure</name>
-                                    <value>${tests.openjpa.allowfailure}</value>
-                                </property>
-                            </systemProperties>
                         </configuration>
                     </plugin>
                 </plugins>
@@ -784,7 +758,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <argLine>${surefire.jvm.args}</argLine>
                     <excludes>
                         <!--
                             exclude classes that end with 'Test'; these are not test cases per OpenJPA standards
@@ -792,44 +765,6 @@
                         <exclude>org/apache/openjpa/**/*Test.java</exclude>
                         <exclude>${surefire.excludes.locking}</exclude>
                     </excludes>
-                    <systemProperties>
-                        <property>
-                            <name>openjpa.Log</name>
-                            <value>${openjpa.Log}</value>
-                        </property>
-                        <property>
-                            <name>openjpa.DynamicEnhancementAgent</name>
-                            <value>false</value>
-                        </property>
-                        <property>
-                            <name>openjpa.ConnectionDriverName</name>
-                            <value>${connection.driver.name}</value>
-                        </property>
-                        <property>
-                            <name>openjpa.ConnectionURL</name>
-                            <value>${connection.url}</value>
-                        </property>
-                        <property>
-                            <name>derby.stream.error.file</name>
-                            <value>target/derby.log</value>
-                        </property>
-                        <property>
-                            <name>derby.locks.deadlockTimeout</name>
-                            <value>${derby.locks.deadlockTimeout}</value>
-                        </property>
-                        <property>
-                            <name>derby.locks.waitTimeout</name>
-                            <value>${derby.locks.waitTimeout}</value>
-                        </property>
-                        <property>
-                            <name>openjpa.ConnectionProperties</name>
-                            <value>Username=${connection.username},Password=${connection.password},${dbcp.args}</value>
-                        </property>
-                        <property>
-                            <name>tests.openjpa.allowfailure</name>
-                            <value>${tests.openjpa.allowfailure}</value>
-                        </property>
-                    </systemProperties>
                 </configuration>
             </plugin>
         </plugins>

Modified: openjpa/trunk/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/pom.xml?rev=1002745&r1=1002744&r2=1002745&view=diff
==============================================================================
--- openjpa/trunk/pom.xml (original)
+++ openjpa/trunk/pom.xml Wed Sep 29 17:12:49 2010
@@ -53,6 +53,9 @@
         <test.jvm.maxheapsize>1024m</test.jvm.maxheapsize>
         <test.jvm.arguments>-Xmx${test.jvm.maxheapsize} -XX:MaxPermSize=${test.jvm.maxpermsize}</test.jvm.arguments>
         <surefire.jvm.args>${test.jvm.arguments}</surefire.jvm.args>
+        <!-- Setting for openjpa.DynamicEnhancementAgent usage -->
+        <openjpa.dynamicEnhance>false</openjpa.dynamicEnhance>
+        <!-- Commons DBCP settings passed in as openjpa.ConnectionProperties -->
         <dbcp.maxActive>10</dbcp.maxActive>
         <dbcp.maxIdle>5</dbcp.maxIdle>
         <dbcp.minIdle>2</dbcp.minIdle>
@@ -685,6 +688,60 @@
                         <useFile>false</useFile>
                         <trimStackTrace>false</trimStackTrace>
                         <useSystemClassLoader>true</useSystemClassLoader>
+                    <systemProperties>
+                        <property>
+                            <name>openjpa.Log</name>
+                            <value>${openjpa.Log}</value>
+                        </property>
+                        <property>
+                            <name>openjpa.DynamicEnhancementAgent</name>
+                            <value>${openjpa.dynamicEnhance}</value>
+                        </property>
+                        <property>
+                            <name>openjpa.ConnectionDriverName</name>
+                            <value>${connection.driver.name}</value>
+                        </property>
+                        <property>
+                            <name>openjpa.ConnectionURL</name>
+                            <value>${connection.url}</value>
+                        </property>
+                        <property>
+                            <name>openjpa.ConnectionUserName</name>
+                            <value>${connection.username}</value>
+                        </property>
+                        <property>
+                            <name>openjpa.ConnectionPassword</name>
+                            <value>${connection.password}</value>
+                        </property>
+                        <property>
+                            <name>derby.stream.error.file</name>
+                            <value>target/derby.log</value>
+                        </property>
+                        <property>
+                            <name>derby.locks.deadlockTimeout</name>
+                            <value>${derby.locks.deadlockTimeout}</value>
+                        </property>
+                        <property>
+                            <name>derby.locks.waitTimeout</name>
+                            <value>${derby.locks.waitTimeout}</value>
+                        </property>
+                        <property>
+                            <name>derby.storage.pageCacheSize</name>
+                            <value>10000</value>
+                        </property>
+                        <property>
+                            <name>derby.storage.initialPages</name>
+                            <value>10</value>
+                        </property>
+                        <property>
+                            <name>openjpa.ConnectionProperties</name>
+                            <value>${dbcp.args}</value>
+                        </property>
+                        <property>
+                            <name>tests.openjpa.allowfailure</name>
+                            <value>${tests.openjpa.allowfailure}</value>
+                        </property>
+                    </systemProperties>
                     </configuration>
                 </plugin>
                 <plugin>