From 7065743f1766b69e3b56b23315f930dcf6930789 Mon Sep 17 00:00:00 2001
From: Donald Woods <dwoods@apache.org>
Date: Wed, 19 Aug 2009 15:36:02 +0000
Subject: [PATCH] OPENJPA-1252  Include a Derby Network Server test profile,
 allow Derby version to be changed on the cmdline, and cleanup some
 formatting/comments.

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@805841 13f79535-47bb-0310-9956-ffa450edef68
---
 openjpa-integration/tck/pom.xml     |   2 +-
 openjpa-persistence-jdbc/pom.xml    | 108 +++++++++++--
 openjpa-persistence-locking/pom.xml | 238 ++++++++++++++++++++++------
 pom.xml                             |   3 +-
 4 files changed, 287 insertions(+), 64 deletions(-)

diff --git a/openjpa-integration/tck/pom.xml b/openjpa-integration/tck/pom.xml
index 8dae0bf54..77e22c6ea 100644
--- a/openjpa-integration/tck/pom.xml
+++ b/openjpa-integration/tck/pom.xml
@@ -293,7 +293,7 @@ databaseName=${db.name}
         <dependency>
             <groupId>org.apache.derby</groupId>
             <artifactId>derby</artifactId>
-            <version>10.2.1.6</version>
+            <version>${derby.version}</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/openjpa-persistence-jdbc/pom.xml b/openjpa-persistence-jdbc/pom.xml
index b35e653df..32bb31b4b 100644
--- a/openjpa-persistence-jdbc/pom.xml
+++ b/openjpa-persistence-jdbc/pom.xml
@@ -63,7 +63,9 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <argLine>${surefire.jvm.args}</argLine>
-                    <includes><include>org/apache/openjpa/persistence/enhance/DynamicEnhancementSuite.java</include></includes>
+                    <includes>
+                        <include>org/apache/openjpa/persistence/enhance/DynamicEnhancementSuite.java</include>
+                     </includes>
                     <systemProperties>
                         <property>
                             <name>openjpa.Log</name>
@@ -91,17 +93,25 @@
         </plugins>
         </build>
         </profile>
-        <!-- Profile for testing with Apache Derby -->
+
+        <!-- Default profile for testing with embedded Apache Derby -->
         <profile>
+            <!--
+                Optionally, you can override the following properties:
+                    -Dderby.version=10.2.2.0
+            -->
             <id>test-derby</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
-                <property><name>test-derby</name></property>
+                <property>
+                    <name>test-derby</name>
+                </property>
             </activation>
             <dependencies>
                 <dependency>
                     <groupId>org.apache.derby</groupId>
                     <artifactId>derby</artifactId>
+                    <version>${derby.version}</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
@@ -113,10 +123,54 @@
             </properties>
         </profile>
 
+        <!-- Profile for testing with Apache Derby network server -->
+        <profile>
+            <!--
+                Example Derby Network Server profile.
+                You must manually start a Derby network server instance and
+                also set the following properties:
+                    -Dopenjpa.derbynet.url=jdbc:derby://<HOST>:<PORT>/<DBNAME>;\
+                    	create=true
+
+                Optionally, you can override the following properties:
+                    -Dopenjpa.derbynet.driver=org.apache.derby.jdbc.ClientXADataSource
+                    -Dopenjpa.derbynet.username=
+                    -Dopenjpa.derbynet.password=
+                    -Dderby.version=10.2.2.0
+            -->
+            <id>test-derbynet</id>
+            <activation>
+                <property><name>test-derbynet</name></property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.derby</groupId>
+                    <artifactId>derbyclient</artifactId>
+                    <version>${derby.version}</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            <properties>
+                <openjpa.derbynet.url>jdbc:derby://localhost:1527/openjpa20;create=true;traceDirectory=target;traceFile=derby.log</openjpa.derbynet.url>
+                <openjpa.derbynet.driver>org.apache.derby.jdbc.ClientDriver</openjpa.derbynet.driver>
+                <!-- Note: commons-dbcp requires dummy values for uid/pwd -->
+                <openjpa.derbynet.username>uid</openjpa.derbynet.username>
+                <openjpa.derbynet.password>pwd</openjpa.derbynet.password>
+                <connection.driver.name>${openjpa.derbynet.driver}</connection.driver.name>
+                <connection.url>${openjpa.derbynet.url}</connection.url>
+                <connection.username>${openjpa.derbynet.username}</connection.username>
+                <connection.password>${openjpa.derbynet.password}</connection.password>
+            </properties>
+        </profile>
+
         <!-- Profile for testing with HSQL DB -->
         <profile>
             <id>test-hsqldb</id>
-            <activation><property><name>test-hsqldb</name></property></activation>
+            <activation>
+                <property>
+                    <name>test-hsqldb</name>
+                </property>
+            </activation>
             <dependencies>
                 <dependency>
                     <groupId>hsqldb</groupId>
@@ -137,7 +191,11 @@
         <!-- Profile for testing with MySQL DB -->
         <profile>
             <id>test-mysql</id>
-            <activation><property><name>test-mysql</name></property></activation>
+            <activation>
+                <property>
+                    <name>test-mysql</name>
+                </property>
+            </activation>
             <dependencies>
                 <dependency>
                     <groupId>mysql</groupId>
@@ -158,7 +216,11 @@
         <!-- Profile for testing with PostgreSQL DB -->
         <profile>
             <id>test-postgresql</id>
-            <activation><property><name>test-postgresql</name></property></activation>
+            <activation>
+                <property>
+                    <name>test-postgresql</name>
+                </property>
+            </activation>
             <dependencies>
                 <dependency>
                     <groupId>postgresql</groupId>
@@ -248,11 +310,12 @@
                 <dependency>
                     <groupId>net.sourceforge.jtds</groupId>
                     <artifactId>jtds</artifactId>
-                    <version>1.2</version>
+                    <version>${jtds.version}</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
             <properties>
+                <jtds.version>1.2</jtds.version>
                 <connection.driver.name>net.sourceforge.jtds.jdbc.Driver</connection.driver.name>
                 <connection.url>${openjpa.sqlserver.url}</connection.url>
                 <connection.username>${openjpa.sqlserver.username}</connection.username>
@@ -263,16 +326,21 @@
         <!-- Profile for testing with Sybase DB using the jTDS driver -->
         <profile>
             <id>test-sybase</id>
-            <activation><property><name>test-sybase</name></property></activation>
+            <activation>
+                <property>
+                    <name>test-sybase</name>
+                </property>
+            </activation>
             <dependencies>
                 <dependency>
                     <groupId>net.sourceforge.jtds</groupId>
                     <artifactId>jtds</artifactId>
-                    <version>1.2</version>
+                    <version>${jtds.version}</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
             <properties>
+                <jtds.version>1.2</jtds.version>
                 <connection.driver.name>net.sourceforge.jtds.jdbc.Driver</connection.driver.name>
                 <connection.url>${openjpa.sybase.url}</connection.url>
                 <connection.username>${openjpa.sybase.username}</connection.username>
@@ -280,6 +348,7 @@
             </properties>
         </profile>
         
+        <!-- Profile for testing with Ingres DB -->
         <profile>
             <id>test-ingres</id>
             <activation><property><name>test-ingres</name></property></activation>
@@ -287,11 +356,12 @@
                 <dependency>
                     <groupId>com.ingres.jdbc</groupId>
                     <artifactId>iijdbc</artifactId>
-                    <version>9.2-3.4.8</version>
+                    <version>${ingres.version}</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
             <properties>
+                <ingres.version>9.2-3.4.8</ingres.version>
                 <connection.driver.name>com.ingres.jdbc.IngresDriver</connection.driver.name>
                 <connection.url>${openjpa.ingres.url}</connection.url>
                 <connection.username>${openjpa.ingres.username}</connection.username>
@@ -311,7 +381,11 @@
         -->
         <profile>
             <id>test-custom</id>
-            <activation><property><name>test-custom</name></property></activation>
+            <activation>
+                <property>
+                    <name>test-custom</name>
+                </property>
+            </activation>
             <dependencies>
                 <dependency>
                     <groupId>openjpa.customdriver</groupId>
@@ -347,7 +421,11 @@
         -->
         <profile>
             <id>test-custom2</id>
-            <activation><property><name>test-custom2</name></property></activation>
+            <activation>
+                <property>
+                    <name>test-custom2</name>
+                </property>
+            </activation>
             <dependencies>
                 <dependency>
                     <groupId>openjpa.customdriver1</groupId>
@@ -452,6 +530,8 @@
                 </repository>
             </repositories>
         </profile>          
+
+        <!-- Profile for testing Informix with the DB2 JCC driver -->
         <profile>
             <!-- 
                 Example Informix JCC profile. You can use this profile if you:
@@ -517,7 +597,9 @@
                     </releases>
                 </repository>
             </repositories>
-        </profile>          
+        </profile>
+
+        <!-- Profile for testing with Oracle DB -->
         <profile>
             <!-- 
                 Example oracle profile. You can use this profile if you:
diff --git a/openjpa-persistence-locking/pom.xml b/openjpa-persistence-locking/pom.xml
index 7e72880f3..8cb46783a 100644
--- a/openjpa-persistence-locking/pom.xml
+++ b/openjpa-persistence-locking/pom.xml
@@ -95,8 +95,13 @@
                 </plugins>
             </build>
         </profile>
-        <!-- Profile for testing with Apache Derby -->
+
+        <!-- Default profile for testing with embedded Apache Derby -->
         <profile>
+            <!--
+                Optionally, you can override the following properties:
+                    -Dderby.version=10.2.2.0
+            -->
             <id>test-derby</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
@@ -108,6 +113,7 @@
                 <dependency>
                     <groupId>org.apache.derby</groupId>
                     <artifactId>derby</artifactId>
+                    <version>${derby.version}</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
@@ -119,6 +125,46 @@
             </properties>
         </profile>
 
+        <!-- Profile for testing with Apache Derby network server -->
+        <profile>
+            <!--
+                Example Derby Network Server profile.
+                You must manually start a Derby network server instance and
+                also set the following properties:
+                    -Dopenjpa.derbynet.url=jdbc:derby://<HOST>:<PORT>/<DBNAME>;\
+                    	create=true
+
+                Optionally, you can override the following properties:
+                    -Dopenjpa.derbynet.driver=org.apache.derby.jdbc.ClientXADataSource
+                    -Dopenjpa.derbynet.username=
+                    -Dopenjpa.derbynet.password=
+                    -Dderby.version=10.2.2.0
+            -->
+            <id>test-derbynet</id>
+            <activation>
+                <property><name>test-derbynet</name></property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.derby</groupId>
+                    <artifactId>derbyclient</artifactId>
+                    <version>${derby.version}</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            <properties>
+                <openjpa.derbynet.url>jdbc:derby://localhost:1527/openjpa20;create=true;traceDirectory=target;traceFile=derby.log</openjpa.derbynet.url>
+                <openjpa.derbynet.driver>org.apache.derby.jdbc.ClientDriver</openjpa.derbynet.driver>
+                <!-- Note: commons-dbcp requires dummy values for uid/pwd -->
+                <openjpa.derbynet.username>uid</openjpa.derbynet.username>
+                <openjpa.derbynet.password>pwd</openjpa.derbynet.password>
+                <connection.driver.name>${openjpa.derbynet.driver}</connection.driver.name>
+                <connection.url>${openjpa.derbynet.url}</connection.url>
+                <connection.username>${openjpa.derbynet.username}</connection.username>
+                <connection.password>${openjpa.derbynet.password}</connection.password>
+            </properties>
+        </profile>
+
         <!-- Profile for testing with HSQL DB -->
         <profile>
             <id>test-hsqldb</id>
@@ -197,16 +243,31 @@
         <!-- Profile for testing with SQLServer DB using MS JDBC driver -->
         <profile>
             <!--
-                Example MS SQL profile. You can use this profile if you: 1) have the MS SQL artifacts installed in a
-                local repo and supply the URL: -Dmssql.maven.repo=http://my.local.repo 2) have a copy of the MS SQL JDBC
-                driver from: http://msdn.microsoft.com/en-us/data/aa937724.aspx and run the following commands : mvn
-                install:install-file -Dfile=${path to sqljdbc.jar} \ -DgroupId=com.microsoft.sqlserver \
-                -DartifactId=sqljdbc \ -Dversion=2.0 \ -Dpackaging=jar You must also set the following properties:
-                -Dopenjpa.mssql.url=jdbc:sqlserver://<HOST>:<PORT>;\ DataBaseName=<DBNAME>
-                -Dopenjpa.mssql.username=<mssql_uid> -Dopenjpa.mssql.password=<mssql_pwd> Optionally, you can override
-                the default groupId and version by also supplying the following properties:
-                -Dmssql.groupid=com.microsoft.sqlserver -Dmssql.version=2.0 If you are using Java SE 6 or later, you
-                will need to use: -Dmssql.artifactid=sqljdbc4
+                Example MS SQL profile. You can use this profile if you:
+                1) have the MS SQL artifacts installed in a local repo and
+                supply the URL:
+                    -Dmssql.maven.repo=http://my.local.repo
+                2) have a copy of the MS SQL JDBC driver from:
+                    http://msdn.microsoft.com/en-us/data/aa937724.aspx
+                and run the following commands :
+                    mvn install:install-file -Dfile=${path to sqljdbc.jar} \
+                                             -DgroupId=com.microsoft.sqlserver \
+                                             -DartifactId=sqljdbc \
+                                             -Dversion=2.0 \
+                                             -Dpackaging=jar
+
+                You must also set the following properties:
+                    -Dopenjpa.mssql.url=jdbc:sqlserver://<HOST>:<PORT>;\
+                    	DataBaseName=<DBNAME>
+                    -Dopenjpa.mssql.username=<mssql_uid>
+                    -Dopenjpa.mssql.password=<mssql_pwd>
+
+                Optionally, you can override the default groupId and version
+                by also supplying the following properties:
+                    -Dmssql.groupid=com.microsoft.sqlserver
+                    -Dmssql.version=2.0
+                If you are using Java SE 6 or later, you will need to use:
+                    -Dmssql.artifactid=sqljdbc4
             -->
             <id>test-mssql</id>
             <dependencies>
@@ -251,11 +312,12 @@
                 <dependency>
                     <groupId>net.sourceforge.jtds</groupId>
                     <artifactId>jtds</artifactId>
-                    <version>1.2</version>
+                    <version>${jtds.version}</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
             <properties>
+                <jtds.version>1.2</jtds.version>
                 <connection.driver.name>net.sourceforge.jtds.jdbc.Driver</connection.driver.name>
                 <connection.url>${openjpa.sqlserver.url}</connection.url>
                 <connection.username>${openjpa.sqlserver.username}</connection.username>
@@ -275,11 +337,12 @@
                 <dependency>
                     <groupId>net.sourceforge.jtds</groupId>
                     <artifactId>jtds</artifactId>
-                    <version>1.2</version>
+                    <version>${jtds.version}</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
             <properties>
+                <jtds.version>1.2</jtds.version>
                 <connection.driver.name>net.sourceforge.jtds.jdbc.Driver</connection.driver.name>
                 <connection.url>${openjpa.sybase.url}</connection.url>
                 <connection.username>${openjpa.sybase.username}</connection.username>
@@ -287,12 +350,35 @@
             </properties>
         </profile>
 
+        <!-- Profile for testing with Ingres DB -->
+        <profile>
+            <id>test-ingres</id>
+            <activation><property><name>test-ingres</name></property></activation>
+            <dependencies>
+                <dependency>
+                    <groupId>com.ingres.jdbc</groupId>
+                    <artifactId>iijdbc</artifactId>
+                    <version>${ingres.version}</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            <properties>
+                <ingres.version>9.2-3.4.8</ingres.version>
+                <connection.driver.name>com.ingres.jdbc.IngresDriver</connection.driver.name>
+                <connection.url>${openjpa.ingres.url}</connection.url>
+                <connection.username>${openjpa.ingres.username}</connection.username>
+                <connection.password>${openjpa.ingres.password}</connection.password>
+            </properties>
+        </profile>
+
         <!-- Profile for testing with a custom DB using a system jar -->
         <!--
-            For example, to test with Oracle, you might run: mvn test -Dtest=TestPersistence -Ptest-custom \
-            -Dopenjpa.custom.driverjar=$(pwd)/drivers/jdbc-oracle-10_2_0_1_0.jar \
-            -Dopenjpa.custom.driverclass=oracle.jdbc.driver.OracleDriver \
-            -Dopenjpa.custom.url=jdbc:oracle:thin:@HOST:PORT:DBNAME \ -Dopenjpa.custom.username=USERNAME \
+            For example, to test with Oracle, you might run:
+        mvn test -Dtest=TestPersistence -Ptest-custom \
+          -Dopenjpa.custom.driverjar=$(pwd)/drivers/jdbc-oracle-10_2_0_1_0.jar \
+          -Dopenjpa.custom.driverclass=oracle.jdbc.driver.OracleDriver \
+          -Dopenjpa.custom.url=jdbc:oracle:thin:@HOST:PORT:DBNAME \
+          -Dopenjpa.custom.username=USERNAME \
             -Dopenjpa.custom.password=PASSWORD
         -->
         <profile>
@@ -326,11 +412,14 @@
             added.
         -->
         <!--
-            For example, to test with DB2, you might run: mvn test -Dtest=TestPersistence -Ptest-custom2 \
+            For example, to test with DB2, you might run:
+            mvn test -Dtest=TestPersistence -Ptest-custom2 \
             -Dopenjpa.custom.driverjar1=$(pwd)/drivers/db2jcc.jar \
             -Dopenjpa.custom.driverjar2=$(pwd)/drviers/db2jcc_license_cu.jar \
-            -Dopenjpa.custom.driverclass=com.ibm.db2.jcc.DB2Driver \ -Dopenjpa.custom.url=jdbc:db2://HOST:PORT/DBNAME \
-            -Dopenjpa.custom.username=USERNAME \ -Dopenjpa.custom.password=PASSWORD
+            -Dopenjpa.custom.driverclass=com.ibm.db2.jcc.DB2Driver \
+            -Dopenjpa.custom.url=jdbc:db2://HOST:PORT/DBNAME \
+            -Dopenjpa.custom.username=USERNAME \
+            -Dopenjpa.custom.password=PASSWORD
         -->
         <profile>
             <id>test-custom2</id>
@@ -364,21 +453,42 @@
         </profile>
 
         <!--
-            The test-custom2 profile does not work very well when used with a continuous build system. As a convenience
-            I've added profiles for some of the proprietary databases to make testing easier.
+            The test-custom2 profile does not work very well when used with a 
+            continuous build system. As a convenience I've added profiles for 
+            some of the proprietary databases to make testing easier. 
         -->
         <profile>
             <!--
-                Example db2 profile. You can use this profile if you: 1) have the DB2 artifacts installed in a local
-                repo and supply the URL: -Ddb2.maven.repo=http://my.local.repo 2) have a copy of the DB2 JCC driver and
-                run the following commands : mvn install:install-file -Dfile=${path to db2jcc.jar} \
-                -DgroupId=com.ibm.db2 \ -DartifactId=jcc-driver \ -Dversion=9.5 \ -Dpackaging=jar mvn
-                install:install-file -Dfile=${path to db2jcc_license.jar} \ -DgroupId=com.ibm.db2 \
-                -DartifactId=jcc-license \ -Dversion=9.5 \ -Dpackaging=jar You must also set the following properties:
-                -Dopenjpa.db2.url=jdbc:db2://<HOST>:<PORT>/<DBNAME> -Dopenjpa.db2.username=<db2_uid>
-                -Dopenjpa.db2.password=<db2_pwd> Optionally, you can override the default DB2 groupId, artifactIds and
-                version by also supplying the following properties: -Ddb2.groupid=com.ibm.db2
-                -Dids.driver.artifactid=jcc-driver -Dids.license.artifactid=jcc-license -Ddb2.version=9.5
+                Example db2 profile. You can use this profile if you:
+                1) have the DB2 artifacts installed in a local repo and supply
+                the URL:
+	            -Ddb2.maven.repo=http://my.local.repo
+                2) have a copy of the DB2 JCC driver and run the following
+                commands :
+                    mvn install:install-file -Dfile=${path to db2jcc.jar} \
+                                             -DgroupId=com.ibm.db2 \
+                                             -DartifactId=jcc-driver \ 
+                                             -Dversion=9.5 \
+                                             -Dpackaging=jar
+                                         
+                    mvn install:install-file -Dfile=${path to db2jcc_license.jar} \
+                                             -DgroupId=com.ibm.db2 \
+                                             -DartifactId=jcc-license \ 
+                                             -Dversion=9.5 \
+                                             -Dpackaging=jar
+
+                You must also set the following properties:
+                    -Dopenjpa.db2.url=jdbc:db2://<HOST>:<PORT>/<DBNAME>
+                    -Dopenjpa.db2.username=<db2_uid>
+                    -Dopenjpa.db2.password=<db2_pwd>
+
+                Optionally, you can override the default DB2 groupId,
+                artifactIds and version by also supplying the following
+                properties:
+                    -Ddb2.groupid=com.ibm.db2
+                    -Dids.driver.artifactid=jcc-driver
+                    -Dids.license.artifactid=jcc-license
+                    -Ddb2.version=9.5
             -->
             <id>test-db2-jcc</id>
             <dependencies>
@@ -422,16 +532,31 @@
                 </repository>
             </repositories>
         </profile>
+
+        <!-- Profile for testing Informix with the DB2 JCC driver -->
         <profile>
             <!--
-                Example Informix JCC profile. You can use this profile if you: 1a) have the DB2 JCC artifacts installed
-                in a local repo and supply the URL: -Dids.maven.repo=http://my.local.repo 1b) or have a copy of the DB2
-                JCC driver and run the commands listed above in the test-db2-jcc profile. 2) have the DRDA service
-                enabled on the IDS server, which is usually port 9089 You must also set the following properties:
-                -Dopenjpa.ids.url=jdbc:ids://<HOST>:<PORT>/<DBNAME> -Dopenjpa.ids.username=<ids_uid>
-                -Dopenjpa.ids.password=<ids_pwd> Optionally, you can override the default DB2 JCC groupId, artifactIds
-                and version by also supplying the following properties: -Dids.groupid=com.ibm.db2
-                -Dids.driver.artifactid=jcc-driver -Dids.license.artifactid=jcc-license -Dids.version=9.5
+                Example Informix JCC profile. You can use this profile if you:
+                1a) have the DB2 JCC artifacts installed in a local repo and 
+                supply the URL:
+	            -Dids.maven.repo=http://my.local.repo
+                1b) or have a copy of the DB2 JCC driver and run the commands
+                listed above in the test-db2-jcc profile.
+		2) have the DRDA service enabled on the IDS server, which
+                is usually port 9089
+
+                You must also set the following properties:
+                    -Dopenjpa.ids.url=jdbc:ids://<HOST>:<PORT>/<DBNAME>
+                    -Dopenjpa.ids.username=<ids_uid>
+                    -Dopenjpa.ids.password=<ids_pwd>
+
+                Optionally, you can override the default DB2 JCC groupId,
+                artifactIds and version by also supplying the following
+                properties:
+                    -Dids.groupid=com.ibm.db2
+                    -Dids.driver.artifactid=jcc-driver
+                    -Dids.license.artifactid=jcc-license
+                    -Dids.version=9.5
             -->
             <id>test-ids-jcc</id>
             <dependencies>
@@ -475,16 +600,31 @@
                 </repository>
             </repositories>
         </profile>
-        <profile>
-            <!--
-                Example oracle profile. You can use this profile if you: 1) have the Oracle artifacts installed in a
-                local repo and supply the URL: -Doracle.maven.repo=http://my.local.repo 2) have a copy of the Oracle
-                driver and run the following command: mvn install:install-file -Dfile=${path to ojdbc.jar} \
-                -DgroupId=com.oracle \ -DartifactId=jdbc-driver \ -Dversion=10g \ -Dpackaging=jar You must also set the
-                following properties: -Dopenjpa.oracle.url -Dopenjpa.oracle.username -Dopenjpa.oracle.password
 
-                Optionally, you can override the default Oracle groupId and version by also supplying the following
-                properties: -Doracle.groupid=com.oracle -Doracle.version=10g
+        <!-- Profile for testing with Oracle DB -->
+        <profile>
+            <!-- 
+                Example oracle profile. You can use this profile if you:
+                1) have the Oracle artifacts installed in a local repo and
+                supply the URL:
+	            -Doracle.maven.repo=http://my.local.repo
+                2) have a copy of the Oracle driver and run the following
+                command:
+                    mvn install:install-file -Dfile=${path to ojdbc.jar} \
+                                             -DgroupId=com.oracle \
+                                             -DartifactId=jdbc-driver \ 
+                                             -Dversion=10g \
+                                             -Dpackaging=jar
+                                         
+                You must also set the following properties:
+                    -Dopenjpa.oracle.url
+                    -Dopenjpa.oracle.username
+                    -Dopenjpa.oracle.password
+
+                Optionally, you can override the default Oracle groupId and
+                version by also supplying the following properties:
+                    -Doracle.groupid=com.oracle
+                    -Doracle.version=10g
             -->
             <id>test-oracle</id>
             <dependencies>
diff --git a/pom.xml b/pom.xml
index e3fc88fc7..3a9d31b77 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,6 +46,7 @@
         <surefire.jvm.args>${test.jvm.arguments}</surefire.jvm.args>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <checkstyle.config.location>../openjpa-project/checkstyle.xml</checkstyle.config.location>
+        <derby.version>10.2.2.0</derby.version>
     </properties>
 
     <!--
@@ -513,7 +514,7 @@
             <dependency>
                 <groupId>org.apache.derby</groupId>
                 <artifactId>derby</artifactId>
-                <version>10.2.2.0</version>
+                <version>${derby.version}</version>
             </dependency>
             <dependency>
                 <groupId>commons-dbcp</groupId>