Author: thomas.diesler(a)jboss.com
Date: 2006-10-17 07:10:30 -0400 (Tue, 17 Oct 2006)
New Revision: 1236
Modified:
branches/tdiesler/jbossws-1.0/ant.properties.example
branches/tdiesler/jbossws-1.0/src/test/build.xml
branches/tdiesler/jbossws-1.0/src/test/resources/tests-tomcat-excludes.txt
Log:
partial commit
Modified: branches/tdiesler/jbossws-1.0/ant.properties.example
===================================================================
--- branches/tdiesler/jbossws-1.0/ant.properties.example 2006-10-17 09:40:13 UTC (rev
1235)
+++ branches/tdiesler/jbossws-1.0/ant.properties.example 2006-10-17 11:10:30 UTC (rev
1236)
@@ -12,7 +12,7 @@
jboss.server.instance=default
# Tomcat Home
-#tomcat.home=/usr/java/apache/apache-tomcat-5.5.17
+#tomcat.home=/usr/java/apache/apache-tomcat-5.5.20
#tomcat.manager.username=manager
#tomcat.manager.password=manager
Modified: branches/tdiesler/jbossws-1.0/src/test/build.xml
===================================================================
--- branches/tdiesler/jbossws-1.0/src/test/build.xml 2006-10-17 09:40:13 UTC (rev 1235)
+++ branches/tdiesler/jbossws-1.0/src/test/build.xml 2006-10-17 11:10:30 UTC (rev 1236)
@@ -125,17 +125,25 @@
<!-- Check that the latest build has been deployed -->
<condition property="jbossws.deployed">
- <filesmatch file1="${jboss.client}/${jbossws.client.jar}"
file2="${build.lib.dir}/${jbossws.client.jar}"/>
+ <and>
+ <filesmatch file1="${jboss.client}/${jbossws.client.jar}"
file2="${build.lib.dir}/${jbossws.client.jar}"/>
+ <equals arg1="${jbossws.target.server}" arg2="jboss"/>
+ </and>
</condition>
- <fail message="jbossws not deployed, run 'ant deploy-jbossws'"
unless="jbossws.deployed"/>
+ <condition property="jbossws.deployed">
+ <and>
+ <filesmatch file1="${tomcat.home}/common/lib/jbossws-core.jar"
file2="${build.lib.dir}/jbossws-core.jar"/>
+ <equals arg1="${jbossws.target.server}"
arg2="tomcat"/>
+ </and>
+ </condition>
+ <fail message="jbossws not deployed, run the deploy target"
unless="jbossws.deployed"/>
<!-- Define excluded tests -->
- <property name="jbossws.target.server.${jbossws.target.server}"
value="true"/>
<condition property="tests.excludesfile"
value="${test.resources.dir}/tests-no-excludes.txt">
- <isset property="jbossws.target.server.jboss"/>
+ <equals arg1="${jbossws.target.server}" arg2="jboss"/>
</condition>
<condition property="tests.excludesfile"
value="${test.resources.dir}/tests-tomcat-excludes.txt">
- <isset property="jbossws.target.server.tomcat"/>
+ <equals arg1="${jbossws.target.server}" arg2="tomcat"/>
</condition>
<!-- The jbossws client classpath -->
@@ -173,13 +181,14 @@
<pathelement
location="${build.lib.dir}/${jbossws.build}-jboss-integration.jar"/>
<pathelement
location="${build.lib.dir}/${jbossws.build}-tomcat-integration.jar"/>
<pathelement
location="${jboss.client}/jboss-aop-jdk50-client.jar"/>
- <pathelement location="${jboss.lib}/jboss-system.jar"/>
- <pathelement location="${jboss.server.lib}/jboss.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-system.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss.jar"/>
+ <pathelement location="${thirdparty.dir}/policy-1.0.jar"/>
<pathelement location="${thirdparty.dir}/qdox.jar"/>
+ <pathelement location="${thirdparty.dir}/servlet-api.jar"/>
+ <pathelement location="${thirdparty.dir}/stax-api-1.0.jar"/>
+ <pathelement location="${thirdparty.dir}/wstx-lgpl-2.9.3.jar"/>
<pathelement location="${thirdparty.dir}/xmlunit1.0.jar"/>
- <pathelement location="${thirdparty.dir}/policy-1.0.jar"/>
- <pathelement location="${thirdparty.dir}/wstx-lgpl-2.9.3.jar"/>
- <pathelement location="${thirdparty.dir}/stax-api-1.0.jar"/>
</path>
<!-- Check that jBPM BPEL has been deployed -->
Modified: branches/tdiesler/jbossws-1.0/src/test/resources/tests-tomcat-excludes.txt
===================================================================
--- branches/tdiesler/jbossws-1.0/src/test/resources/tests-tomcat-excludes.txt 2006-10-17
09:40:13 UTC (rev 1235)
+++ branches/tdiesler/jbossws-1.0/src/test/resources/tests-tomcat-excludes.txt 2006-10-17
11:10:30 UTC (rev 1236)
@@ -1,6 +1,7 @@
-org/jboss/test/ws/samples/dynamichandler/**
-org/jboss/test/ws/samples/jmstransport/**
-org/jboss/test/ws/samples/jsr109ejb/**
-org/jboss/test/ws/samples/jsr181ejb/**
-org/jboss/test/ws/samples/secureejb/**
-org/jboss/test/ws/jbws1011/**
+org/jboss/test/ws/jaxrpc/samples/dynamichandler/**
+org/jboss/test/ws/jaxrpc/samples/jmstransport/**
+org/jboss/test/ws/jaxrpc/samples/jsr109ejb/**
+org/jboss/test/ws/jaxrpc/samples/secureejb/**
+org/jboss/test/ws/jaxrpc/samples/wsbpel/**
+org/jboss/test/ws/jaxrpc/jbws1011/**
+org/jboss/test/ws/jaxws/samples/jsr181ejb/**