tck: r1705 - in /axis-tck/trunk/saaj: build.properties build.xml readme.txt saajtck_build.properties

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

tck: r1705 - in /axis-tck/trunk/saaj: build.properties build.xml readme.txt saajtck_build.properties

dims-2
Author: dims
Date: Fri Dec 22 13:41:57 2006
New Revision: 1705

Log:
automate the latest saaj tck

Removed:
    axis-tck/trunk/saaj/build.properties
    axis-tck/trunk/saaj/saajtck_build.properties
Modified:
    axis-tck/trunk/saaj/build.xml
    axis-tck/trunk/saaj/readme.txt

Modified: axis-tck/trunk/saaj/build.xml
==============================================================================
--- axis-tck/trunk/saaj/build.xml (original)
+++ axis-tck/trunk/saaj/build.xml Fri Dec 22 13:41:57 2006
@@ -1,85 +1,92 @@
 <?xml version="1.0"?>
-<project name="saaj-tck" default="copyWars">
- <property environment="env"/>
- <property name="axis.dir" location="/apache/axis"/>
- <property name="builder.dir" location="${basedir}/work/builder"/>
- <property name="tomcat.dir" location="${basedir}/work/jakarta-tomcat-4.1.31"/>
- <property name="webapps.dir" location="${tomcat.dir}/webapps/axis"/>
- <property name="ts.home" location="${basedir}/work/saajtck"/>
- <property name="ts.work" location="${basedir}/work/builder"/>
-
- <path id="classpath.id">
- <fileset dir="${ts.home}/lib">
- <include name="tsharness.jar"/>
- </fileset>
- </path>
-
- <target name="refresh">
- <ant dir="${axis.dir}" target="compile"/>
- <copy todir="${tomcat.dir}/common/lib">
- <fileset dir="${axis.dir}/build/lib">
- <exclude name="*servlet*.jar"/>
- </fileset>
- </copy>
- </target>
-
- <target name="all">
- <mkdir dir="${basedir}/work"/>
- <unzip src="${basedir}/../tckresources/jakarta-tomcat-4.1.31.zip" dest="${basedir}/work"/>
- <copy file="${basedir}/../lib/xercesImpl.jar" todir="${tomcat.dir}/common/endorsed" overwrite="yes"/>
- <copy file="${basedir}/../lib/xmlParserAPIs.jar" todir="${tomcat.dir}/common/endorsed" overwrite="yes"/>
-
- <copy todir="${axis.dir}/lib">
- <fileset dir="${basedir}/../lib"/>
- </copy>
- <delete dir="${axis.dir}/build"/>
- <ant dir="${axis.dir}" target="dist"/>
-
- <copy todir="${axis.dir}/build/lib">
- <fileset dir="${basedir}/../lib"/>
- </copy>
-        
- <!-- unzipping saajtck from the zip file into work directory -->
- <unzip src="${basedir}/../tckresources/saaj_tck-1_2-fr-bin-14_oct_2003.zip" dest="${basedir}/work"/>
-
- <!-- Add the exclusion list of tests: bugid# 6221763 -->
- <echo>${ts.home}</echo>
- <replace file="${ts.home}\bin\ts.jtx">
- <replacetoken><![CDATA[# @(#)ts.jtx 1.3 03/10/13]]></replacetoken>
- <replacevalue><![CDATA[# @(#)ts.jtx    1.3 05/02/28
-#
-#
-# Exclude for bugid# 6221763
-com/sun/ts/tests/saaj/api/javax_xml_soap/SOAPMessage/URLClient.java#createAttachmentPartTest3_from_standalone]]></replacevalue>
- </replace>
-
- <copy todir="${tomcat.dir}/common/classes">
- <fileset dir="${ts.home}/classes"/>
- </copy>
-
- <copy todir="${tomcat.dir}/common/lib">
- <fileset dir="${axis.dir}/build/lib">
- <exclude name="*servlet*.jar"/>
- </fileset>
- </copy>
-
- <copy file="${ts.home}/lib/tsharness.jar" todir="${tomcat.dir}/common/lib"/>
- <copy file="${ts.home}/lib/saajtck.jar" todir="${tomcat.dir}/common/lib"/>
-
- <copy file="${basedir}/saajtck_build.properties" tofile="${ts.home}/bin/build.properties" overwrite="yes"/>
-
- <echo file="${ts.home}/bin/setenv.bat" append="false">set AXIS_HOME=${axis.dir}
-        </echo>
-
- <copy todir="${tomcat.dir}/webapps">
-    <fileset dir="${ts.home}/dist">
-      <include name="*.war"/>
-    </fileset>
- </copy>
- <mkdir dir="${tomcat.dir}/temp" />
- </target>
-
- <target name="clean">
- <delete dir="${basedir}/work"/>
- </target>
+<project name="saaj-tck" default="all">
+    <property environment="env"/>
+    <property name="axis2.dir" location="/apache/axis2"/>
+    <property name="tomcat.dir" location="${basedir}/work/apache-tomcat-5.5.20"/>
+    <property name="webapps.dir" location="${tomcat.dir}/webapps/axis"/>
+    <property name="ts.home" location="${basedir}/work/saajtck"/>
+
+    <path id="classpath.id">
+        <fileset dir="${ts.home}/lib">
+            <include name="tsharness.jar"/>
+        </fileset>
+    </path>
+
+ <target name="all" depends="init,refresh"/>
+
+    <target name="refresh">
+        <ant dir="${axis2.dir}" target="clean">
+          <property name="offline" value="true"/>
+        </ant>
+        <ant dir="${axis2.dir}" target="jar">
+          <property name="skip" value="true"/>
+        </ant>
+        <ant dir="${axis2.dir}" target="download-libs">
+          <property name="offline" value="true"/>
+        </ant>
+        <copy todir="${tomcat.dir}/common/lib" flatten="true">
+            <fileset dir="${axis2.dir}/target/lib">
+                <include name="commons-codec-*.jar"/>
+                <include name="commons-httpclient-*.jar"/>
+                <include name="XmlSchema-*.jar"/>
+                <include name="wsdl4j-*.jar"/>
+                <include name="axis2-saaj-api-*.jar"/>
+                <include name="activation-*.jar"/>
+                <include name="axiom-api-*.jar"/>
+                <include name="axiom-dom-*.jar"/>
+                <include name="axiom-impl-*.jar"/>
+                <include name="axis2-saaj-*.jar"/>
+                <include name="commons-logging-*.jar"/>
+                <include name="mail-*.jar"/>
+                <include name="stax-api-*.jar"/>
+                <include name="wstx-asl-*.jar"/>
+            </fileset>
+            <fileset dir="${axis2.dir}/">
+                <include name="modules/kernel/target/axis2-kernel-*.jar"/>
+                <include name="modules/saaj/target/axis2-saaj-*.jar"/>
+                <include name="modules/saaj-api/target/axis2-saaj-api-*.jar"/>
+            </fileset>
+        </copy>
+    </target>
+    
+    <target name="init">
+        <mkdir dir="${basedir}/work"/>
+        <unzip src="${basedir}/../tckresources/apache-tomcat-5.5.20.zip" dest="${basedir}/work"/>
+        <unzip src="${basedir}/../tckresources/apache-tomcat-5.5.20-compat.zip" dest="${basedir}/work"/>
+                    
+        <!-- unzipping saajtck from the zip file into work directory -->
+        <unzip src="${basedir}/../tckresources/saaj-1_3-tck.zip" dest="${basedir}/work"/>
+
+        <echo>${ts.home}</echo>
+                        
+        <copy todir="${tomcat.dir}/common/lib" flatten="true">
+            <fileset dir="${ts.home}/">
+                <include name="lib/saajtck.jar"/>
+                <include name="lib/tsharness.jar"/>
+            </fileset>
+        </copy>
+        
+        <copy todir="${tomcat.dir}/webapps">
+            <fileset dir="${ts.home}/dist">
+              <include name="*.war"/>
+            </fileset>
+        </copy>
+        <mkdir dir="${tomcat.dir}/temp" />
+
+        <path id="classpath">
+            <fileset dir="${tomcat.dir}/common/lib">
+                <include name="**/*.jar"/>
+            </fileset>
+        </path>
+
+        <pathconvert property="classpath.as.string"
+                     targetos="unix"
+                     refid="classpath"/>
+                    
+        <replace file="${ts.home}/bin/ts.jte" token="local.classes=" value="local.classes=${classpath.as.string}"/>
+    </target>
+
+    <target name="clean">
+        <delete dir="${basedir}/work"/>
+    </target>
 </project>

Modified: axis-tck/trunk/saaj/readme.txt
==============================================================================
--- axis-tck/trunk/saaj/readme.txt (original)
+++ axis-tck/trunk/saaj/readme.txt Fri Dec 22 13:41:57 2006
@@ -2,8 +2,8 @@
 README.TXT for SAAJ TCK
 ==============================
 
-1. Run "ant all" from this folder
-2. Open another prompt, cd to work\jakarta-tomcat-4.1.31\bin and run "catalina start"
+1. Run "ant" from this folder
+2. Open another prompt, cd to work\apache-tomcat-5.5.20\bin and run "catalina start"
 3. Set environment variable TS_HOME  pointing to work\saajtck directory
 4. cd to work\saajtck\bin and run "tsant gui".
 5. In the tck ui, create work folder for the session and run the tests.



---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]