You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2004/04/10 08:22:10 UTC
cvs commit: ws-axis/java/xmls targets.xml
dims 2004/04/09 23:22:10
Modified: java build.xml buildTest.xml
java/xmls targets.xml
Log:
Fix for AXIS-1293 - build fails without junit-exclude-tests.txt
Fix for AXIS-1292 - Build requires servlet.jar
Revision Changes Path
1.245 +7 -0 ws-axis/java/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/ws-axis/java/build.xml,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -r1.244 -r1.245
--- build.xml 31 Mar 2004 12:50:05 -0000 1.244
+++ build.xml 10 Apr 2004 06:22:09 -0000 1.245
@@ -123,11 +123,18 @@
<exclude name="**/org/apache/axis/handlers/SOAPMonitorHandler.java" unless="servlet.present"/>
<exclude name="**/org/apache/axis/monitor/SOAPMonitorService.java" unless="servlet.present"/>
<exclude name="**/org/apache/axis/providers/ComProvider.java" unless="combridge.present"/>
+ <exclude name="**/org/apache/axis/transport/http/AbstractQueryStringHandler.java" unless="servlet.present"/>
<exclude name="**/org/apache/axis/transport/http/AdminServlet.java" unless="servlet.present"/>
+ <exclude name="**/org/apache/axis/transport/http/AutoRegisterServlet.java" unless="servlet.present"/>
<exclude name="**/org/apache/axis/transport/http/AxisHttpSession.java" unless="servlet.present"/>
<exclude name="**/org/apache/axis/transport/http/AxisServlet.java" unless="servlet.present"/>
<exclude name="**/org/apache/axis/transport/http/AxisServletBase.java" unless="servlet.present"/>
+ <exclude name="**/org/apache/axis/transport/http/AxisHTTPSessionListener.java" unless="servlet.present"/>
+ <exclude name="**/org/apache/axis/transport/http/FilterPrintWriter.java" unless="servlet.present"/>
<exclude name="**/org/apache/axis/transport/http/ServletEndpointContextImpl.java" unless="servlet.present"/>
+ <exclude name="**/org/apache/axis/transport/http/QSWSDLHandler.java" unless="servlet.present"/>
+ <exclude name="**/org/apache/axis/transport/http/QSMethodHandler.java" unless="servlet.present"/>
+ <exclude name="**/org/apache/axis/transport/http/QSListHandler.java" unless="servlet.present"/>
<exclude name="**/org/apache/axis/transport/configuration/EngineConfigurationFactoryServlet.java" unless="servlet.present"/>
<exclude name="**/org/apache/axis/transport/http/CommonsHTTPSender.java" unless="commons-httpclient.present"/>
<exclude name="**/org/apache/axis/components/net/CommonsHTTPClientProperties.java" unless="commons-httpclient.present"/>
1.56 +10 -3 ws-axis/java/buildTest.xml
Index: buildTest.xml
===================================================================
RCS file: /home/cvs/ws-axis/java/buildTest.xml,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- buildTest.xml 26 Dec 2003 15:18:48 -0000 1.55
+++ buildTest.xml 10 Apr 2004 06:22:09 -0000 1.56
@@ -105,15 +105,17 @@
<!-- Runs the JUnit package testcases -->
<!-- =================================================================== -->
<target name="junit" if="junit.present">
+ <available file="${axis.home}/junit-exclude-tests.txt" property="junit-exclude-tests.present"/>
<junit printsummary="yes" haltonfailure="${test.functional.fail}" fork="yes">
<jvmarg value="-Xbootclasspath:${sun.boot.class.path}"/>
<classpath refid="classpath" />
<formatter type="xml" />
<batchtest todir="${test.functional.reportdir}">
- <fileset dir="${build.dir}/classes" excludesfile="${axis.home}/junit-exclude-tests.txt">
+ <fileset dir="${build.dir}/classes">
<!-- Convention: each package that's being tested
has its own test class collecting all the tests -->
<include name="**/PackageTests.class" />
+ <excludesfile name="${axis.home}/junit-exclude-tests.txt" if="junit-exclude-tests.present"/>
<!-- <include name="**/test/*TestSuite.class"/> -->
</fileset>
</batchtest>
@@ -170,6 +172,7 @@
<arg line="${deploy.xml.property}"/>
</java>
+ <available file="${axis.home}/junit-exclude-tests.txt" property="junit-exclude-tests.present"/>
<!-- now, run the actual test -->
<junit dir="${axis.home}" printsummary="yes" haltonfailure="${test.functional.fail}" fork="yes">
<!-- See if this helps with Gump test failures -->
@@ -191,8 +194,9 @@
<jvmarg value="-Dtest.functional.ServicePort=${test.functional.ServicePort}"/>
<classpath refid="classpath" />
<formatter type="xml" usefile="${test.functional.usefile}"/>
+ <available file="${axis.home}/junit-exclude-tests.txt" property="junit-exclude-tests.present"/>
<batchtest todir="${test.functional.reportdir}">
- <fileset dir="${build.dest}" excludesfile="${axis.home}/junit-exclude-tests.txt">
+ <fileset dir="${build.dest}">
<!-- Convention: each package that's being tested
has its own test class collecting all the tests -->
<include name="**/FunctionalTests.class" />
@@ -202,6 +206,7 @@
<exclude name="**/WhiteMesaSoap12TestSvcTestCase.class"/>
<exclude name="**/test/wsdl/attachments/**/*.class" unless="attachments.present" />
<exclude name="**/test/wsdl/adaptive/**/*.class"/>
+ <excludesfile name="${axis.home}/junit-exclude-tests.txt" if="junit-exclude-tests.present"/>
</fileset>
</batchtest>
</junit>
@@ -213,16 +218,18 @@
</target>
<target name="junit-functional-secure" if="junit.present" depends="junit-functional-prepare,start-signature-signing-and-verification">
+ <available file="${axis.home}/junit-exclude-tests.txt" property="junit-exclude-tests.present"/>
<!-- now, run the actual test -->
<junit dir="${axis.home}" printsummary="yes" haltonfailure="${test.functional.fail}" fork="yes">
<classpath refid="classpath" />
<formatter type="xml" usefile="${test.functional.usefile}"/>
<batchtest todir="${test.functional.reportdir}">
- <fileset dir="${build.dest}" excludesfile="${axis.home}/junit-exclude-tests.txt">
+ <fileset dir="${build.dest}">
<!-- Convention: each package that's being tested
has its own test class collecting all the tests -->
<include name="**/TestBidBuySample.class" />
<exclude name="**/Interop3TestCase.class"/>
+ <excludesfile name="${axis.home}/junit-exclude-tests.txt" if="junit-exclude-tests.present"/>
</fileset>
</batchtest>
</junit>
1.71 +3 -1 ws-axis/java/xmls/targets.xml
Index: targets.xml
===================================================================
RCS file: /home/cvs/ws-axis/java/xmls/targets.xml,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- targets.xml 21 Feb 2004 19:21:58 -0000 1.70
+++ targets.xml 10 Apr 2004 06:22:10 -0000 1.71
@@ -586,17 +586,19 @@
<param name="admin.file" value="${deploy.xml.property}"/>
</antcall>
+ <available file="${axis.home}/junit-exclude-tests.txt" property="junit-exclude-tests.present"/>
<junit dir="${axis.home}" printsummary="yes" haltonfailure="${test.functional.fail}" fork="yes">
<classpath refid="classpath" />
<formatter type="xml" usefile="${test.functional.usefile}"/>
<batchtest todir="${test.functional.reportdir}">
- <fileset dir="${build.dest}" excludesfile="${axis.home}/junit-exclude-tests.txt">
+ <fileset dir="${build.dest}">
<include name="${extraTestCases}/*TestCase.class" />
<include name="${extraTestCases}/**/*TestCase.class" />
<include name="${componentName}/*TestCase.class" />
<include name="${componentName}/**/*TestCase.class" />
<include name="${componentName}/**/PackageTests.class" />
<!-- <include name="${componentName}/**/test/*TestSuite.class"/> -->
+ <excludesfile name="${axis.home}/junit-exclude-tests.txt" if="junit-exclude-tests.present"/>
</fileset>
</batchtest>
</junit>