Index: jpa/eclipselink.jpa.test/netweaver.properties
===================================================================
--- jpa/eclipselink.jpa.test/netweaver.properties	(revision 0)
+++ jpa/eclipselink.jpa.test/netweaver.properties	(revision 0)
@@ -0,0 +1,60 @@
+# NetWeaver Server Testing Environment Properties.
+
+
+###############################################
+# User must adapt these properties 
+###############################################
+
+# installation directory of the NetWeaver Java instance
+netweaver.instance.dir=c:/usr/sap/L36/J36
+
+# user and password defined during installation
+server.user=Administrator
+server.pwd=abcd1234
+
+# host and port for the NetWeaver server; defined during installation
+netweaver.host=localhost
+netweaver.port=53604
+
+# JDBC driver to use for testing
+# note that the driver must already be deployed on the system, e.g. via telnet
+# > add dbpool
+# > deploy_jdbc_driver <driver-name> <driver_archive>
+netweaver.datasource.driver.deployname=mysql_driver
+
+# configure the data source to use for testing
+netweaver.datasource.name=LOCAL_MYSQL_DS
+netweaver.datasource.driver.class=com.mysql.jdbc.Driver
+netweaver.datasource.url=jdbc:mysql://localhost/el
+netweaver.datasource.user=me
+netweaver.datasource.password=abcd1234
+
+###############################################
+# User may change these properties
+###############################################
+
+# name of the SDA file (without .sda extension) containing required libraries (e.g. eclipselink.jar)
+netweaver.eclipselink.app=servertest_eclipselink
+
+# name of the SDA file (without .sda extension) containing the test datasource
+netweaver.datasource.app=servertest_datasource
+
+
+####################################
+# DO NOT CHANGE
+####################################
+server.testrunner=JavaEE/servertest/REMOTE/TestRunner/org.eclipse.persistence.testing.framework.server.TestRunner
+server.lib=${netweaver.instance.dir}/j2ee/j2eeclient
+#server.platform=NetWeaver_7_1
+server.platform=org.eclipse.persistence.platform.server.sap.SAPNetWeaver_7_1_Platform
+server.platform.class=netweaver-71-platform
+server.factory=com.sap.engine.services.jndi.InitialContextFactoryImpl
+server.url=${netweaver.host}:${netweaver.port}/
+server.depend=sap.com~tc~je~clientlib~impl.jar,sap.com~tc~logging~java~impl.jar,sap.com~tc~exception~impl.jar
+
+# NetWeaver specific properties.
+netweaver.clientlib.dir=${server.lib}
+netweaver.deployment.dir=${netweaver.instance.dir}/j2ee/deployment
+netweaver.deployment.ant.dir=${netweaver.deployment.dir}/ant/lib
+eclipselink.home=../..
+extensions.home=../../../incubator/extensions/trunk
\ No newline at end of file
Index: jpa/eclipselink.jpa.test/netweaver.xml
===================================================================
--- jpa/eclipselink.jpa.test/netweaver.xml	(revision 0)
+++ jpa/eclipselink.jpa.test/netweaver.xml	(revision 0)
@@ -0,0 +1,174 @@
+<!--/*******************************************************************************
+* This program and the accompanying materials are made available under the 
+* terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0 
+* which accompanies this distribution. 
+* The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+* and the Eclipse Distribution License is available at 
+* http://www.eclipse.org/org/documents/edl-v10.php.
+*
+*   Ant naming conventions:
+*   - regardless of the actual OS platform,'/' is the directory separator
+*     (Ant will convert as appropriate).
+*   - multi-word properties use periods '.'
+*   - multi-word targets use hyphens '-' 
+*   - multi-word macros use underscores '_'
+*   - multi-word macro attributes are concatinated
+*     e.g. 'runpathref'  
+*   - multi-word tasks (taskdef) names are concatinated
+*     e.g. 'validateconnection'
+*   - OS environment variables are in ALLCAPS and have 'env' as a prefix
+*     e.g. ${env.XXX}.
+*   - Ant properties are lower case.
+*
+* Contributors:
+*     ??? - initial implementation
+#******************************************************************************/-->
+
+<!-- This ant project includes the following tasks:
+        - netweaver-setup    : packs an application containing eclipselink.jar and other required libraries and deploys it to the server
+        - netweaver-reset    : undeploys the application containing eclipselink.jar
+        - netweaver-deploy   : adds NetWeaver specific resources and deploys ear
+        - netweaver-undeploy : undeploys ear
+-->
+
+<project name="Eclipse Persistence Services JPA NetWeaver Testing" basedir=".">
+
+    <!-- Allows a user to overide certain user specific properties. -->
+    <property file="${user.home}/netweaver.properties"/>
+    <property file="./netweaver.properties"/>
+    
+    <property name="cpath" value="${netweaver.deployment.ant.dir}/tc~je~dc_ant.jar: 
+                                  ${netweaver.clientlib.dir}/sap.com~tc~exception~impl.jar:
+                                  ${netweaver.clientlib.dir}/sap.com~tc~je~clientlib~impl.jar:
+                                  ${netweaver.clientlib.dir}/sap.com~tc~logging~java~impl.jar:
+                                  ${netweaver.deployment.dir}/lib/sap.com~tc~je~deployment14~impl.jar"/>
+	
+    <taskdef name="sapdeploy" classname="com.sap.engine.services.dc.ant.deploy.SAPDeploy" classpath="${cpath}"/>
+    <taskdef name="sapundeploy" classname="com.sap.engine.services.dc.ant.undeploy.SAPUndeploy" classpath="${cpath}"/>
+ 
+    <condition property="netweaver.deployment.script.suffix" value="csh" else="${suffix}">
+        <and>
+            <isset property="is.unix"/>
+            <available file="${netweaver.deployment.dir}/scripts/make_SDA.csh"/>
+        </and>
+    </condition>
+
+    <macrodef name="make_sda">
+        <attribute name="source" />
+        <attribute name="target" />
+        <sequential>
+            <exec executable="${netweaver.deployment.dir}/scripts/make_SDA.${netweaver.deployment.script.suffix}" dir="${netweaver.deployment.dir}/scripts" failonerror="true">
+                <arg value="@{source}"/>
+                <arg value="-d"/>
+                <arg value="@{target}"/>
+            </exec>
+        </sequential>
+    </macrodef>
+
+
+
+    <target name="netweaver-install">
+       <echo message="*** build target netweaver-install - nothing done ***"/>
+    </target>
+
+
+    <target name="netweaver-start">
+       <echo message="*** build target netweaver-start - nothing done ***"/>
+    </target>
+
+
+    <target name="netweaver-setup">
+        <mkdir dir="${eclipselink.jpa.test}/${build.dir}"/>
+        <dirname property="basedir" file="${eclipselink.jpa.test}"/>
+
+        <!-- pack EAR file containing eclipselink.jar and other required libraries and convert it to SDA -->
+        <zip destfile="${eclipselink.jpa.test}/${build.dir}/${netweaver.eclipselink.app}.ear">
+            <fileset dir="${eclipselink.home}" includes="eclipselink.jar"/>
+            <fileset dir="${extensions.home}/org.eclipse.persistence.platform.server.netweaver" includes="*.jar"/>
+            <fileset file="${junit.lib}"/>
+        </zip>
+        <make_sda source="${basedir}/${build.dir}/${netweaver.eclipselink.app}.ear" target="${basedir}/${build.dir}/${netweaver.eclipselink.app}.sda" />        
+
+        <!-- pack EAR file containing the test datasource and convert it to SDA -->
+        <copy overwrite="true" todir="${eclipselink.jpa.test}/resource/${server.name}/setup/META-INF">
+    	    <fileset dir="${eclipselink.jpa.test}/resource/${server.name}/templates/setup/META-INF" includes="*.*"/>
+        </copy>
+        <replace file="${eclipselink.jpa.test}/resource/${server.name}/setup/META-INF/data-sources.xml" token='%%data-source-name%%' value="${netweaver.datasource.name}"/>
+        <replace file="${eclipselink.jpa.test}/resource/${server.name}/setup/META-INF/data-sources.xml" token='%%driver-name%%' value="${netweaver.datasource.driver.deployname}"/>
+        <replace file="${eclipselink.jpa.test}/resource/${server.name}/setup/META-INF/data-sources.xml" token='%%driver-class-name%%' value="${netweaver.datasource.driver.class}"/>
+        <replace file="${eclipselink.jpa.test}/resource/${server.name}/setup/META-INF/data-sources.xml" token='%%url%%' value="${netweaver.datasource.url}"/>
+        <replace file="${eclipselink.jpa.test}/resource/${server.name}/setup/META-INF/data-sources.xml" token='%%user-name%%' value="${netweaver.datasource.user}"/>
+        <replace file="${eclipselink.jpa.test}/resource/${server.name}/setup/META-INF/data-sources.xml" token='%%password%%' value="${netweaver.datasource.password}"/>
+        <zip destfile="${eclipselink.jpa.test}/${build.dir}/${netweaver.datasource.app}.ear">
+            <fileset dir="${eclipselink.jpa.test}/resource/${server.name}/setup"/>
+        </zip>
+        <make_sda source="${basedir}/${build.dir}/${netweaver.datasource.app}.ear" target="${basedir}/${build.dir}/${netweaver.datasource.app}.sda" />
+        
+        <!-- deploy the SDA -->
+        <sapdeploy versionrule="all">
+            <saperrorhandling erroraction="prerequisites" errorstrategy="stop"/>
+            <saperrorhandling erroraction="deploy" errorstrategy="stop"/>
+            <fileset dir="${build.dir}" includes="${netweaver.eclipselink.app}.sda,${netweaver.datasource.app}.sda"/>
+            <sapj2eeengine serverhost="${netweaver.host}" serverport="${netweaver.port}" username="${server.user}" userpassword="${server.pwd}"/>
+        </sapdeploy>
+    </target>
+
+
+    <target name="netweaver-reset">
+        <!-- undeploy the application containing eclipselink.jar -->
+        <copy overwrite="true" todir="${eclipselink.jpa.test}/resource/${server.name}">
+    	    <fileset dir="${eclipselink.jpa.test}/resource/${server.name}/templates/" includes="undeploy_eclipselink.txt"/>
+        </copy>
+        <replace file="${eclipselink.jpa.test}/resource/${server.name}/undeploy_eclipselink.txt" token='%%eclipselink_app%%' value="${netweaver.eclipselink.app}"/>
+        <replace file="${eclipselink.jpa.test}/resource/${server.name}/undeploy_eclipselink.txt" token='%%datasource_app%%' value="${netweaver.datasource.app}"/>
+        <sapundeploy undeploystrategy="IfDependingStop">
+            <saperrorhandling erroraction="prerequisites" errorstrategy="stop"/>
+            <saperrorhandling erroraction="undeploy" errorstrategy="stop"/>
+            <sapundeploylist listfilepath="${eclipselink.jpa.test}/resource/${server.name}/undeploy_eclipselink.txt"/>
+            <sapj2eeengine serverhost="${netweaver.host}" serverport="${netweaver.port}" username="${server.user}" userpassword="${server.pwd}"/>
+        </sapundeploy>        
+    </target>
+
+
+    <target name="netweaver-stop">
+       <echo message="*** build target netweaver-stop - nothing done ***"/>
+    </target>
+
+
+    <!-- add NetWeaver specific resources to the test application ear and deploy it to the server -->
+    <target name="netweaver-deploy">
+        <!-- add NetWeaver specific resources to the application EAR and convert it to SDA -->
+        <copy overwrite="true" todir="${eclipselink.jpa.test}/resource/${server.name}/META-INF">
+    	    <fileset dir="${eclipselink.jpa.test}/resource/${server.name}/templates/META-INF" includes="*.*"/>
+        </copy>
+        <replace dir="${eclipselink.jpa.test}/resource/${server.name}/META-INF" token='%%eclipselinklib%%' value="${netweaver.eclipselink.app}"/>
+        <replace dir="${eclipselink.jpa.test}/resource/${server.name}/META-INF" token='%%datasourcename%%' value="${netweaver.datasource.name}"/>
+    	<ear destfile="${eclipselink.jpa.test}/${ear.name}" update="true">
+    	    <fileset dir="${eclipselink.jpa.test}/resource/${server.name}" includes="META-INF/*.*"/>
+        </ear>
+        <dirname property="basedir" file="${eclipselink.jpa.test}"/>
+        <echo message="ear.name=${ear.name}"/>
+        <echo message="application.name=${application.name}"/>
+        <make_sda source="${basedir}/${ear.name}" target="${basedir}/${build.dir}/${application.name}.sda"/>        
+
+        <!-- deploy the SDA -->
+        <sapdeploy versionrule="all">
+            <saperrorhandling erroraction="prerequisites" errorstrategy="stop"/>
+            <saperrorhandling erroraction="deploy" errorstrategy="stop"/>
+            <fileset dir="${build.dir}" includes ="${application.name}.sda"/>
+            <sapj2eeengine serverhost="${netweaver.host}" serverport="${netweaver.port}" username="${server.user}" userpassword="${server.pwd}"/>
+        </sapdeploy>
+    </target>
+
+
+    <!-- undeploy the test application from the server -->
+    <target name="netweaver-undeploy">
+        <sapundeploy undeploystrategy="IfDependingStop">
+            <saperrorhandling erroraction="prerequisites" errorstrategy="stop"/>
+            <saperrorhandling erroraction="undeploy" errorstrategy="stop"/>
+            <sapundeploylist listfilepath="${eclipselink.jpa.test}/resource/${server.name}/undeploy.txt"/>
+            <sapj2eeengine serverhost="${netweaver.host}" serverport="${netweaver.port}" username="${server.user}" userpassword="${server.pwd}"/>
+        </sapundeploy>        
+    </target>
+
+</project>
Index: jpa/eclipselink.jpa.test/resource/netweaver/templates/META-INF/application-j2ee-engine.xml
===================================================================
--- jpa/eclipselink.jpa.test/resource/netweaver/templates/META-INF/application-j2ee-engine.xml	(revision 0)
+++ jpa/eclipselink.jpa.test/resource/netweaver/templates/META-INF/application-j2ee-engine.xml	(revision 0)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application-j2ee-engine xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="application-j2ee-engine.xsd">
+    <reference reference-type="hard">
+        <reference-target provider-name="JavaEE" target-type="application">%%eclipselinklib%%</reference-target>
+    </reference>
+</application-j2ee-engine>
Index: jpa/eclipselink.jpa.test/resource/netweaver/templates/META-INF/data-source-aliases.xml
===================================================================
--- jpa/eclipselink.jpa.test/resource/netweaver/templates/META-INF/data-source-aliases.xml	(revision 0)
+++ jpa/eclipselink.jpa.test/resource/netweaver/templates/META-INF/data-source-aliases.xml	(revision 0)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<data-source-aliases xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="data-source-aliases.xsd">
+  <aliases>
+    <data-source-name>%%datasourcename%%</data-source-name>
+    <alias>jdbc/EclipseLinkDS</alias>
+  </aliases>
+</data-source-aliases>
Index: jpa/eclipselink.jpa.test/resource/netweaver/templates/setup/META-INF/data-sources.xml
===================================================================
--- jpa/eclipselink.jpa.test/resource/netweaver/templates/setup/META-INF/data-sources.xml	(revision 0)
+++ jpa/eclipselink.jpa.test/resource/netweaver/templates/setup/META-INF/data-sources.xml	(revision 0)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE data-sources SYSTEM "data-sources.dtd" >
+<data-sources>
+  <data-source>
+    <data-source-name>%%data-source-name%%</data-source-name>
+    <driver-name>%%driver-name%%</driver-name>
+    <isolation-level>TRANSACTION_READ_COMMITTED</isolation-level>
+    <sql-engine>native_sql</sql-engine>
+    <jdbc-1.x>
+      <driver-class-name>%%driver-class-name%%</driver-class-name>
+      <url>%%url%%</url>
+      <user-name>%%user-name%%</user-name>
+      <password>%%password%%</password>
+    </jdbc-1.x>
+  </data-source>
+</data-sources>
Index: jpa/eclipselink.jpa.test/resource/netweaver/templates/undeploy_eclipselink.txt
===================================================================
--- jpa/eclipselink.jpa.test/resource/netweaver/templates/undeploy_eclipselink.txt	(revision 0)
+++ jpa/eclipselink.jpa.test/resource/netweaver/templates/undeploy_eclipselink.txt	(revision 0)
@@ -0,0 +1,2 @@
+JavaEE/%%eclipselink_app%%
+JavaEE/%%datasource_app%%
Index: jpa/eclipselink.jpa.test/resource/netweaver/undeploy.txt
===================================================================
--- jpa/eclipselink.jpa.test/resource/netweaver/undeploy.txt	(revision 0)
+++ jpa/eclipselink.jpa.test/resource/netweaver/undeploy.txt	(revision 0)
@@ -0,0 +1 @@
+JavaEE/servertest