[jbossws-commits] JBossWS SVN: r4750 - in stack/native/trunk: ant-import and 1 other directories.

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Fri Oct 12 08:01:03 EDT 2007


Author: thomas.diesler at jboss.com
Date: 2007-10-12 08:01:03 -0400 (Fri, 12 Oct 2007)
New Revision: 4750

Modified:
   stack/native/trunk/ant-import/build-thirdparty.xml
   stack/native/trunk/ant-import/macros-deploy-native.xml
   stack/native/trunk/ant.properties.example
   stack/native/trunk/src/test/resources/test-excludes-jboss50.txt
   stack/native/trunk/version.properties
Log:
[JBWS-1852] Failed to create a new SAX parser

Modified: stack/native/trunk/ant-import/build-thirdparty.xml
===================================================================
--- stack/native/trunk/ant-import/build-thirdparty.xml	2007-10-12 10:06:08 UTC (rev 4749)
+++ stack/native/trunk/ant-import/build-thirdparty.xml	2007-10-12 12:01:03 UTC (rev 4750)
@@ -79,8 +79,8 @@
     <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar" dest="${thirdparty.dir}/jboss-common-core-sources.jar" usetimestamp="true" verbose="true"/>
     <get src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar" dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true" verbose="true"/>
     <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/>
-    <get src="${jboss.repository}/jboss/ejb3/${jboss-ejb3}/bin/ejb3.deployer" dest="${thirdparty.dir}/ejb3.deployer.zip" usetimestamp="true" verbose="true"/>
     <get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/>
+    <get src="${jboss.repository}/jboss/jboss-javaee/${jboss-javaee}/lib/jboss-javaee.jar" dest="${thirdparty.dir}/jboss-javaee.jar" usetimestamp="true" verbose="true"/>
     <get src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs.jar" dest="${thirdparty.dir}/jboss-vfs.jar" usetimestamp="true" verbose="true"/>
     <get src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs-sources.jar" dest="${thirdparty.dir}/jboss-vfs-sources.jar" usetimestamp="true" verbose="true"/>
     <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb-jboss42}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/>
@@ -121,7 +121,6 @@
 
     <mkdir dir="${thirdparty.dir}/jbpm-bpel"/>
     <unzip dest="${thirdparty.dir}/jbpm-bpel" src="${thirdparty.dir}/jbpm-bpel.sar"/>
-    <unzip dest="${thirdparty.dir}" src="${thirdparty.dir}/ejb3.deployer.zip"/>
     
     <checksum file="${core.dir}/version.properties" fileext=".md5"/>
   </target>
@@ -134,8 +133,6 @@
         <pathelement location="${thirdparty.dir}/jbossws-common.jar"/>
         <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
        
-        <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
-        <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/>
   		  <pathelement location="${thirdparty.dir}/ant.jar"/>
 		    <pathelement location="${thirdparty.dir}/activation.jar"/>
         <pathelement location="${thirdparty.dir}/dom4j.jar"/>
@@ -149,6 +146,7 @@
         <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/>
         <pathelement location="${thirdparty.dir}/jboss-dependency.jar"/>
         <pathelement location="${thirdparty.dir}/jboss-j2ee.jar"/>
+        <pathelement location="${thirdparty.dir}/jboss-javaee.jar"/>
         <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/>
         <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/>
         <pathelement location="${thirdparty.dir}/jboss-remoting.jar"/>

Modified: stack/native/trunk/ant-import/macros-deploy-native.xml
===================================================================
--- stack/native/trunk/ant-import/macros-deploy-native.xml	2007-10-12 10:06:08 UTC (rev 4749)
+++ stack/native/trunk/ant-import/macros-deploy-native.xml	2007-10-12 12:01:03 UTC (rev 4750)
@@ -21,54 +21,54 @@
       <attribute name="stacklibs"/>
       <attribute name="thirdpartylibs"/>
       <sequential>
-         <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
-
-         <!-- BIN SCRIPTS -->
-         <unzip dest="${jboss50.home}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/>
-         <chmod dir="${jboss50.home}/bin" perm="+x" includes="*.sh"/>
-
-         <!-- CLIENT JARS -->
-         <copy todir="${jboss50.home}/client" overwrite="true">
-            <fileset dir="@{stacklibs}">
-               <include name="jboss-jaxrpc.jar"/>
-               <include name="jboss-jaxws.jar"/>
-              <include name="jboss-jaxws-ext.jar"/>
-               <include name="jboss-saaj.jar"/>
-               <include name="jbossws-client.jar"/>
-            </fileset>
-            <fileset dir="@{thirdpartylibs}">
-               <include name="policy.jar"/>
-               <include name="jaxb-api.jar"/>
-               <include name="jaxb-impl.jar"/>
-               <include name="jaxb-xjc.jar"/>
-               <include name="jaxws-tools.jar"/>
-               <include name="jaxws-rt.jar"/>
-               <include name="stax-ex.jar"/>
-               <include name="streambuffer.jar"/>
-               <include name="wsdl4j.jar"/>
-            </fileset>
-         </copy>
-         <copy todir="${jboss50.home}/lib" overwrite="true">
-            <fileset dir="@{thirdpartylibs}">
-               <include name="jaxb-api.jar"/>
-               <include name="jaxb-impl.jar"/>
-            </fileset>
-         </copy>
-
-         <!-- SERVER JARS -->
-         <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true">
-            <fileset dir="@{stacklibs}">
-               <include name="jboss-jaxrpc.jar"/>
-               <include name="jboss-jaxws.jar"/>
-              <include name="jboss-jaxws-ext.jar"/>
-               <include name="jboss-saaj.jar"/>
-            </fileset>
-         </copy>
-
-         <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
-         <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native50.sar"/>
-         <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
-         <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+        <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
+        
+        <!-- BIN SCRIPTS -->
+        <unzip dest="${jboss50.home}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/>
+        <chmod dir="${jboss50.home}/bin" perm="+x" includes="*.sh"/>
+        
+        <!-- CLIENT JARS -->
+        <copy todir="${jboss50.home}/client" overwrite="true">
+          <fileset dir="@{stacklibs}">
+            <include name="jboss-jaxrpc.jar"/>
+            <include name="jboss-jaxws.jar"/>
+            <include name="jboss-jaxws-ext.jar"/>
+            <include name="jboss-saaj.jar"/>
+            <include name="jbossws-client.jar"/>
+          </fileset>
+          <fileset dir="@{thirdpartylibs}">
+            <include name="policy.jar"/>
+            <include name="jaxb-api.jar"/>
+            <include name="jaxb-impl.jar"/>
+            <include name="jaxb-xjc.jar"/>
+            <include name="jaxws-tools.jar"/>
+            <include name="jaxws-rt.jar"/>
+            <include name="stax-ex.jar"/>
+            <include name="streambuffer.jar"/>
+            <include name="wsdl4j.jar"/>
+          </fileset>
+        </copy>
+        <copy todir="${jboss50.home}/lib" overwrite="true">
+          <fileset dir="@{thirdpartylibs}">
+            <include name="jaxb-api.jar"/>
+            <include name="jaxb-impl.jar"/>
+          </fileset>
+        </copy>
+        
+        <!-- SERVER JARS -->
+        <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true">
+          <fileset dir="@{stacklibs}">
+            <include name="jboss-jaxrpc.jar"/>
+            <include name="jboss-jaxws.jar"/>
+            <include name="jboss-jaxws-ext.jar"/>
+            <include name="jboss-saaj.jar"/>
+          </fileset>
+        </copy>
+        
+        <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+        <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native50.sar"/>
+        <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+        <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
       </sequential>
    </macrodef>
 

Modified: stack/native/trunk/ant.properties.example
===================================================================
--- stack/native/trunk/ant.properties.example	2007-10-12 10:06:08 UTC (rev 4749)
+++ stack/native/trunk/ant.properties.example	2007-10-12 12:01:03 UTC (rev 4750)
@@ -6,7 +6,6 @@
 # Optional JBoss Home
 #jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3
 #jboss42.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA
-#jboss40.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA
 #jboss40.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3
 
 # The JBoss server under test. This can be [jboss50|jboss42|jboss40|jboss40.no.ejb3]

Modified: stack/native/trunk/src/test/resources/test-excludes-jboss50.txt
===================================================================
--- stack/native/trunk/src/test/resources/test-excludes-jboss50.txt	2007-10-12 10:06:08 UTC (rev 4749)
+++ stack/native/trunk/src/test/resources/test-excludes-jboss50.txt	2007-10-12 12:01:03 UTC (rev 4750)
@@ -4,3 +4,7 @@
 org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase.*
 org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
 org/jboss/test/ws/jaxrpc/wsdlpublish/**
+
+# EJB3 ClientLauncher not available
+org/jboss/test/ws/jaxws/samples/webserviceref/*
+org/jboss/test/ws/jaxws/webserviceref/*

Modified: stack/native/trunk/version.properties
===================================================================
--- stack/native/trunk/version.properties	2007-10-12 10:06:08 UTC (rev 4749)
+++ stack/native/trunk/version.properties	2007-10-12 12:01:03 UTC (rev 4750)
@@ -31,7 +31,7 @@
 jbossws-jboss42=2.0.1.GA
 
 # JBossAS-5.0
-jboss-jbossxb-jboss50=2.0.0.CR4
+jboss-jbossxb-jboss50=snapshot
 jboss-remoting-jboss50=2.2.2.SP1
 
 # JBossAS-4.2
@@ -60,7 +60,7 @@
 jboss-common-core=2.0.2.GA
 jboss-common-logging-log4j=2.0.2.GA
 jboss-common-logging-spi=2.0.2.GA
-jboss-ejb3=1.0.0.CR9-jboss4.0.5
+jboss-javaee=5.0.0.Beta3
 jboss-jaxr=1.2.0.GA
 jboss-microcontainer=2.0.0.Beta3
 jboss-security=4.0.5.GA




More information about the jbossws-commits mailing list