[jbossws-commits] JBossWS SVN: r2268 - branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples.

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-02-04 06:34:33 -0500 (Sun, 04 Feb 2007)
New Revision: 2268

Modified:
   branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml
Log:
Update samples build

Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml	2007-02-03 23:48:29 UTC (rev 2267)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml	2007-02-04 11:34:33 UTC (rev 2268)
@@ -149,8 +149,7 @@
   
   <target name="common-classpath" depends="prepare,thirdparty">
     
-    <!-- The combined compile classpath -->
-    <path id="jbossws.jars.classpath">
+    <path id="jbossws.classpath">
       <pathelement location="${tests.lib.dir}/jbossws-core.jar"/>
       <pathelement location="${tests.lib.dir}/jbossws-client.jar"/>
       <pathelement location="${tests.lib.dir}/jboss-jaxrpc.jar"/>
@@ -165,7 +164,7 @@
     <!-- The combined compile classpath -->
     <path id="javac.classpath">
       <path refid="core.classpath"/>
-      <path refid="jbossws.jars.classpath"/>
+      <path refid="jbossws.classpath"/>
       <pathelement location="${thirdparty.dir}/activation.jar"/>
       <pathelement location="${thirdparty.dir}/jboss-vfs.jar"/>
       <pathelement location="${thirdparty.dir}/junit.jar"/>
@@ -183,7 +182,7 @@
     
     <!-- The test client classpath -->
     <path id="test.client.classpath">
-      <path refid="jbossws.jars.classpath"/>
+      <path refid="jbossws.classpath"/>
       <pathelement location="${jboss.client}/commons-logging.jar"/>
       <pathelement location="${jboss.client}/jboss-backport-concurrent.jar"/>
       <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
@@ -202,7 +201,7 @@
     
     <!-- The jBPM BPEL classpath -->
     <path id="jbpm.bpel.classpath">
-      <path refid="jbossws.jars.classpath"/>
+      <path refid="jbossws.classpath"/>
       <pathelement location="${thirdparty.dir}/jbpm-bpel"/> <!-- jbpm.cfg.xml -->
       <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-bpel.jar" />
       <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-jpdl.jar" />
@@ -221,9 +220,12 @@
   </target>
   
   <target name="tomcat-classpath" depends="common-classpath" if="jbossws.integration.target.tomcat">
+    
+    <fail message="jdk-1.5 is required for Tomcat integration" unless="HAVE_JDK_1.5"/>
+    
     <!-- The test client classpath -->
     <path id="test.client.classpath">
-      <path refid="jbossws.jars.classpath"/>
+      <path refid="jbossws.classpath"/>
       <pathelement location="${tomcat.common.lib}/jbossws-thirdparty.jar"/> 
       <path refid="javac.classpath"/>
     </path>
@@ -321,10 +323,7 @@
 	  <!-- generate mapping artifacts -->
     <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
       <classpath refid="core.classpath"/>
-      <classpath location="${tests.lib.dir}/jbossws-core.jar"/>
-      <classpath location="${tests.lib.dir}/jboss-jaxrpc.jar"/>
-      <classpath location="${tests.lib.dir}/jboss-jaxws.jar"/>
-      <classpath location="${tests.lib.dir}/jboss-saaj.jar"/>
+      <classpath refid="jbossws.classpath"/>
       <classpath location="${thirdparty.dir}/concurrent.jar"/>
       <classpath location="${tests.output.dir}/classes"/>
       <classpath location="${tests.output.dir}"/>