[jbossws-commits] JBossWS SVN: r2301 - in branches/jbossws-1.2.0/integration-jboss40: src/main/resources and 1 other directories.

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-02-08 04:30:56 -0500 (Thu, 08 Feb 2007)
New Revision: 2301

Added:
   branches/jbossws-1.2.0/integration-jboss40/src/main/resources/jbossws.beans/
Modified:
   branches/jbossws-1.2.0/integration-jboss40/build.xml
   branches/jbossws-1.2.0/integration-jboss40/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml
Log:
Exclude @WebServiceRef handling from jboss40-jdk14

Modified: branches/jbossws-1.2.0/integration-jboss40/build.xml
===================================================================
--- branches/jbossws-1.2.0/integration-jboss40/build.xml	2007-02-07 20:52:04 UTC (rev 2300)
+++ branches/jbossws-1.2.0/integration-jboss40/build.xml	2007-02-08 09:30:56 UTC (rev 2301)
@@ -206,8 +206,6 @@
     <jar jarfile="${jboss40.output.lib.dir}/jbossws14-core.jar" manifest="${etc.dir}/default.mf">
       <fileset dir="${jboss40.output.classes14.dir}">
         <include name="org/jboss/ws/**"/>
-        <include name="javax/jws/**"/>
-        <include name="javax/xml/ws/**"/>
       </fileset>
       <fileset dir="${core.dir}/src/main/resources">
         <include name="schema/**"/>
@@ -215,6 +213,15 @@
       </fileset>
     </jar>
     
+    <!-- Build jboss-jaxws14.jar -->
+    <mkdir dir="${jboss40.output.lib.dir}"/>
+    <jar jarfile="${jboss40.output.lib.dir}/jboss-jaxws14.jar" manifest="${etc.dir}/default.mf">
+      <fileset dir="${jboss40.output.classes14.dir}">
+        <include name="javax/jws/**"/>
+        <include name="javax/xml/ws/**"/>
+      </fileset>
+    </jar>
+    
     <!-- Build jbossws14-jboss40-integration.jar -->
     <jar jarfile="${jboss40.output.lib.dir}/jbossws14-jboss40-integration.jar" manifest="${etc.dir}/default.mf">
       <fileset dir="${jboss40.output.classes14.dir}">
@@ -270,14 +277,12 @@
         <include name="wstx-lgpl-2.9.3.jar"/>
         <include name="xmlsec.jar"/>
       </fileset>
-      <fileset dir="${jboss42.resources.dir}">
+      <fileset dir="${jboss40.resources.dir}">
         <include name="jbossws.beans/META-INF/jboss-beans.xml"/>
       </fileset>
       <metainf dir="${core.resources.dir}/jbossws.sar/META-INF">
         <include name="standard-jaxrpc-client-config.xml"/>
         <include name="standard-jaxrpc-endpoint-config.xml"/>
-        <include name="standard-jaxws-client-config.xml"/>
-        <include name="standard-jaxws-endpoint-config.xml"/>
       </metainf>
       <metainf dir="${jboss40.output.dir}/resources/jbossws40-jdk14.sar/META-INF">
         <include name="jboss-service.xml"/>
@@ -338,6 +343,7 @@
   <!-- Deploy jbossws to jboss40 jdk1.4 -->
   <target name="deploy-jboss40-jdk14" depends="jboss40-jars14" description="Deploy jbossws">
     <delete file="${jboss40.home}/client/jbossws-client.jar"/>
+    <delete file="${jboss40.home}/server/${jboss.server.instance}/lib/jboss-jaxws.jar"/>
     <copy todir="${jboss40.home}/client" overwrite="true">
       <fileset dir="${core.output.lib.dir}">
         <include name="jboss-jaxrpc.jar"/>
@@ -356,6 +362,9 @@
         <include name="jboss-jaxrpc.jar"/>
         <include name="jboss-saaj.jar"/>
       </fileset>
+      <fileset dir="${jboss40.output.lib.dir}">
+        <include name="jboss-jaxws14.jar"/>
+      </fileset>
     </copy>
     <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
     <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/>

Copied: branches/jbossws-1.2.0/integration-jboss40/src/main/resources/jbossws.beans (from rev 2300, branches/jbossws-1.2.0/integration-jboss42/src/main/resources/jbossws.beans)

Modified: branches/jbossws-1.2.0/integration-jboss40/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml
===================================================================
--- branches/jbossws-1.2.0/integration-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml	2007-02-07 20:52:04 UTC (rev 2300)
+++ branches/jbossws-1.2.0/integration-jboss40/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml	2007-02-08 09:30:56 UTC (rev 2301)
@@ -7,13 +7,13 @@
   <bean name="ServiceEndpointManager" class="org.jboss.ws.core.server.ServiceEndpointManager">
     
     <!--
-        The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address>
-        element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address.
+      The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address>
+      element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address.
+    
+      If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'alwaysModifySOAPAddress' is true.
+      If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below.
       
-        If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'alwaysModifySOAPAddress' is true.
-        If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below.
-        
-        If next line (webServiceHost) is commented, JBossWS uses requesters protocolo, host and port when rewriting the <soap:address>.
+      If next line (webServiceHost) is commented, JBossWS uses requesters protocolo, host and port when rewriting the <soap:address>.
     -->
     <property name="webServiceHost">${jboss.bind.address}</property>
     <property name="webServiceSecurePort">8443</property>
@@ -36,8 +36,11 @@
     <property name="serviceEndpointServlet">org.jboss.ws.integration.jboss42.JBossServiceEndpointServlet</property>
   </bean>
   
-  <!-- Bind JAXWS Service objects in client environment context  -->
+  <!-- 
+    Bind JAXWS Service objects in client environment context  
+    JAX-WS functionality is not available with jdk-1.4
   <bean name="WebServiceRefHandler" class="org.jboss.ws.integration.jboss42.WebServiceRefHandler"/>
+  -->
   
   <!-- A subscription manager for WS-Eventing -->
   <bean name="SubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager"/>