Attachment 167773 Details for Bug 311782 – patch file

[patch] patch file

311782.patch (text/plain), 11.37 KB, created by Edwin Tang

on 2010-05-10 14:13:53 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Edwin Tang

Created: 2010-05-10 14:13:53 EDT

Size: 11.37 KB

patch

obsolete

>Index: sdo/eclipselink.sdo.test.server/build.properties
>===================================================================
>--- sdo/eclipselink.sdo.test.server/build.properties	(revision 0)
>+++ sdo/eclipselink.sdo.test.server/build.properties	(revision 0)
>@@ -0,0 +1,30 @@
>+# Edit this property to point at your junit.jar
>+junit.lib=../../../extension.lib.external/junit.jar
>+
>+# Edit this property to "true" to enable debug attributes like lines, variables and source-filename
>+javac.debug=true
>+javac.debuglevel=lines,vars,source
>+
>+# Edit this property when you would like to override the java version during testing
>+javac.version=1.5
>+
>+# Do not edit the variables below
>+# They may, however, be overridden in parent scripts
>+commonj.sdo.jar=commonj.sdo_2.1.1.v200905221342.jar
>+jaxb-api.jar=javax.xml.bind_2.1.12.v200912160909.jar
>+
>+eclipselink.core.depend=javax.activation_1.1.0.v200906290531.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.v201001131653.jar,javax.transaction_1.1.0.v201002051055.jar,javax.mail_1.4.0.v200804091730.jar
>+
>+eclipselink.jar=eclipselink.jar
>+eclipselink.plugins=../../plugins
>+
>+unsigned.persistence10.jar=javax.persistence_unsigned_for_testing_1.0.0.jar
>+
>+tmp.dir=tmp
>+src.dir=src
>+classes.dir=classes
>+resource.dir=resource
>+report.dir=report
>+
>+asm=org.eclipse.persistence.asm
>+
>Index: sdo/eclipselink.sdo.test.server/build.xml
>===================================================================
>--- sdo/eclipselink.sdo.test.server/build.xml	(revision 0)
>+++ sdo/eclipselink.sdo.test.server/build.xml	(revision 0)
>@@ -0,0 +1,194 @@
>+<?xml version="1.0"?>
>+
>+<project name="eclipselink.sdo.test.server" default="test" basedir=".">
>+    <property name="env" environment="env" value="env"/>
>+
>+    <available file="../${ant.project.name}" type="dir" property="sdotest.is.local"/>
>+    <fail message="Not running from '${ant.project.name}' directory" unless="sdotest.is.local"/>
>+
>+    <dirname  property="sdotest.build.location" file="${ant.file.org.eclipse.persistence.core}"/>
>+    <echo message="sdotest.build.location = '${sdotest.build.location}'"/>
>+
>+    <condition property="sdotest.2.base.dir" value="../.." else="..">
>+        <contains string="${sdotest.build.location}" substring="sdo"/>
>+    </condition>
>+    <property name="sdotest.2.common.plugins.dir" value="${sdotest.2.base.dir}/plugins"/>
>+    <property name="sdotest.plugins.dir" value="../plugins"/>
>+
>+    <property file="${user.home}/build.properties"/>
>+    <property file="./build.properties"/>
>+    <property file="./test.properties"/>
>+    <property file="${user.home}/${server.name}.properties"/>
>+    <property file="${sdotest.2.base.dir}/jpa/eclipselink.jpa.test/${server.name}.properties"/>
>+
>+    
>+    <path id="sdotest.thirdparty.compile.path">
>+        <pathelement path="${sdotest.2.common.plugins.dir}/${unsigned.persistence10.jar}"/>
>+        <fileset
>+            dir="${sdotest.2.common.plugins.dir}"
>+            includes="
>+               ${eclipselink.core.depend},
>+            "/>
>+        <pathelement path="${junit.lib}"/>
>+        <pathelement path="${sdotest.plugins.dir}/${commonj.sdo.jar}"/>
>+        <pathelement path="${sdotest.2.common.plugins.dir}/${jaxb-api.lib}"/>
>+    </path>
>+    
>+    <path id="sdotest.thirdparty.run.path">
>+        <fileset dir="${server.lib}" includes="${server.depend}"/>
>+        <pathelement path="${sdotest.2.common.plugins.dir}/${asm}"/>
>+    </path>
>+    <path id="sdotest.compile.against.jar.path">
>+        <pathelement path="${sdotest.2.base.dir}/${eclipselink.jar}"/>
>+        <path refid="sdotest.thirdparty.compile.path"/>
>+    </path>
>+    <path id="sdotest.run.against.jar.path">
>+        <pathelement path="${tmp.dir}/deptApp.jar"/>
>+        <path refid="sdotest.compile.against.jar.path"/>
>+        <path refid="sdotest.thirdparty.run.path"/>
>+    </path>
>+
>+    <target name="clean" description="clean the build">
>+        <delete includeEmptyDirs="true" failonerror="false">
>+            <fileset dir="${classes.dir}"/>
>+        </delete>
>+        <mkdir dir="${classes.dir}"/>
>+        <mkdir dir="${tmp.dir}"/>
>+        <mkdir dir="${report.dir}"/>
>+    </target>
>+
>+    <target name="compile" depends="clean">
>+        <javac
>+            srcdir="${src.dir}"
>+            destdir="${classes.dir}"
>+            debug="${javac.debug}"
>+            debuglevel="${javac.debuglevel}"
>+            optimize="${javac.optimize}"
>+            source="${javac.version}"
>+            target="${javac.version}"
>+            deprecation="${javac.deprecation}"
>+            failonerror="true"
>+            includes="org/eclipse/persistence/testing/sdo/**/*.java">
>+            <classpath>
>+                <path refid="sdotest.compile.against.jar.path"/>
>+            </classpath>
>+        </javac>
>+    </target>
>+
>+    <target name="build-ejb-jar" depends="compile">
>+      <copy todir="${classes.dir}">
>+        <fileset dir="${resource.dir}"/>
>+      </copy>
>+      <zip 
>+        destfile="${tmp.dir}/deptApp.jar"
>+        basedir="${classes.dir}"
>+        excludes="org/eclipse/persistence/testing/sdo/server/server/DeptServiceClient*.class" />
>+    </target>
>+
>+    <target name="build-app-ear" depends="build-ejb-jar">
>+      <zip 
>+        destfile="./deptApp.ear"
>+        basedir="${tmp.dir}" />
>+    </target>
>+
>+    <target name="detect-server">
>+        <condition property="session.bean" value="DeptServiceBean#org.eclipse.persistence.testing.sdo.server.DeptService">
>+            <contains string="${server.name}" substring="weblogic"/>
>+        </condition>
>+        <condition property="session.bean" value="ejb/deptApp/deptApp.jar/org.eclipse.persistence.testing.sdo.server.DeptServiceBean#org.eclipse.persistence.testing.sdo.server.DeptService">
>+            <contains string="${server.name}" substring="websphere"/>
>+        </condition>
>+        <condition property="is.websphere" value="true">
>+            <contains string="${server.name}" substring="websphere"/>
>+        </condition>
>+        <condition property="session.bean" value="deptApp/org.eclipse.persistence.testing.sdo.server.DeptServiceBean/remote-org.eclipse.persistence.testing.sdo.server.DeptService">
>+            <contains string="${server.name}" substring="jboss"/>
>+        </condition>
>+    </target>
>+
>+    <target name="create-ejb-stubs" depends="detect-server" if="is.websphere">
>+        <condition property="suffix" value="sh">
>+            <os family="unix"/>
>+        </condition>
>+        <condition property="suffix" value="bat">
>+            <os family="windows"/>
>+        </condition>
>+        <exec executable="${was.home}/bin/createEJBStubs.${suffix}">
>+            <arg line="${tmp.dir}/deptApp.jar"/>
>+        </exec>
>+    </target>
>+
>+    <target name="server-deploy">
>+        <ant antfile="${sdotest.2.base.dir}/jpa/eclipselink.jpa.test/${server.name}.xml" target="${server.name}-deploy" inheritRefs="true">
>+            <property name="ear.name" value="${ear.name}"/>
>+            <property name="application.name" value="${application.name}"/>
>+        </ant>
>+    </target>
>+
>+    <target name="server-undeploy">
>+        <ant antfile="${sdotest.2.base.dir}/jpa/eclipselink.jpa.test/${server.name}.xml" target="${server.name}-undeploy" inheritRefs="true">
>+            <property name="application.name" value="${application.name}"/>
>+        </ant>
>+    </target>
>+
>+    <target name="generate-report">
>+        <junitreport todir="${report.dir}">
>+            <fileset dir="${report.dir}">
>+                <include name="**/*.xml"/>
>+            </fileset>
>+            <report format="noframes" todir="${report.dir}"/>
>+        </junitreport>
>+    </target>
>+
>+    <target name="test" depends="build-app-ear,create-ejb-stubs">
>+        <antcall target="server-deploy" inheritRefs="true">
>+            <param name="ear.name" value="deptApp.ear"/>
>+            <param name="application.name" value="deptApp"/>
>+        </antcall>
>+        <junit printsummary="yes" haltonfailure="no" failureproperty="junit.failed" fork="yes" showoutput="true" maxmemory="256m" tempdir="${tmp.dir}" dir="${classes.dir}">
>+            <sysproperty key="initialCtxFactory" value="${server.factory}"/>
>+            <sysproperty key="securityPrincipal" value="${server.user}"/>
>+            <sysproperty key="securityCredentials" value="${server.pwd}"/>
>+            <sysproperty key="providerUrl" value="${server.url}"/>
>+            <sysproperty key="sessionBean" value="${session.bean}"/>
>+            <classpath refid="sdotest.run.against.jar.path"/>
>+            <formatter type="xml"/>
>+            <test name="org.eclipse.persistence.testing.sdo.server.DeptServiceClientTestSuite" haltonfailure="no" todir="${report.dir}"/>
>+        </junit>
>+        <antcall target="server-undeploy" inheritRefs="true">
>+            <param name="application.name" value="deptApp.ear"/>
>+        </antcall>
>+        <antcall target="generate-report" inheritRefs="true"/>
>+    </target>
>+</project>
>Index: sdo/eclipselink.sdo.test.server/test.properties
>===================================================================
>--- sdo/eclipselink.sdo.test.server/test.properties	(revision 0)
>+++ sdo/eclipselink.sdo.test.server/test.properties	(revision 0)
>@@ -0,0 +1,9 @@
>+# Server properties
>+# Valid values of server.name are weblogic, websphere and jboss
>+server.name=weblogic
>+
>+# server.name=websphere
>+
>+# For jboss version, the default is Community version, 'eap' stands for Enterprise Application Platform version
>+# server.name=jboss
>+# server.version=eap
>\ No newline at end of file

Actions: View | Diff

Attachments on bug 311782: 167773 | 167793 | 168423 | 168751