Index: jpa/eclipselink.jpa.test/glassfish.xml
===================================================================
--- jpa/eclipselink.jpa.test/glassfish.xml	(revision 8710)
+++ jpa/eclipselink.jpa.test/glassfish.xml	(working copy)
@@ -83,8 +83,8 @@
     <target name="glassfish-install" depends="install-latest-glassfish">
         <copy file="${junit.lib}" todir="${glassfish.home}/domains/domain1/lib"/>
         <copy file="${jdbc.driver.jar}" todir="${glassfish.home}/domains/domain1/lib/ext"/>
-        <copy file="${oracle.extensions.depend.dir}/${oracle.spatial.lib}" todir="${glassfish.home}/domains/domain1/lib"/>
-        <copy file="${oracle.extensions.depend.dir}/${oracle.xdb.lib}" todir="${glassfish.home}/domains/domain1/lib"/>
+        <copy file="${oracle.extensions.depend.dir}/${oracle.sdoapi.jar}" todir="${glassfish.home}/domains/domain1/lib"/>
+        <copy file="${oracle.extensions.depend.dir}/${oracle.xdb.jar}" todir="${glassfish.home}/domains/domain1/lib"/>
         <antcall target="copy-eclipselink-to-glassfish2" inheritRefs="true"/>
         <antcall target="copy-eclipselink-and-persistence-latest-jars-to-glassfish3" inheritRefs="true"/>
     </target>
Index: jpa/eclipselink.jpa.test/jboss.xml
===================================================================
--- jpa/eclipselink.jpa.test/jboss.xml	(revision 8710)
+++ jpa/eclipselink.jpa.test/jboss.xml	(working copy)
@@ -134,9 +134,9 @@
                 <pathelement location="${jboss.home}/lib/jboss-logging-spi.jar"/>
                 <pathelement location="${jboss.home}/bin/run.jar"/>
                 <pathelement location="${jdbc.driver.jar}"/>
-                <pathelement location="${oracle.extensions.depend.dir}/${oracle.xdb.lib}"/>
-                <pathelement location="${oracle.extensions.depend.dir}/${oracle.xmlparserv2.lib}"/>
-                <pathelement location="${oracle.extensions.depend.dir}/${oracle.spatial.lib}"/>
+                <pathelement location="${oracle.extensions.depend.dir}/${oracle.xdb.jar}"/>
+                <pathelement location="${oracle.extensions.depend.dir}/${oracle.xmlparser.jar}"/>
+                <pathelement location="${oracle.extensions.depend.dir}/${oracle.sdoapi.jar}"/>
             </classpath>           
         </java>
     </target>
Index: jpa/eclipselink.jpa.test/oc4j.xml
===================================================================
--- jpa/eclipselink.jpa.test/oc4j.xml	(revision 8710)
+++ jpa/eclipselink.jpa.test/oc4j.xml	(working copy)
@@ -69,7 +69,7 @@
         <copy file="${eclipselink.lib}" todir="${oc4j.home}/j2ee/home/applib"/>
         <copy file="${junit.lib}" todir="${oc4j.home}/j2ee/home/applib"/>
         <copy file="${jdbc.driver.jar}" todir="${oc4j.home}/j2ee/home/applib"/>
-        <copy file="${oracle.extensions.depend.dir}/${oracle.spatial.lib}" todir="${oc4j.home}/j2ee/home/applib"/>
+        <copy file="${oracle.extensions.depend.dir}/${oracle.sdoapi.jar}" todir="${oc4j.home}/j2ee/home/applib"/>
     </target>
 
     <!-- Start the server. -->
Index: jpa/eclipselink.jpa.test/weblogic.xml
===================================================================
--- jpa/eclipselink.jpa.test/weblogic.xml	(revision 8710)
+++ jpa/eclipselink.jpa.test/weblogic.xml	(working copy)
@@ -85,9 +85,9 @@
         <antcall target="weblogic-start-nosleep" inheritRefs="true"/>
         <copy file="${junit.lib}" todir="${weblogic.domain}/lib"/>
         <antcall target="copy-eclipselink-jar-to-domain-lib" inheritRefs="true"/>
-        <copy file="${oracle.extensions.depend.dir}/${oracle.xdb.lib}" todir="${weblogic.domain}/lib"/>
-        <copy file="${oracle.extensions.depend.dir}/${oracle.spatial.lib}" todir="${weblogic.domain}/lib"/>
-        <copy file="${oracle.extensions.depend.dir}/${oracle.xmlparserv2.lib}" todir="${weblogic.domain}/lib"/>
+        <copy file="${oracle.extensions.depend.dir}/${oracle.xdb.jar}" todir="${weblogic.domain}/lib"/>
+        <copy file="${oracle.extensions.depend.dir}/${oracle.sdoapi.jar}" todir="${weblogic.domain}/lib"/>
+        <copy file="${oracle.extensions.depend.dir}/${oracle.xmlparser.jar}" todir="${weblogic.domain}/lib"/>
         <antcall target="weblogic-stop" inheritRefs="true"/>
     </target>
 
Index: jpa/eclipselink.jpa.test/websphere.xml
===================================================================
--- jpa/eclipselink.jpa.test/websphere.xml	(revision 8710)
+++ jpa/eclipselink.jpa.test/websphere.xml	(working copy)
@@ -50,7 +50,7 @@
     <target name="websphere-install">
         <copy file="${junit.lib}" todir="${was.home}/lib/ext"/>
         <copy file="${eclipselink.jar.dir}/eclipselink.jar" todir="${was.home}/lib/ext"/>
-        <copy file="${oracle.extensions.depend.dir}/${oracle.spatial.lib}" todir="${was.home}/lib/ext"/>
+        <copy file="${oracle.extensions.depend.dir}/${oracle.sdoapi.jar}" todir="${was.home}/lib/ext"/>
         <copy file="${jpatest.2.sdo.plugins.dir}/${commonj.sdo.jar}" todir="${was.home}/lib/ext" overwrite="true"/>
     </target>