Attachment 196116 Details for Bug 346335 – patch for running jpa/composite tests on server

[patch] patch for running jpa/composite tests on server

bug346335.patch (text/plain), 43.80 KB, created by Yiping Zhao

on 2011-05-19 10:38:51 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Yiping Zhao

Created: 2011-05-19 10:38:51 EDT

Size: 43.80 KB

patch

obsolete

>Index: build.xml
>===================================================================
>--- build.xml	(revision 9417)
>+++ build.xml	(working copy)
>@@ -2063,7 +2063,7 @@
>     </target>
> 
>     
>-    <target name="server-build-ejb-jar" depends="config-trunk, config-flat">
>+    <target name="server-build-ejb-jar" depends="config-trunk, config-flat, check-model-name">
>         <property file="${user.home}/${server.name}.properties"/>
>         <property file="${eclipselink.jpa.test}/${server.name}.properties"/>
>         <mkdir dir="${eclipselink.jpa.test}/stage/META-INF"/>
>@@ -2270,16 +2270,127 @@
>     <target name="create-ejb-jar" depends="create-ejb-jar-without-static-weaving,create-ejb-jar-with-static-weaving"/>
> 
>     <target name="create-ejb-jar-without-static-weaving" unless="is.static.server.weaving">
>+        <antcall target="remove-composite-classes"/>
>         <jar destfile="${eclipselink.jpa.test}/${build.dir}/${MODEL_NAME}_ejb.jar" basedir="stage"/>
>     </target>
> 
>     <target name="create-ejb-jar-with-static-weaving" if="is.static.server.weaving">
>+        <antcall target="remove-composite-classes"/>
>         <jar destfile="${eclipselink.jpa.test}/${build.dir}/unwoven-${MODEL_NAME}_ejb.jar" basedir="stage"/>
>         <antcall target="run-weaver-server-test" inheritRefs="true">
>             <param name="MODEL_NAME" value="${MODEL_NAME}"/>
>         </antcall>
>     </target>
>+    <target name="check-model-name">
>+        <condition property="run.jpa.composite.advanced">
>+            <equals arg1="${MODEL_NAME}" arg2="eclipselink-composite-advanced-model" />
>+        </condition>
>+        <condition property="run.jpa.composite.advanced.member1">
>+            <equals arg1="${MODEL_NAME}" arg2="eclipselink-composite-advanced-model-member_1" />
>+        </condition>
>+        <condition property="run.jpa.composite.advanced.member2">
>+            <equals arg1="${MODEL_NAME}" arg2="eclipselink-composite-advanced-model-member_2" />
>+        </condition>
>+        <condition property="run.jpa.composite.advanced.member3">
>+            <equals arg1="${MODEL_NAME}" arg2="eclipselink-composite-advanced-model-member_3" />
>+        </condition>
>+        <condition property="run.jpa.xml.extendedornot.composite.advanced">
>+            <or>
>+                <equals arg1="${MODEL_NAME}" arg2="eclipselink-xml-composite-advanced-model" />
>+                <equals arg1="${MODEL_NAME}" arg2="eclipselink-xml-extended-composite-advanced-model" />
>+            </or>
>+        </condition>
>+        <condition property="run.jpa.xml.extendedornot.composite.advanced.member1">
>+            <or>
>+                <equals arg1="${MODEL_NAME}" arg2="eclipselink-xml-composite-advanced-model-member_1" />
>+                <equals arg1="${MODEL_NAME}" arg2="eclipselink-xml-extended-composite-advanced-model-member_1" />
>+            </or>
>+        </condition>
>+        <condition property="run.jpa.xml.extendedornot.composite.advanced.member2">
>+            <or>
>+                <equals arg1="${MODEL_NAME}" arg2="eclipselink-xml-composite-advanced-model-member_2" />
>+                <equals arg1="${MODEL_NAME}" arg2="eclipselink-xml-extended-composite-advanced-model-member_2" />
>+            </or>
>+        </condition>
>+        <condition property="run.jpa.xml.extendedornot.composite.advanced.member3">
>+            <or>
>+                <equals arg1="${MODEL_NAME}" arg2="eclipselink-xml-composite-advanced-model-member_3" />
>+                <equals arg1="${MODEL_NAME}" arg2="eclipselink-xml-extended-composite-advanced-model-member_3" />
>+            </or>
>+        </condition>
>+    </target>
> 
>+    <target name="remove-composite-classes">
>+        <antcall target="remove-composite-memeber-classes"/>
>+        <antcall target="remove-composite-memeber23-classes"/>
>+        <antcall target="remove-composite-memeber13-classes"/>
>+        <antcall target="remove-composite-memeber12-classes"/>
>+        <antcall target="remove-xml-composite-memeber-classes"/>
>+        <antcall target="remove-xml-composite-memeber23-classes"/>
>+        <antcall target="remove-xml-composite-memeber13-classes"/>
>+        <antcall target="remove-xml-composite-memeber12-classes"/>
>+    </target>
>+
>+    <target name="remove-composite-advanced-main-classes">
>+        <delete>
>+            <fileset dir="stage/org/eclipse/persistence/testing/models/jpa/composite/advanced" includes="Customizer*.class, EmployeePopulator.class"/>
>+        </delete>
>+    </target>
>+
>+    <target name="remove-xml-composite-advanced-main-classes">
>+        <delete>
>+            <fileset dir="stage/org/eclipse/persistence/testing/models/jpa/xml/composite/advanced" includes="ModelExamples.class, EmployeePopulator.class"/>
>+        </delete>
>+    </target>
>+
>+    <target name="remove-composite-memeber-classes" if="run.jpa.composite.advanced">
>+        <delete dir="stage/org/eclipse/persistence/testing/models/jpa/composite/advanced/member_1"/>
>+        <delete dir="stage/org/eclipse/persistence/testing/models/jpa/composite/advanced/member_2"/>
>+        <delete dir="stage/org/eclipse/persistence/testing/models/jpa/composite/advanced/member_3"/>
>+    </target>
>+
>+    <target name="remove-composite-memeber23-classes" if="run.jpa.composite.advanced.member1">
>+        <antcall target="remove-composite-advanced-main-classes"/>
>+        <delete dir="stage/org/eclipse/persistence/testing/models/jpa/composite/advanced/member_2"/>
>+        <delete dir="stage/org/eclipse/persistence/testing/models/jpa/composite/advanced/member_3"/>
>+    </target>
>+
>+    <target name="remove-composite-memeber13-classes" if="run.jpa.composite.advanced.member2">
>+        <antcall target="remove-composite-advanced-main-classes"/>
>+        <delete dir="stage/org/eclipse/persistence/testing/models/jpa/composite/advanced/member_1"/>
>+        <delete dir="stage/org/eclipse/persistence/testing/models/jpa/composite/advanced/member_3"/>
>+    </target>
>+
>+    <target name="remove-composite-memeber12-classes" if="run.jpa.composite.advanced.member3">
>+        <antcall target="remove-composite-advanced-main-classes"/>
>+        <delete dir="stage/org/eclipse/persistence/testing/models/jpa/composite/advanced/member_1"/>
>+        <delete dir="stage/org/eclipse/persistence/testing/models/jpa/composite/advanced/member_2"/>
>+    </target>
>+
>+    <target name="remove-xml-composite-memeber-classes" if="run.jpa.xml.extendedornot.composite.advanced">
>+        <delete dir="stage/org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/member_1"/>
>+        <delete dir="stage/org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/member_2"/>
>+        <delete dir="stage/org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/member_3"/>
>+    </target>
>+
>+    <target name="remove-xml-composite-memeber23-classes" if="run.jpa.xml.extendedornot.composite.advanced.member1">
>+        <antcall target="remove-xml-composite-advanced-main-classes"/>
>+        <delete dir="stage/org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/member_2"/>
>+        <delete dir="stage/org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/member_3"/>
>+    </target>
>+
>+    <target name="remove-xml-composite-memeber13-classes" if="run.jpa.xml.extendedornot.composite.advanced.member2">
>+        <antcall target="remove-xml-composite-advanced-main-classes"/>
>+        <delete dir="stage/org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/member_1"/>
>+        <delete dir="stage/org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/member_3"/>
>+    </target>
>+
>+    <target name="remove-xml-composite-memeber12-classes" if="run.jpa.xml.extendedornot.composite.advanced.member3">
>+        <antcall target="remove-xml-composite-advanced-main-classes"/>
>+        <delete dir="stage/org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/member_1"/>
>+        <delete dir="stage/org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/member_2"/>
>+    </target>
>+
>     <target name="copy-criteria-api-canonical-model" if="is.criteria.server.test">
>         
>         <antcall target="compile"/>
>@@ -2313,9 +2424,162 @@
>     
>     <target name="server-build" depends="prepare-non-jta-ds-servertest,prepare-server-sessionbeans,server-build-client-jar,server-build-ejb-jar,server-build-ear"/>
> 
>+    <target name="server-build-composite-advanced" depends="prepare-non-jta-ds-servertest,prepare-server-sessionbeans,server-build-client-jar,server-build-ejb-composite-advanced-jar,server-build-composite-advanced-ear"/>
>+
>+    <target name="server-build-xml-composite-advanced" depends="prepare-non-jta-ds-servertest,prepare-server-sessionbeans,server-build-client-jar,server-build-ejb-xml-composite-advanced-jar,server-build-xml-composite-advanced-ear"/>
>+
>+    <target name="server-build-xml-extended-composite-advanced" depends="prepare-non-jta-ds-servertest,prepare-server-sessionbeans,server-build-client-jar,server-build-ejb-xml-extended-composite-advanced-jar,server-build-xml-extended-composite-advanced-ear"/>
>+
>+    <target name="server-build-ejb-composite-advanced-jar">
>+        <antcall target="server-build-ejb-jar" inheritRefs="true">
>+            <param name="MODEL_DIR" value="org/eclipse/persistence/testing/models/jpa/composite/advanced"/>
>+            <param name="MODEL_NAME" value="eclipselink-composite-advanced-model"/>
>+        </antcall>
>+        <antcall target="server-build-ejb-jar" inheritRefs="true">
>+            <param name="MODEL_DIR" value="org/eclipse/persistence/testing/models/jpa/composite/advanced/member_1"/>
>+            <param name="MODEL_NAME" value="eclipselink-composite-advanced-model-member_1"/>
>+        </antcall>
>+        <antcall target="server-build-ejb-jar" inheritRefs="true">
>+            <param name="MODEL_DIR" value="org/eclipse/persistence/testing/models/jpa/composite/advanced/member_2"/>
>+            <param name="MODEL_NAME" value="eclipselink-composite-advanced-model-member_2"/>
>+        </antcall>
>+        <antcall target="server-build-ejb-jar" inheritRefs="true">
>+            <param name="MODEL_DIR" value="org/eclipse/persistence/testing/models/jpa/composite/advanced/member_3"/>
>+            <param name="MODEL_NAME" value="eclipselink-composite-advanced-model-member_3"/>
>+        </antcall>
>+    </target>
>+
>+    <target name="server-build-composite-advanced-ear">
>+        <copy overwrite="true" file="./resource/server/application.xml" todir="${build.dir}/META-INF"/>
>+        <replace dir="${build.dir}/META-INF" token='%%modelname%%' value="eclipselink-composite-advanced-model">
>+            <include name="*.xml"/>
>+        </replace>
>+        <ear destfile="${eclipselink.jpa.test}/${build.dir}/${EAR_NAME}.ear" appxml="${build.dir}/META-INF/application.xml">
>+            <fileset dir="${eclipselink.jpa.test}/${build.dir}" 
>+               includes ="eclipselink-composite-advanced-model_ejb.jar,
>+                   eclipselink-composite-advanced-model-member_1_ejb.jar,
>+                   eclipselink-composite-advanced-model-member_2_ejb.jar,
>+                   eclipselink-composite-advanced-model-member_3_ejb.jar"/>
>+        </ear>
>+        <copy file="${eclipselink.jpa.test}/${build.dir}/${EAR_NAME}.ear" todir="."/>
>+    </target>
>+
>+    <target name="server-build-ejb-xml-composite-advanced-jar">
>+        <copyfile src="${eclipselink.jpa.test}/resource/eclipselink-xml-composite-advanced-model-member_1/orm.xml" dest="${eclipselink.jpa.test}/resource/eclipselink-xml-composite-advanced-model-member_1/server/orm.xml" forceoverwrite="true"/>
>+
>+        <copyfile src="${eclipselink.jpa.test}/resource/eclipselink-xml-composite-advanced-model-member_2/orm.xml" dest="${eclipselink.jpa.test}/resource/eclipselink-xml-composite-advanced-model-member_2/server/orm.xml" forceoverwrite="true"/>
>+
>+        <copyfile src="${eclipselink.jpa.test}/resource/eclipselink-xml-composite-advanced-model-member_3/orm.xml" dest="${eclipselink.jpa.test}/resource/eclipselink-xml-composite-advanced-model-member_3/server/orm.xml" forceoverwrite="true"/>
>+
>+        <antcall target="server-build-ejb-jar" inheritRefs="true">
>+            <param name="MODEL_DIR" value="org/eclipse/persistence/testing/models/jpa/xml/composite/advanced"/>
>+            <param name="MODEL_NAME" value="eclipselink-xml-composite-advanced-model"/>
>+        </antcall>
>+        <antcall target="server-build-ejb-jar" inheritRefs="true">
>+            <param name="MODEL_DIR" value="org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/member_1"/>
>+            <param name="MODEL_NAME" value="eclipselink-xml-composite-advanced-model-member_1"/>
>+        </antcall>
>+        <antcall target="server-build-ejb-jar" inheritRefs="true">
>+            <param name="MODEL_DIR" value="org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/member_2"/>
>+            <param name="MODEL_NAME" value="eclipselink-xml-composite-advanced-model-member_2"/>
>+        </antcall>
>+        <antcall target="server-build-ejb-jar" inheritRefs="true">
>+            <param name="MODEL_DIR" value="org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/member_3"/>
>+            <param name="MODEL_NAME" value="eclipselink-xml-composite-advanced-model-member_3"/>
>+        </antcall>
>+
>+        <delete file="${eclipselink.jpa.test}/resource/eclipselink-xml-composite-advanced-model-member_1/server/orm.xml" failonerror="false"/>
>+        <delete file="${eclipselink.jpa.test}/resource/eclipselink-xml-composite-advanced-model-member_2/server/orm.xml" failonerror="false"/>
>+        <delete file="${eclipselink.jpa.test}/resource/eclipselink-xml-composite-advanced-model-member_3/server/orm.xml" failonerror="false"/>
>+    </target>
>+
>+    <target name="server-build-xml-composite-advanced-ear">
>+        <copy overwrite="true" file="./resource/server/application.xml" todir="${build.dir}/META-INF"/>
>+        <replace dir="${build.dir}/META-INF" token='%%modelname%%' value="eclipselink-xml-composite-advanced-model">
>+            <include name="*.xml"/>
>+        </replace>
>+        <ear destfile="${eclipselink.jpa.test}/${build.dir}/${EAR_NAME}.ear" appxml="${build.dir}/META-INF/application.xml">
>+            <fileset dir="${eclipselink.jpa.test}/${build.dir}" 
>+               includes ="eclipselink-xml-composite-advanced-model_ejb.jar,
>+                   eclipselink-xml-composite-advanced-model-member_1_ejb.jar,
>+                   eclipselink-xml-composite-advanced-model-member_2_ejb.jar,
>+                   eclipselink-xml-composite-advanced-model-member_3_ejb.jar"/>
>+        </ear>
>+        <copy file="${eclipselink.jpa.test}/${build.dir}/${EAR_NAME}.ear" todir="."/>
>+    </target>
>+
>+    <target name="server-build-ejb-xml-extended-composite-advanced-jar">
>+        <copy todir="${eclipselink.jpa.test}/resource/eclipselink-xml-extended-composite-advanced-model-member_1/server" overwrite="true" failonerror="false">
>+           <fileset dir="${eclipselink.jpa.test}/resource/eclipselinkorm/eclipselink-xml-extended-composite-advanced-model-member_1/" includes="eclipselink-orm.xml, advanced-extended-entity-mappings_1.xml"/>
>+        </copy>
>+        <copy todir="${eclipselink.jpa.test}/resource/eclipselink-xml-extended-composite-advanced-model-member_2/server" overwrite="true" failonerror="false">
>+            <fileset dir="${eclipselink.jpa.test}/resource/eclipselinkorm/eclipselink-xml-extended-composite-advanced-model-member_2/" includes="eclipselink-orm.xml, advanced-extended-entity-mappings_2.xml"/>
>+        </copy>
>+        <copy todir="${eclipselink.jpa.test}/resource/eclipselink-xml-extended-composite-advanced-model-member_3/server" overwrite="true" failonerror="false">
>+            <fileset dir="${eclipselink.jpa.test}/resource/eclipselinkorm/eclipselink-xml-extended-composite-advanced-model-member_3/" includes="eclipselink-orm.xml, advanced-extended-entity-mappings_3.xml"/>
>+        </copy>
>+        <antcall target="server-build-ejb-jar" inheritRefs="true">
>+            <param name="MODEL_DIR" value="org/eclipse/persistence/testing/models/jpa/xml/composite/advanced"/>
>+            <param name="MODEL_NAME" value="eclipselink-xml-extended-composite-advanced-model"/>
>+        </antcall>
>+        <antcall target="server-build-ejb-jar" inheritRefs="true">
>+            <param name="MODEL_DIR" value="org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/member_1"/>
>+            <param name="MODEL_NAME" value="eclipselink-xml-extended-composite-advanced-model-member_1"/>
>+        </antcall>
>+        <antcall target="server-build-ejb-jar" inheritRefs="true">
>+            <param name="MODEL_DIR" value="org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/member_2"/>
>+            <param name="MODEL_NAME" value="eclipselink-xml-extended-composite-advanced-model-member_2"/>
>+        </antcall>
>+        <antcall target="server-build-ejb-jar" inheritRefs="true">
>+            <param name="MODEL_DIR" value="org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/member_3"/>
>+            <param name="MODEL_NAME" value="eclipselink-xml-extended-composite-advanced-model-member_3"/>
>+        </antcall>
>+        <delete>
>+            <fileset dir="${eclipselink.jpa.test}/resource/eclipselink-xml-extended-composite-advanced-model-member_1/server/"
>+                includes="eclipselink-orm.xml, advanced-extended-entity-mappings_1.xml"/>
>+            <fileset dir="${eclipselink.jpa.test}/resource/eclipselink-xml-extended-composite-advanced-model-member_2/server/"
>+                includes="eclipselink-orm.xml, advanced-extended-entity-mappings_2.xml"/>
>+            <fileset dir="${eclipselink.jpa.test}/resource/eclipselink-xml-extended-composite-advanced-model-member_3/server/"
>+                includes="eclipselink-orm.xml,advanced-extended-entity-mappings_3.xml"/>
>+        </delete>
>+    </target>
>+
>+    <target name="server-build-xml-extended-composite-advanced-ear">
>+        <copy overwrite="true" file="./resource/server/application.xml" todir="${build.dir}/META-INF"/>
>+        <replace dir="${build.dir}/META-INF" token='%%modelname%%' value="eclipselink-xml-extended-composite-advanced-model">
>+            <include name="*.xml"/>
>+        </replace>
>+        <ear destfile="${eclipselink.jpa.test}/${build.dir}/${EAR_NAME}.ear" appxml="${build.dir}/META-INF/application.xml">
>+            <fileset dir="${eclipselink.jpa.test}/${build.dir}" 
>+               includes ="eclipselink-xml-extended-composite-advanced-model_ejb.jar,
>+                   eclipselink-xml-extended-composite-advanced-model-member_1_ejb.jar,
>+                   eclipselink-xml-extended-composite-advanced-model-member_2_ejb.jar,
>+                   eclipselink-xml-extended-composite-advanced-model-member_3_ejb.jar"/>
>+        </ear>
>+        <copy file="${eclipselink.jpa.test}/${build.dir}/${EAR_NAME}.ear" todir="."/>
>+    </target>
>     
>     <target name="server-run-all" depends="detect-os,set-server-properties">
>         <antcall target="server-build" inheritRefs="true"/>
>+        <antcall target="server-deploy-runtest-undeploy" inheritRefs="true"/>
>+    </target>
>+
>+    <target name="server-run-all-composite-advanced" depends="detect-os,set-server-properties">
>+        <antcall target="server-build-composite-advanced" inheritRefs="true"/>
>+        <antcall target="server-deploy-runtest-undeploy" inheritRefs="true"/>
>+    </target>
>+
>+    <target name="server-run-all-xml-composite-advanced" depends="detect-os,set-server-properties">
>+        <antcall target="server-build-xml-composite-advanced" inheritRefs="true"/>
>+        <antcall target="server-deploy-runtest-undeploy" inheritRefs="true"/>
>+    </target>
>+
>+    <target name="server-run-all-xml-extended-composite-advanced" depends="detect-os,set-server-properties">
>+        <antcall target="server-build-xml-extended-composite-advanced" inheritRefs="true"/>
>+        <antcall target="server-deploy-runtest-undeploy" inheritRefs="true"/>
>+    </target>
>+
>+    <target name="server-deploy-runtest-undeploy" depends="detect-os,set-server-properties">
>         <antcall target="recover-server-sessionbeans" inheritRefs="true"/>
>         <antcall target="cleanup-non-jta-ds-servertest" inheritRefs="true"/>
>         <antcall target="server-deploy" inheritRefs="true">
>@@ -2946,43 +3210,44 @@
>     </target>
> 
>     <target name="server-test-composite-advanced">
>-        <antcall target="server-run-all" inheritRefs="true">
>+        <ant antfile="${eclipselink.jpa.test}/weblogic.xml" target="weblogic-composite-setup" inheritRefs="true"/>
>+        <antcall target="server-run-all-composite-advanced" inheritRefs="true">
>             <param name="PERSISTENCE_UNIT_NAME" value="composite-advanced"/>
>-            <param name="MODEL_DIR" value="org/eclipse/persistence/testing/models/jpa/composite/advanced"/>
>-            <param name="MODEL_NAME" value="eclipselink-composite-advanced-model"/>
>             <param name="TEST_DIR" value="org/eclipse/persistence/testing/tests/jpa/composite/advanced"/>
>             <param name="TEST_NAME" value="eclipselink-composite-advanced-model"/>
>             <param name="EAR_NAME" value="eclipselink-composite-advanced-model"/>
>             <param name="TEST_SUITE" value="org.eclipse.persistence.testing.tests.jpa.composite.advanced.EntityManagerJUnitTestSuite"/>
>-            <param name="MODEL_DIR_CONTAINED_1" value="org/eclipse/persistence/testing/models/jpa/composite/advanced/contained_1"/>
>-            <param name="MODEL_NAME_CONTAINED_1" value="eclipselink-composite-advanced-model-contained_1"/>
>-            <param name="MODEL_DIR_CONTAINED_2" value="org/eclipse/persistence/testing/models/jpa/composite/advanced/contained_2"/>
>-            <param name="MODEL_NAME_CONTAINED_2" value="eclipselink-composite-advanced-model-contained_2"/>
>-            <param name="MODEL_DIR_CONTAINED_3" value="org/eclipse/persistence/testing/models/jpa/composite/advanced/contained_3"/>
>-            <param name="MODEL_NAME_CONTAINED_3" value="eclipselink-composite-advanced-model-contained_3"/>
>             <param name="eclipselink.jpa.test.dir" value="."/>
>         </antcall>
>+        <ant antfile="${eclipselink.jpa.test}/weblogic.xml" target="weblogic-composite-reset" inheritRefs="true"/>
>     </target>
> 
>     <target name="server-test-xml-composite-advanced">
>-        <antcall target="server-run-all" inheritRefs="true">
>+        <ant antfile="${eclipselink.jpa.test}/weblogic.xml" target="weblogic-composite-setup" inheritRefs="true"/>
>+        <antcall target="server-run-all-xml-composite-advanced" inheritRefs="true">
>             <param name="PERSISTENCE_UNIT_NAME" value="xml-composite-advanced"/>
>-            <param name="MODEL_DIR" value="org/eclipse/persistence/testing/models/jpa/xml/composite"/>
>-            <param name="MODEL_NAME" value="eclipselink-xml-composite-advanced-model"/>
>             <param name="TEST_DIR" value="org/eclipse/persistence/testing/tests/jpa/xml/composite"/>
>             <param name="TEST_NAME" value="eclipselink-xml-composite-advanced-model"/>
>             <param name="EAR_NAME" value="eclipselink-xml-composite-advanced-model"/>
>-            
>-            <param name="MODEL_DIR_CONTAINED_1" value="org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/contained_1"/>
>-            <param name="MODEL_NAME_CONTAINED_1" value="eclipselink-xml-composite-advanced-model-contained_1"/>
>-            <param name="MODEL_DIR_CONTAINED_2" value="org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/contained_2"/>
>-            <param name="MODEL_NAME_CONTAINED_2" value="eclipselink-xml-composite-advanced-model-contained_2"/>
>-            <param name="MODEL_DIR_CONTAINED_3" value="org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/contained_3"/>
>-            <param name="MODEL_NAME_CONTAINED_3" value="eclipselink-xml-composite-advanced-model-contained_3"/>
>+            <param name="TEST_SUITE" value="org.eclipse.persistence.testing.tests.jpa.xml.composite.advanced.EntityMappingsAdvancedJUnitTestCase"/>
>             <param name="eclipselink.jpa.test.dir" value="."/>
>         </antcall>
>+        <ant antfile="${eclipselink.jpa.test}/weblogic.xml" target="weblogic-composite-reset" inheritRefs="true"/>
>     </target>
> 
>+    <target name="server-test-xml-extended-composite-advanced">
>+        <ant antfile="${eclipselink.jpa.test}/weblogic.xml" target="weblogic-composite-setup" inheritRefs="true"/>
>+        <antcall target="server-run-all-xml-extended-composite-advanced" inheritRefs="true">
>+            <param name="PERSISTENCE_UNIT_NAME" value="xml-extended-composite-advanced"/>
>+            <param name="TEST_DIR" value="org/eclipse/persistence/testing/tests/jpa/xml/composite"/>
>+            <param name="TEST_NAME" value="eclipselink-xml-extended-composite-advanced-model"/>
>+            <param name="EAR_NAME" value="eclipselink-xml-extended-composite-advanced-model"/>
>+            <param name="TEST_SUITE" value="org.eclipse.persistence.testing.tests.jpa.xml.composite.advanced.EntityMappingsAdvancedJUnitTestCase"/>
>+            <param name="eclipselink.jpa.test.dir" value="."/>
>+        </antcall>
>+        <ant antfile="${eclipselink.jpa.test}/weblogic.xml" target="weblogic-composite-reset" inheritRefs="true"/>
>+    </target>
>+
>     <target name="server-test-oracle-timestamptz" if="is.oracle">
>         <antcall target="server-run-all" inheritRefs="true">
>             <param name="PERSISTENCE_UNIT_NAME" value="default"/>
>Index: resource/eclipselink-composite-advanced-model/server/persistence.xml
>===================================================================
>--- resource/eclipselink-composite-advanced-model/server/persistence.xml	(revision 9324)
>+++ resource/eclipselink-composite-advanced-model/server/persistence.xml	(working copy)
>@@ -3,11 +3,11 @@
>         <provider>
>             org.eclipse.persistence.jpa.PersistenceProvider
>         </provider>
>+        <%%datasource-type%%>%%data-source-name%%</%%datasource-type%%>
>+        <jar-file>eclipselink-composite-advanced-model-member_1_ejb.jar</jar-file>
>+        <jar-file>eclipselink-composite-advanced-model-member_2_ejb.jar</jar-file>
>+        <jar-file>eclipselink-composite-advanced-model-member_3_ejb.jar</jar-file>
> 
>-        <jar-file>eclipselink-composite-advanced-model-member_1.jar</jar-file>
>-        <jar-file>eclipselink-composite-advanced-model-member_2.jar</jar-file>
>-        <jar-file>eclipselink-composite-advanced-model-member_3.jar</jar-file>
>-
>         <properties>
>             <property name="eclipselink.target-server" value="%%server-platform%%"/>
>             <property name="eclipselink.composite-unit" value="true"/>
>@@ -15,7 +15,7 @@
>             <property name="eclipselink.persistence-context.reference-mode" value="WEAK"/>
>             <property name="eclipselink.validate-existence" value="true"/>
> 			<property name="eclipselink.logging.parameters" value="true"/>
>-			<property name="eclipselink.logging.logger" value="DefaultLogger"/>
>+			
>         </properties>
>     </persistence-unit>
> </persistence>
>Index: resource/eclipselink-xml-composite-advanced-model/server/persistence.xml
>===================================================================
>--- resource/eclipselink-xml-composite-advanced-model/server/persistence.xml	(revision 9324)
>+++ resource/eclipselink-xml-composite-advanced-model/server/persistence.xml	(working copy)
>@@ -3,16 +3,16 @@
>         <provider>
>             org.eclipse.persistence.jpa.PersistenceProvider
>         </provider>
>+        <%%datasource-type%%>%%data-source-name%%</%%datasource-type%%>
>+        <jar-file>eclipselink-xml-composite-advanced-model-member_1_ejb.jar</jar-file>
>+        <jar-file>eclipselink-xml-composite-advanced-model-member_2_ejb.jar</jar-file>
>+        <jar-file>eclipselink-xml-composite-advanced-model-member_3_ejb.jar</jar-file>
> 
>-        <jar-file>eclipselink-xml-composite-advanced-model-member_1.jar</jar-file>
>-        <jar-file>eclipselink-xml-composite-advanced-model-member_2.jar</jar-file>
>-        <jar-file>eclipselink-xml-composite-advanced-model-member_3.jar</jar-file>
>-
>         <properties>
>             <property name="eclipselink.target-server" value="%%server-platform%%"/>
>             <property name="eclipselink.composite-unit" value="true"/>
> 			<property name="eclipselink.logging.parameters" value="true"/>
>-			<property name="eclipselink.logging.logger" value="DefaultLogger"/>
>+			
>         </properties>
>     </persistence-unit>
> </persistence>
>Index: resource/eclipselink-xml-extended-composite-advanced-model-member_1/server/persistence.xml
>===================================================================
>--- resource/eclipselink-xml-extended-composite-advanced-model-member_1/server/persistence.xml	(revision 0)
>+++ resource/eclipselink-xml-extended-composite-advanced-model-member_1/server/persistence.xml	(revision 0)
>@@ -0,0 +1,16 @@
>+<persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence persistence_1_0.xsd" version="1.0">
>+    <persistence-unit name="xml-composite-advanced-member_1" transaction-type="%%transaction-type%%">
>+        <provider>
>+            org.eclipse.persistence.jpa.PersistenceProvider
>+        </provider>
>+        <mapping-file>META-INF/advanced-extended-entity-mappings_1.xml</mapping-file>
>+        <%%datasource-type%%>%%data-source-name%%</%%datasource-type%%>
>+        <exclude-unlisted-classes>false</exclude-unlisted-classes>
>+        <properties>
>+            <property name="eclipselink.target-database" value="%%database-platform%%"/>
>+            
>+			<property name="eclipselink.logging.parameters" value="true"/>
>+			<property name="eclipselink.logging.logger" value="DefaultLogger"/>
>+        </properties>
>+    </persistence-unit>
>+</persistence>
>Index: resource/eclipselink-xml-extended-composite-advanced-model-member_2/server/persistence.xml
>===================================================================
>--- resource/eclipselink-xml-extended-composite-advanced-model-member_2/server/persistence.xml	(revision 0)
>+++ resource/eclipselink-xml-extended-composite-advanced-model-member_2/server/persistence.xml	(revision 0)
>@@ -0,0 +1,14 @@
>+<persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence persistence_1_0.xsd" version="1.0">
>+    <persistence-unit name="xml-composite-advanced-member_2" transaction-type="%%transaction-type%%">
>+        <provider>
>+            org.eclipse.persistence.jpa.PersistenceProvider
>+        </provider>
>+        <mapping-file>META-INF/advanced-extended-entity-mappings_2.xml</mapping-file>
>+        <%%datasource-type%%>%%data-source2-name%%</%%datasource-type%%>
>+        <exclude-unlisted-classes>false</exclude-unlisted-classes>
>+        <properties>
>+            <property name="eclipselink.target-database" value="%%database2-platform%%"/>
>+            <property name="eclipselink.composite-unit.member" value="true"/>
>+        </properties>
>+    </persistence-unit>
>+</persistence>
>Index: resource/eclipselink-xml-extended-composite-advanced-model-member_3/server/persistence.xml
>===================================================================
>--- resource/eclipselink-xml-extended-composite-advanced-model-member_3/server/persistence.xml	(revision 0)
>+++ resource/eclipselink-xml-extended-composite-advanced-model-member_3/server/persistence.xml	(revision 0)
>@@ -0,0 +1,14 @@
>+<persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence persistence_1_0.xsd" version="1.0">
>+    <persistence-unit name="xml-composite-advanced-member_3" transaction-type="%%transaction-type%%">
>+        <provider>
>+            org.eclipse.persistence.jpa.PersistenceProvider
>+        </provider>
>+        <mapping-file>META-INF/advanced-extended-entity-mappings_3.xml</mapping-file>
>+        <%%datasource-type%%>%%data-source3-name%%</%%datasource-type%%>
>+        <exclude-unlisted-classes>false</exclude-unlisted-classes>
>+        <properties>
>+            <property name="eclipselink.target-database" value="%%database3-platform%%"/>
>+            <property name="eclipselink.composite-unit.member" value="true"/>
>+        </properties>
>+    </persistence-unit>
>+</persistence>
>Index: resource/eclipselink-xml-extended-composite-advanced-model/server/persistence.xml
>===================================================================
>--- resource/eclipselink-xml-extended-composite-advanced-model/server/persistence.xml	(revision 0)
>+++ resource/eclipselink-xml-extended-composite-advanced-model/server/persistence.xml	(revision 0)
>@@ -0,0 +1,18 @@
>+<persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence persistence_1_0.xsd" version="1.0">
>+    <persistence-unit name="xml-extended-composite-advanced" transaction-type="%%transaction-type%%">
>+        <provider>
>+            org.eclipse.persistence.jpa.PersistenceProvider
>+        </provider>
>+        <%%datasource-type%%>%%data-source-name%%</%%datasource-type%%>
>+        <jar-file>eclipselink-xml-extended-composite-advanced-model-member_1_ejb.jar</jar-file>
>+        <jar-file>eclipselink-xml-extended-composite-advanced-model-member_2_ejb.jar</jar-file>
>+        <jar-file>eclipselink-xml-extended-composite-advanced-model-member_3_ejb.jar</jar-file>
>+
>+        <properties>
>+            <property name="eclipselink.target-server" value="%%server-platform%%"/>
>+            <property name="eclipselink.composite-unit" value="true"/>
>+			<property name="eclipselink.logging.parameters" value="true"/>
>+			<property name="eclipselink.logging.logger" value="DefaultLogger"/>
>+        </properties>
>+    </persistence-unit>
>+</persistence>
>Index: resource/weblogic/wls_composite_reset.py
>===================================================================
>--- resource/weblogic/wls_composite_reset.py	(revision 0)
>+++ resource/weblogic/wls_composite_reset.py	(revision 0)
>@@ -0,0 +1,25 @@
>+############################################################################  
>+# Generic script applicable on any Operating Environments (Unix, Windows)  
>+# ScriptName    : wls_reset.py  
>+# Properties    : weblogic.properties  
>+# Author        : Kevin Yuan  
>+############################################################################   
>+
>+#===========================================================================
>+# Connect to wls server
>+#===========================================================================
>+
>+connect('%%WL_USR%%','%%WL_PWD%%','t3://%%WL_HOST%%:%%WL_PORT%%')
>+
>+#===========================================================================
>+# Remove Data Sources using wlst on-line commonds for three composite models
>+#===========================================================================
>+
>+edit()
>+startEdit()
>+delete('EclipseLinkDS','JDBCSystemResource')
>+delete('EclipseLinkDS2','JDBCSystemResource')
>+delete('EclipseLinkDS3','JDBCSystemResource')
>+save()
>+activate()
>+exit()
>\ No newline at end of file
>Index: resource/weblogic/wls_composite_setup.py
>===================================================================
>--- resource/weblogic/wls_composite_setup.py	(revision 0)
>+++ resource/weblogic/wls_composite_setup.py	(revision 0)
>@@ -0,0 +1,141 @@
>+############################################################################  
>+# Generic script applicable on any Operating Environments (Unix, Windows)  
>+# ScriptName    : wls_setup.py  
>+# Properties    : weblogic.properties test.properties 
>+# Author        : Kevin Yuan  
>+############################################################################   
>+
>+#===========================================================================
>+# Connect to wls server
>+#===========================================================================
>+
>+connect('%%WL_USR%%','%%WL_PWD%%','t3://%%WL_HOST%%:%%WL_PORT%%')
>+
>+#===========================================================================
>+# Create and configure JTA Data Source and target it to the server.
>+#===========================================================================
>+
>+edit()
>+startEdit()
>+
>+# Create EclipseLinkDS for server-test-lrg
>+
>+cd('/')
>+cmo.createJDBCSystemResource('EclipseLinkDS')
>+
>+cd('/JDBCSystemResources/EclipseLinkDS/JDBCResource/EclipseLinkDS')
>+cmo.setName('EclipseLinkDS')
>+
>+cd('/JDBCSystemResources/EclipseLinkDS/JDBCResource/EclipseLinkDS/JDBCDataSourceParams/EclipseLinkDS')
>+set('JNDINames',jarray.array([String('jdbc/EclipseLinkDS')], String))
>+
>+cd('/JDBCSystemResources/EclipseLinkDS/JDBCResource/EclipseLinkDS/JDBCDriverParams/EclipseLinkDS')
>+cmo.setUrl('%%DBURL%%')
>+cmo.setDriverName('%%DBDRV%%')
>+set('PasswordEncrypted','%%DBPWD%%')
>+
>+cd('/JDBCSystemResources/EclipseLinkDS/JDBCResource/EclipseLinkDS/JDBCConnectionPoolParams/EclipseLinkDS')
>+cmo.setTestTableName('SQL SELECT 1 FROM DUAL')
>+
>+cd('/JDBCSystemResources/EclipseLinkDS/JDBCResource/EclipseLinkDS/JDBCDriverParams/EclipseLinkDS/Properties/EclipseLinkDS')
>+cmo.createProperty('user')
>+
>+cd('/JDBCSystemResources/EclipseLinkDS/JDBCResource/EclipseLinkDS/JDBCDriverParams/EclipseLinkDS/Properties/EclipseLinkDS/Properties/user')
>+cmo.setValue('%%DBUSR%%')
>+
>+#cd('/JDBCSystemResources/EclipseLinkDS/JDBCResource/EclipseLinkDS/JDBCDataSourceParams/EclipseLinkDS')
>+#cmo.setGlobalTransactionsProtocol('OnePhaseCommit')
>+
>+cd('/SystemResources/EclipseLinkDS')
>+set('Targets',jarray.array([ObjectName('com.bea:Name=myserver,Type=Server')], ObjectName))
>+
>+# Create EclipseLinkDS2 for server-test-composite-advanced (DB2)
>+
>+cd('/')
>+cmo.createJDBCSystemResource('EclipseLinkDS2')
>+
>+cd('/JDBCSystemResources/EclipseLinkDS2/JDBCResource/EclipseLinkDS2')
>+cmo.setName('EclipseLinkDS2')
>+
>+cd('/JDBCSystemResources/EclipseLinkDS2/JDBCResource/EclipseLinkDS2/JDBCDataSourceParams/EclipseLinkDS2')
>+set('JNDINames',jarray.array([String('jdbc/EclipseLinkDS2')], String))
>+
>+cd('/JDBCSystemResources/EclipseLinkDS2/JDBCResource/EclipseLinkDS2/JDBCDriverParams/EclipseLinkDS2')
>+cmo.setUrl('%%DB2URL%%')
>+cmo.setDriverName('%%DB2DRV%%')
>+set('PasswordEncrypted','%%DB2PWD%%')
>+
>+cd('/JDBCSystemResources/EclipseLinkDS2/JDBCResource/EclipseLinkDS2/JDBCConnectionPoolParams/EclipseLinkDS2')
>+cmo.setTestTableName('SQL SELECT 1 FROM DUAL')
>+
>+cd('/JDBCSystemResources/EclipseLinkDS2/JDBCResource/EclipseLinkDS2/JDBCDriverParams/EclipseLinkDS2/Properties/EclipseLinkDS2')
>+cmo.createProperty('user')
>+
>+cd('/JDBCSystemResources/EclipseLinkDS2/JDBCResource/EclipseLinkDS2/JDBCDriverParams/EclipseLinkDS2/Properties/EclipseLinkDS2/Properties/user')
>+cmo.setValue('%%DB2USR%%')
>+
>+cd('/JDBCSystemResources/EclipseLinkDS2/JDBCResource/EclipseLinkDS2/JDBCDriverParams/EclipseLinkDS2/Properties/EclipseLinkDS2')
>+cmo.createProperty('portNumber')
>+
>+cd('/JDBCSystemResources/EclipseLinkDS2/JDBCResource/EclipseLinkDS2/JDBCDriverParams/EclipseLinkDS2/Properties/EclipseLinkDS2/Properties/portNumber')
>+cmo.setValue('50000')
>+
>+cd('/JDBCSystemResources/EclipseLinkDS2/JDBCResource/EclipseLinkDS2/JDBCDriverParams/EclipseLinkDS2/Properties/EclipseLinkDS2')
>+cmo.createProperty('databaseName')
>+
>+cd('/JDBCSystemResources/EclipseLinkDS2/JDBCResource/EclipseLinkDS2/JDBCDriverParams/EclipseLinkDS2/Properties/EclipseLinkDS2/Properties/databaseName')
>+cmo.setValue('TOPLINK2')
>+
>+cd('/JDBCSystemResources/EclipseLinkDS2/JDBCResource/EclipseLinkDS2/JDBCDriverParams/EclipseLinkDS2/Properties/EclipseLinkDS2')
>+cmo.createProperty('serverName')
>+
>+cd('/JDBCSystemResources/EclipseLinkDS2/JDBCResource/EclipseLinkDS2/JDBCDriverParams/EclipseLinkDS2/Properties/EclipseLinkDS2/Properties/serverName')
>+cmo.setValue('ottvm046.ca.oracle.com')
>+
>+cd('/JDBCSystemResources/EclipseLinkDS2/JDBCResource/EclipseLinkDS2/JDBCDataSourceParams/EclipseLinkDS2')
>+cmo.setGlobalTransactionsProtocol('TwoPhaseCommit')
>+
>+cd('/SystemResources/EclipseLinkDS2')
>+set('Targets',jarray.array([ObjectName('com.bea:Name=myserver,Type=Server')], ObjectName))
>+
>+# Create EclipseLinkDS3 for server-test-composite-advanced (MySQL)
>+
>+cd('/')
>+cmo.createJDBCSystemResource('EclipseLinkDS3')
>+
>+cd('/JDBCSystemResources/EclipseLinkDS3/JDBCResource/EclipseLinkDS3')
>+cmo.setName('EclipseLinkDS3')
>+
>+cd('/JDBCSystemResources/EclipseLinkDS3/JDBCResource/EclipseLinkDS3/JDBCDataSourceParams/EclipseLinkDS3')
>+set('JNDINames',jarray.array([String('jdbc/EclipseLinkDS3')], String))
>+
>+cd('/JDBCSystemResources/EclipseLinkDS3/JDBCResource/EclipseLinkDS3/JDBCDriverParams/EclipseLinkDS3')
>+cmo.setUrl('%%DB3URL%%')
>+cmo.setDriverName('%%DB3DRV%%')
>+set('PasswordEncrypted','%%DB3PWD%%')
>+
>+cd('/JDBCSystemResources/EclipseLinkDS3/JDBCResource/EclipseLinkDS3/JDBCConnectionPoolParams/EclipseLinkDS3')
>+cmo.setTestTableName('SQL SELECT 1 FROM DUAL')
>+
>+cd('/JDBCSystemResources/EclipseLinkDS3/JDBCResource/EclipseLinkDS3/JDBCDriverParams/EclipseLinkDS3/Properties/EclipseLinkDS3')
>+cmo.createProperty('user')
>+
>+cd('/JDBCSystemResources/EclipseLinkDS3/JDBCResource/EclipseLinkDS3/JDBCDriverParams/EclipseLinkDS3/Properties/EclipseLinkDS3/Properties/user')
>+cmo.setValue('%%DB3USR%%')
>+
>+cd('/JDBCSystemResources/EclipseLinkDS3/JDBCResource/EclipseLinkDS3/JDBCDataSourceParams/EclipseLinkDS3')
>+cmo.setGlobalTransactionsProtocol('EmulateTwoPhaseCommit')
>+
>+cd('/SystemResources/EclipseLinkDS3')
>+set('Targets',jarray.array([ObjectName('com.bea:Name=myserver,Type=Server')], ObjectName))
>+
>+save()
>+activate()
>+
>+#===========================================================================
>+# Exit WLST.
>+#===========================================================================
>+
>+exit()
>+
>+
>Index: weblogic.xml
>===================================================================
>--- weblogic.xml	(revision 9386)
>+++ weblogic.xml	(working copy)
>@@ -117,6 +117,14 @@
>             <replacefilter token="%%DBURL%%" value="${db.url}"/>
>             <replacefilter token="%%DBUSR%%" value="${db.user}"/>
>             <replacefilter token="%%DBPWD%%" value="${db.pwd}"/>
>+            <replacefilter token="%%DB2DRV%%" value="${db2.driver}"/>
>+            <replacefilter token="%%DB2URL%%" value="${db2.url}"/>
>+            <replacefilter token="%%DB2USR%%" value="${db2.user}"/>
>+            <replacefilter token="%%DB2PWD%%" value="${db2.pwd}"/>
>+            <replacefilter token="%%DB3DRV%%" value="${db3.driver}"/>
>+            <replacefilter token="%%DB3URL%%" value="${db3.url}"/>
>+            <replacefilter token="%%DB3USR%%" value="${db3.user}"/>
>+            <replacefilter token="%%DB3PWD%%" value="${db3.pwd}"/>
>         </replace>
>     </target>
> 
>@@ -199,6 +207,30 @@
>         </java>
>     </target>
> 
>+    
>+    <target name="weblogic-composite-setup">
>+        <copy todir="${eclipselink.jpa.test}/${temp.dir}" overwrite="true">
>+            <fileset dir="${eclipselink.jpa.test}/resource/weblogic" includes="wls_composite*.py"/>
>+        </copy>
>+        <antcall target="pass-weblogic-and-database-info" inheritRefs="true"/>
>+        <java classname="weblogic.WLST" fork="yes">
>+            <arg line="${eclipselink.jpa.test}/${temp.dir}/wls_composite_setup.py"/>
>+            <classpath>
>+                <path refid="wls.path"/>
>+            </classpath>
>+        </java>
>+    </target>
>+
>+    
>+    <target name="weblogic-composite-reset">
>+        <java classname="weblogic.WLST" fork="yes">
>+            <arg line="${eclipselink.jpa.test}/${temp.dir}/wls_composite_reset.py"/>
>+            <classpath>
>+                <path refid="wls.path"/>
>+            </classpath>
>+        </java>
>+    </target>
>+
>     
>     <target name="weblogic-stop">
>         <java classname="weblogic.WLST" fork="yes">

Actions: View | Diff

Attachments on bug 346335: 196116