Attachment 142689 Details for Bug 284755 – patch file

[patch] patch file

284755.patch (text/plain), 5.67 KB, created by Edwin Tang

on 2009-07-27 14:37:52 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Edwin Tang

Created: 2009-07-27 14:37:52 EDT

Size: 5.67 KB

patch

obsolete

>Index: foundation/eclipselink.core.test/test.properties
>===================================================================
>--- foundation/eclipselink.core.test/test.properties	(revision 4726)
>+++ foundation/eclipselink.core.test/test.properties	(working copy)
>@@ -15,18 +15,18 @@
> # db.pwd=password
> # db.platform=org.eclipse.persistence.platform.database.MySQLPlatform
> 
>-# jdbc.driver.jar=../../../extension.oracle.lib.external/ojdbc5_11.jar
>+# jdbc.driver.jar=../../../extension.oracle.lib.external/ojdbc6.jar
> # db.driver=oracle.jdbc.OracleDriver
> # db.url=jdbc:oracle:thin:@tlsvrdb5.ca.oracle.com:1521:toplink
> # db.user=user
> # db.pwd=password
> # db.platform=org.eclipse.persistence.platform.database.OraclePlatform
>-#jdbc.driver.jar=C:/java/jdbc/ojdbc5.jar
>+#jdbc.driver.jar=C:/java/jdbc/ojdbc6.jar
> # db.url=jdbc:oracle:thin:@tlsvrdb7.ca.oracle.com:1521:toplink
> #db.user=tware
> #db.pwd=password
> 
>-#jdbc.driver.jar=/C:/EclipseLink/foundation/extension.oracle.lib.external/ojdbc14_10.jar
>+#jdbc.driver.jar=/C:/EclipseLink/foundation/extension.oracle.lib.external/ojdbc6.jar
> #db.driver=oracle.jdbc.OracleDriver
> #db.url=jdbc:oracle:thin:@localhost:1521:XE
> #db.user=system
>Index: foundation/eclipselink.extension.oracle.test/build.properties
>===================================================================
>--- foundation/eclipselink.extension.oracle.test/build.properties	(revision 4726)
>+++ foundation/eclipselink.extension.oracle.test/build.properties	(working copy)
>@@ -15,7 +15,7 @@
> classes.dir=classes
> resource.dir=resource
> 
>-oracle.extensions.depend.jars=xdb.jar,aqapi.jar,xmlparserv2.jar,ojdbc14dms_10.jar,sdoapi.jar
>+oracle.extensions.depend.jars=ojdbc6.jar,aqapi.jar,sdoapi.jar,xdb.jar,xmlparserv2.jar
> eclipselink.core.depend=javax.activation_1.1.0.v200806101325.jar,javax.resource_1.5.0.jar,javax.ejb_3.0.0.jar,javax.jms_1.1.0.jar,javax.xml.stream_1.0.1.v200903100845.jar,javax.transaction_1.1.0.jar,javax.mail_1.4.0.v200804091730.jar
> 
> eclipselink.jar.name=eclipselink.jar
>Index: foundation/eclipselink.extension.oracle.test/test.properties
>===================================================================
>--- foundation/eclipselink.extension.oracle.test/test.properties	(revision 4726)
>+++ foundation/eclipselink.extension.oracle.test/test.properties	(working copy)
>@@ -1,7 +1,7 @@
> # Testing environment properties
> # Set your target database properties here or give it by -Dtest.properties=file option
> 
>-jdbc.driver.jar=../../../extension.oracle.lib.external/ojdbc5_11.jar
>+jdbc.driver.jar=../../../extension.oracle.lib.external/ojdbc6.jar
> db.driver=oracle.jdbc.OracleDriver
> db.url=jdbc:oracle:thin:@localhost:1521:orcl
> db.user=scott
>Index: foundation/org.eclipse.persistence.oracle/build.properties
>===================================================================
>--- foundation/org.eclipse.persistence.oracle/build.properties	(revision 4726)
>+++ foundation/org.eclipse.persistence.oracle/build.properties	(working copy)
>@@ -15,7 +15,7 @@
> classes.dir=classes
> resource.dir=resource
> 
>-oracle.extensions.depend.jars=xdb.jar,aqapi.jar,xmlparserv2.jar,ojdbc14dms_10.jar,sdoapi.jar
>+oracle.extensions.depend.jars=ojdbc6.jar,aqapi.jar,sdoapi.jar,xdb.jar,xmlparserv2.jar
> eclipselink.core.depend=javax.activation_1.1.0.v200806101325.jar,javax.resource_1.5.0.jar,javax.ejb_3.0.0.jar,javax.jms_1.1.0.jar,javax.xml.stream_1.0.1.v200903100845.jar,javax.transaction_1.1.0.jar,javax.mail_1.4.0.v200804091730.jar
> 
> eclipselink.extension.oracle.bndl.prefix=org.eclipse.persistence.oracle
>Index: jpa/eclipselink.jpa.test/build.properties
>===================================================================
>--- jpa/eclipselink.jpa.test/build.properties	(revision 4726)
>+++ jpa/eclipselink.jpa.test/build.properties	(working copy)
>@@ -53,9 +53,7 @@
> eclipselink.proxyauthentication.model=eclipselink-proxyauthentication-model
> eclipselink.jpa.oracle=eclipselink-jpa-oracle
> oracle.extensions.depend.dir=../../../extension.oracle.lib.external
>-oracle.spatial.lib=sdoapi.jar
>-oracle.xdb.lib=xdb.jar
>-oracle.xmlparserv2.lib=xmlparserv2.jar
>+oracle.extensions.depend.jars=ojdbc6.jar,aqapi.jar,sdoapi.jar,xdb.jar,xmlparserv2.jar
> 
> eclipselink.tests.jar=eclipselink-tests.jar
> 
>Index: jpa/eclipselink.jpa.test/build.xml
>===================================================================
>--- jpa/eclipselink.jpa.test/build.xml	(revision 4726)
>+++ jpa/eclipselink.jpa.test/build.xml	(working copy)
>@@ -198,8 +198,9 @@
>         </path>
>         <path id="compile.server.path">
>             <path refid="compile.path"/>
>-            <pathelement path="${jdbc.driver.jar}"/>
>-            <pathelement path="${oracle.extensions.depend.dir}/${oracle.spatial.lib}"/>
>+            <fileset
>+                dir="${oracle.extensions.depend.dir}"
>+                includes="${oracle.extensions.depend.jars}"/>
>         </path>
>     </target>
> 
>@@ -496,8 +497,9 @@
>             <pathelement path="${eclipselink.extension.oracle.dir}/${classes.dir}"/>
>             <pathelement path="${eclipselink.extension.oracle.dir}/eclipselink-extension-oracle.jar"/>
>             <pathelement path="${jdbc.driver.jar}"/>
>-            <pathelement path="${oracle.extensions.depend.dir}/${oracle.xdb.lib}"/>
>-            <pathelement path="${oracle.extensions.depend.dir}/${oracle.xmlparserv2.lib}"/>
>+            <fileset
>+                dir="${oracle.extensions.depend.dir}"
>+                includes="${oracle.extensions.depend.jars}"/>
>             <pathelement path="${eclipselink.jpa.test}/${eclipselink.tests.jar}"/>
>             <pathelement path="${eclipselink.jpa.test}/${eclipselink.annotation.model}.jar"/>
>             <pathelement path="${eclipselink.jpa.test}/${eclipselink.ddl.generation.model}.jar"/>

Actions: View | Diff

Attachments on bug 284755: 142689