[Jboss-cvs] JBossAS SVN: r56068 - in branches/Branch_4_0: testsuite testsuite/src/resources/webservice/jbws463/WEB-INF webservice

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2006-08-18 11:26:21 -0400 (Fri, 18 Aug 2006)
New Revision: 56068

Removed:
   branches/Branch_4_0/webservice/README.txt
Modified:
   branches/Branch_4_0/testsuite/build.xml
   branches/Branch_4_0/testsuite/src/resources/webservice/jbws463/WEB-INF/jaxrpc-mapping.xml
   branches/Branch_4_0/webservice/build.xml
Log:
restore jboss-ws4ee test support

Modified: branches/Branch_4_0/testsuite/build.xml
===================================================================
--- branches/Branch_4_0/testsuite/build.xml	2006-08-18 15:14:37 UTC (rev 56067)
+++ branches/Branch_4_0/testsuite/build.xml	2006-08-18 15:26:21 UTC (rev 56068)
@@ -220,14 +220,20 @@
     <isset property="HAVE_JDK_1.5"/>
   </condition>
   <path id="jboss-ws4ee.classpath">
-    <pathelement path="${jboss.webservice.lib}/jboss-ws4ee-client.jar"/>
-    <pathelement path="${jboss.jaxrpc.lib}/axis-ws4ee.jar"/>
+    <pathelement path="${jboss/jboss.ws4ee.lib}/jboss-ws4ee-client.jar"/>
+    <pathelement path="${jboss/jboss.ws4ee.lib}/axis-ws4ee.jar"/>
+    <pathelement path="${jboss.jbossws14.lib}/jboss-jaxrpc.jar"/>
+    <pathelement path="${jboss.jbossws14.lib}/jboss-saaj.jar"/>
   </path>
   <path id="jbossws14.classpath">
     <pathelement path="${jboss.jbossws14.lib}/jbossws14-client.jar"/>
+    <pathelement path="${jboss.jbossws14.lib}/jboss-jaxrpc.jar"/>
+    <pathelement path="${jboss.jbossws14.lib}/jboss-saaj.jar"/>
   </path>
   <path id="jbossws.classpath">
     <pathelement path="${jboss.jbossws.lib}/jbossws-client.jar"/>
+    <pathelement path="${jboss.jbossws14.lib}/jboss-jaxrpc.jar"/>
+    <pathelement path="${jboss.jbossws14.lib}/jboss-saaj.jar"/>
   </path>
   <path id="webservice.classpath" refid="${webservice.classpath}"/>
 	

Modified: branches/Branch_4_0/testsuite/src/resources/webservice/jbws463/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- branches/Branch_4_0/testsuite/src/resources/webservice/jbws463/WEB-INF/jaxrpc-mapping.xml	2006-08-18 15:14:37 UTC (rev 56067)
+++ branches/Branch_4_0/testsuite/src/resources/webservice/jbws463/WEB-INF/jaxrpc-mapping.xml	2006-08-18 15:26:21 UTC (rev 56068)
@@ -56,7 +56,7 @@
    <wsdl-operation>doStuff3</wsdl-operation>
    <method-param-parts-mapping>
     <param-position>0</param-position>
-    <param-type>java.lang.Integer</param-type>
+    <param-type>java.lang.Double</param-type>
     <wsdl-message-mapping>
      <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.webservice/jbws463'>wsdlMsgNS:TestSEI_doStuff3</wsdl-message>
      <wsdl-message-part-name>Double_1</wsdl-message-part-name>
@@ -79,4 +79,4 @@
    </wsdl-return-value-mapping>
   </service-endpoint-method-mapping>  
  </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file
+</java-wsdl-mapping>

Deleted: branches/Branch_4_0/webservice/README.txt
===================================================================
--- branches/Branch_4_0/webservice/README.txt	2006-08-18 15:14:37 UTC (rev 56067)
+++ branches/Branch_4_0/webservice/README.txt	2006-08-18 15:26:21 UTC (rev 56068)
@@ -1,12 +0,0 @@
-
-Deploying the appropriate web service stack
-http://wiki.jboss.org/wiki/Wiki.jsp?page=WSDeployJBossWS
-
-Upgrading to JBossWS
-http://wiki.jboss.org/wiki/Wiki.jsp?page=JBWS404Compatibility
-
-xxxxxxxxxxxxxxxxxxxxxxx
-Thomas Diesler
-Web Service Lead
-JBoss Inc.
-xxxxxxxxxxxxxxxxxxxxxxx

Modified: branches/Branch_4_0/webservice/build.xml
===================================================================
--- branches/Branch_4_0/webservice/build.xml	2006-08-18 15:14:37 UTC (rev 56067)
+++ branches/Branch_4_0/webservice/build.xml	2006-08-18 15:26:21 UTC (rev 56068)
@@ -130,14 +130,39 @@
     description="Builds all jar files."
     depends="_buildmagic:build-bypass-check"
     unless="build-bypass.on">
+  </target>
 
+  <!-- ================================================================== -->
+  <!-- Deployment                                                         -->
+  <!-- ================================================================== -->
 
-    <!-- Update the build marker to allow bypassing -->
-    <touch file="${build-bypass.marker}"/>
+  <!-- Deploy the jboss-ws4ee to the server specified like this: -Dserver=default  -->
+  <target name="deploy-ws4ee" depends="main">
+    <property name="server" value="default"/>
+    <property name="jboss.home" value="${module.root}/../build/output/jboss-${version.major}.${version.minor}.${version.revision}.${version.tag}"/>
+    <!-- delete jbossws implementation -->
+    <delete dir="${jboss.home}/server/${server}/deploy/jbossws.sar/"/>
+    <delete file="${jboss.home}/client/jbossws-client.jar"/>
+    <delete dir="${jboss.home}/server/${server}/deploy/jbossws14.sar/"/>
+    <delete file="${jboss.home}/client/jbossws14-client.jar"/>
+    <!-- install jboss-ws4ee implementation -->
+    <copy todir="${jboss.home}/client" file="${jboss/jboss.ws4ee.lib}/jboss-ws4ee-client.jar" overwrite="true"/>
+    <copy todir="${jboss.home}/client" file="${jboss/jboss.ws4ee.lib}/axis-ws4ee.jar" overwrite="true"/>
+    <mkdir dir="${jboss.home}/server/${server}/deploy/jboss-ws4ee.sar"/>
+    <unjar dest="${jboss.home}/server/${server}/deploy/jboss-ws4ee.sar" src="${jboss/jboss.ws4ee.lib}/jboss-ws4ee.sar"/>
+    <copy todir="${jboss.home}/server/${server}/deploy/jboss-ws4ee.sar" file="${jboss.jbossws14.lib}/jboss-jaxrpc.jar"/>
+    <copy todir="${jboss.home}/server/${server}/deploy/jboss-ws4ee.sar" file="${jboss.jbossws14.lib}/jboss-saaj.jar"/>
+  </target>
 
+  <target name="remove-ws4ee" depends="main">
+    <property name="server" value="default"/>
+    <property name="jboss.home" value="${module.root}/../build/output/jboss-${version.major}.${version.minor}.${version.revision}.${version.tag}"/>
+    <!-- delete jboss-ws4ee implementation -->
+    <delete dir="${jboss.home}/server/${server}/deploy/jboss-ws4ee.sar/"/>
+    <delete file="${jboss.home}/client/jboss-ws4ee-client.jar"/>
+    <delete file="${jboss.home}/client/axis-ws4ee.jar"/>
   </target>
 
-
   <!-- ================================================================== -->
   <!-- Cleaning                                                           -->
   <!-- ================================================================== -->