Author: mikedd
Date: Wed Jan 28 17:24:17 2009
New Revision: 738557
URL: http://svn.apache.org/viewvc?rev=738557&view=rev
Log:
OPENJPA-876 adding db2 and oracle profiles to openjpa-persistence-jdbc/pom.xml
Modified:
openjpa/branches/1.3.x/ (props changed)
openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M21UniDepartment.java
(props changed)
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M21UniEmployee.java
(props changed)
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M2MBiDepartment.java
(props changed)
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M2MBiEmployee.java
(props changed)
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestM21UniVersion.java
(props changed)
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestM2MBiVersion.java
(props changed)
Propchange: openjpa/branches/1.3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 28 17:24:17 2009
@@ -1,2 +1,2 @@
/openjpa/branches/1.2.x:727744,736750
-/openjpa/trunk:712928,719698,720521,720529,724765,733970,734253
+/openjpa/trunk:712928,719698,720521,720529,724765,733970,734253,738555
Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml?rev=738557&r1=738556&r2=738557&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml Wed Jan 28 17:24:17
2009
@@ -236,6 +236,80 @@
<connection.password>${openjpa.custom.password}</connection.password>
</properties>
</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.
+ -->
+ <profile>
+ <!--
+ Example db2 profile. Unfortunately the version, groupId and
+ artifactId are hard coded. You may use this profile if you
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
+
+ mvn install:install-file -Dfile=${path to db2jcc_license.jar} \
+ -DgroupId=com.ibm.db2 \
+ -DartifactId=jcc-license \
+ -Dversion=9.5
+ You should also set the openjpa.db2.url, openjpa.db2.user, and
+ openjpa.db2.password properties.
+ -->
+ <id>test-db2-jcc</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.ibm.db2</groupId>
+ <artifactId>jcc-driver</artifactId>
+ <version>9.5</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.ibm.db2</groupId>
+ <artifactId>jcc-license</artifactId>
+ <version>9.5</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <properties>
+
<connection.driver.name>com.ibm.db2.jcc.DB2Driver</connection.driver.name>
+ <connection.url>${openjpa.db2.url}</connection.url>
+
<connection.username>${openjpa.db2.username}</connection.username>
+
<connection.password>${openjpa.db2.password}</connection.password>
+ </properties>
+ </profile>
+ <profile>
+ <!--
+ Example oracle profile. Unfortunately the version, groupId and
+ artifactId are hard coded. You may use this profile if you
have
+ a copy of the Oracle driver and run the following commands :
+ mvn install:install-file -Dfile=${ojdbc.jar} \
+ -DgroupId=com.oracle \
+ -DartifactId=jdbc-driver \
+ -Dversion=10g
+
+ You should also set the openjpa.oracle.url,
openjpa.oracle.user,
+ and openjpa.oracle.password properties.
+ -->
+ <id>test-oracle</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.oracle</groupId>
+ <artifactId>jdbc-driver</artifactId>
+ <version>10g</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <properties>
+
<connection.driver.name>oracle.jdbc.driver.OracleDriver</connection.driver.name>
+ <connection.url>${openjpa.oracle.url}</connection.url>
+
<connection.username>${openjpa.oracle.username}</connection.username>
+
<connection.password>${openjpa.oracle.password}</connection.password>
+ </properties>
+ </profile>
</profiles>
<dependencies>
Propchange:
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M21UniDepartment.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 28 17:24:17 2009
@@ -1,2 +1,2 @@
/openjpa/branches/1.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M21UniDepartment.java:736750
-/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M21UniDepartment.java:734253
+/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M21UniDepartment.java:734253,738555
Propchange:
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M21UniEmployee.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 28 17:24:17 2009
@@ -1,2 +1,2 @@
/openjpa/branches/1.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M21UniEmployee.java:736750
-/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M21UniEmployee.java:734253
+/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M21UniEmployee.java:734253,738555
Propchange:
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M2MBiDepartment.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 28 17:24:17 2009
@@ -1,2 +1,2 @@
/openjpa/branches/1.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M2MBiDepartment.java:736750
-/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M2MBiDepartment.java:734253
+/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M2MBiDepartment.java:734253,738555
Propchange:
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M2MBiEmployee.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 28 17:24:17 2009
@@ -1,2 +1,2 @@
/openjpa/branches/1.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M2MBiEmployee.java:736750
-/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M2MBiEmployee.java:734253
+/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M2MBiEmployee.java:734253,738555
Propchange:
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestM21UniVersion.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 28 17:24:17 2009
@@ -1 +1,2 @@
/openjpa/branches/1.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestM21UniVersion.java:736750
+/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestM21UniVersion.java:738555
Propchange:
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestM2MBiVersion.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 28 17:24:17 2009
@@ -1 +1,2 @@
/openjpa/branches/1.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestM2MBiVersion.java:736750
+/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestM2MBiVersion.java:738555
