[jbossws-commits] JBossWS SVN: r17491 - in stack/cxf/trunk/modules: resources/src/main/resources/modules/jboss800/org/jboss/as/webservices/server and 5 other directories.

Thursday, 11 April 2013

Author: alessio.soldano(a)jboss.com
Date: 2013-04-11 05:10:57 -0400 (Thu, 11 Apr 2013)
New Revision: 17491

Added:
   stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as8.xml
Removed:
  
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/as/webservices/server/jaxrpc-integration/
  
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/native/
Modified:
   stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml
  
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
   stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
   stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[AS7-6608] Changes related to JAX-RPC support removal on AS 8


Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml
===================================================================

--- stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml	2013-04-11 08:43:20 UTC
(rev 17490)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml	2013-04-11 09:10:57 UTC
(rev 17491)
@@ -45,7 +45,7 @@
         <include name="cxf*security.jar"/>
       </fileset>
     </jandex>
-    <antcall target="deploy-jbossws-cxf-modules"
inheritall="false">
+    <antcall target="deploy-jbossws-cxf-modules-as7"
inheritall="false">
       <param name="installserver"
value="${deploy.structure}/modules"/>
       <param name="thirdpartydir"
value="${deploy.artifacts.dir}"/>
       <param name="jbossid"
value="${jbossws.integration.target}"/>
@@ -137,7 +137,7 @@
         <include name="cxf*security.jar"/>
       </fileset>
     </jandex>
-    <antcall target="deploy-jbossws-cxf-modules"
inheritall="false">
+    <antcall target="deploy-jbossws-cxf-modules-as7"
inheritall="false">
       <param name="installserver"
value="${deploy.structure}/modules/system/layers/base"/>
       <param name="thirdpartydir"
value="${deploy.artifacts.dir}"/>
       <param name="jbossid"
value="${jbossws.integration.target}"/>
@@ -200,7 +200,7 @@
         <include name="cxf*security.jar"/>
       </fileset>
     </jandex>
-    <antcall target="deploy-jbossws-cxf-modules"
inheritall="false">
+    <antcall target="deploy-jbossws-cxf-modules-as8"
inheritall="false">
       <param name="installserver"
value="${deploy.structure}/modules/system/layers/base"/>
       <param name="thirdpartydir"
value="${deploy.artifacts.dir}"/>
       <param name="jbossid"
value="${jbossws.integration.target}"/>
@@ -208,7 +208,8 @@
     </antcall>
   	<copy toDir="${deploy.structure}/modules/system/layers/base">
       <fileset dir="${deploy.artifacts.dir}/modules/jboss800">
-        <include name="**/jboss/as/webservices/**/module.xml"/>
+        <include name="**/jboss/as/webservices/main/module.xml"/>
+      	<include
name="**/jboss/as/webservices/server/integration/main/module.xml"/>
       </fileset>
     </copy>
   </target>

Modified:
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
---
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml	2013-04-11
08:43:20 UTC (rev 17490)
+++
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml	2013-04-11
09:10:57 UTC (rev 17491)
@@ -28,7 +28,7 @@
   <!-- Modules                                                            -->
   <!-- ================================================================== -->
 
-  <macrodef name="macro-deploy-jbossws-modules">
+  <macrodef name="macro-deploy-jbossws-modules-as8">
     <attribute name="thirdpartydir"/>
     <attribute name="targetdir"/>
     <attribute name="jbossid"/>
@@ -60,6 +60,113 @@
           <include name="**/jbossws-cxf-transports-httpserver.jar"/>
         </fileset>
       </copy>
+      <copy todir="@{targetdir}/org/apache/cxf/main"
flatten="false" overwrite="true">
+        <fileset dir="@{thirdpartydir}/lib">
+          <include name="**/cxf-api*.jar"/>
+        </fileset>
+      </copy>
+      <copy todir="@{targetdir}/org/apache/cxf/impl/main"
flatten="false" overwrite="true">
+        <fileset dir="@{thirdpartydir}/lib">
+          <include name="**/cxf-*.jar"/>
+          <exclude name="**/cxf-api*.jar"/>
+        </fileset>
+      </copy>
+      <copy todir="@{targetdir}/org/jboss/ws/api/main"
flatten="false" overwrite="true">
+        <fileset dir="@{thirdpartydir}/lib">
+          <include name="**/jbossws-api.jar"/>
+        </fileset>
+      </copy>
+      <copy todir="@{targetdir}/org/jboss/ws/common/main"
flatten="false" overwrite="true">
+        <fileset dir="@{thirdpartydir}/lib">
+          <include name="**/jbossws-common.jar"/>
+        </fileset>
+      </copy>
+      <copy todir="@{targetdir}/org/jboss/ws/tools/common/main"
flatten="false" overwrite="true">
+        <fileset dir="@{thirdpartydir}/lib">
+          <include name="**/jbossws-common-tools.jar"/>
+        </fileset>
+      </copy>
+      <copy todir="@{targetdir}/org/jboss/ws/spi/main"
flatten="false" overwrite="true">
+        <fileset dir="@{thirdpartydir}/lib">
+          <include name="**/jbossws-spi.jar"/>
+        </fileset>
+      </copy>
+      <copy todir="@{targetdir}/org/apache/neethi/main"
flatten="false" overwrite="true">
+        <fileset dir="@{thirdpartydir}/lib">
+          <include name="**/neethi.jar"/>
+        </fileset>
+      </copy>
+      <copy todir="@{targetdir}/org/apache/santuario/xmlsec/main"
flatten="false" overwrite="true">
+        <fileset dir="@{thirdpartydir}/lib">
+          <include name="**/xmlsec.jar"/>
+        </fileset>
+      </copy>
+      <copy todir="@{targetdir}/org/apache/ws/security/main"
flatten="false" overwrite="true">
+        <fileset dir="@{thirdpartydir}/lib">
+          <include name="**/wss4j.jar"/>
+        </fileset>
+      </copy>
+      <copy todir="@{targetdir}/org/apache/ws/xmlschema/main"
flatten="false" overwrite="true">
+        <fileset dir="@{thirdpartydir}/lib">
+          <include name="**/xmlschema-core.jar"/>
+        </fileset>
+      </copy>
+      <copy todir="@{targetdir}/org/opensaml/main" flatten="false"
overwrite="true">
+        <fileset dir="@{thirdpartydir}/lib">
+          <include name="**/opensaml.jar"/>
+          <include name="**/openws.jar"/>
+          <include name="**/xmltooling.jar"/>
+        </fileset>
+      </copy>
+      <copy todir="@{targetdir}/org/jboss/as/webservices/main"
flatten="false" overwrite="true">
+        <fileset dir="@{thirdpartydir}/lib">
+          <include name=&quot;**/jbossws-cxf-resources-(a){jbossid}.jar&quot;/&gt;
+          <include name=&quot;**/jbossws-(a){jbossid}-server-integration.jar&quot;/&gt;
+        </fileset>
+      </copy>
+      <!-- module.xml files -->
+      <installModules targetDir="@{targetdir}">
+        <fileset dir="@{thirdpartydir}/modules/@{modules-jbossid}">
+          <include name="**/module.xml"/>
+          <exclude name="**/jboss/as/webservices/**/module.xml"/>
+          <exclude name="**/spring/**/module.xml"/>
+        </fileset>
+      </installModules>
+    </sequential>
+  </macrodef>
+
+  <macrodef name="macro-deploy-jbossws-modules-as7">
+    <attribute name="thirdpartydir"/>
+    <attribute name="targetdir"/>
+    <attribute name="jbossid"/>
+    <attribute name="modules-jbossid"/>
+    <sequential>
+      <!-- libraries -->
+      <copy todir="@{targetdir}/org/jboss/ws/jaxws-client/main"
flatten="false" overwrite="true">
+        <fileset dir="@{thirdpartydir}/lib">
+          <include name="**/jbossws-cxf-client.jar"/>
+        </fileset>
+      </copy>
+      <copy
todir="@{targetdir}/org/jboss/ws/jaxws-jboss-httpserver-httpspi/main"
flatten="false" overwrite="true">
+        <fileset dir="@{thirdpartydir}/lib">
+          <include name="**/jaxws-jboss-httpserver-httpspi.jar"/>
+        </fileset>
+     </copy>
+     <copy todir="@{targetdir}/org/jboss/ws/cxf/jbossws-cxf-server/main"
flatten="false" overwrite="true">
+        <fileset dir="@{thirdpartydir}/lib">
+          <include name="**/jbossws-cxf-server.jar"/>
+        </fileset>
+      </copy>
+      <copy todir="@{targetdir}/org/jboss/ws/cxf/jbossws-cxf-factories/main"
flatten="false" overwrite="true">
+        <fileset dir="@{thirdpartydir}/lib">
+          <include name="**/jbossws-cxf-factories.jar"/>
+        </fileset>
+      </copy>
+      <copy
todir="@{targetdir}/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main"
flatten="false" overwrite="true">
+        <fileset dir="@{thirdpartydir}/lib">
+          <include name="**/jbossws-cxf-transports-httpserver.jar"/>
+        </fileset>
+      </copy>
       <copy
todir="@{targetdir}/org/jboss/ws/native/jbossws-native-core/main"
flatten="false" overwrite="true">
         <fileset dir="@{thirdpartydir}/lib">
           <include name="**/jbossws-native-core.jar"/>
@@ -156,12 +263,18 @@
     <fail message="modifyjbossintegration must be specified"
unless="modifyjbossintegration"/>
   </target>
 
-  <target name="deploy-jbossws-cxf-modules">
+  <target name="deploy-jbossws-cxf-modules-as7">
     <fail message="installserver must be specified"
unless="installserver"/>
     <fail message="thirdpartydir must be specified"
unless="thirdpartydir"/>
-    <macro-deploy-jbossws-modules targetdir="${installserver}"
thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"
modules-jbossid="${modules-jbossid}"/>
+    <macro-deploy-jbossws-modules-as7 targetdir="${installserver}"
thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"
modules-jbossid="${modules-jbossid}"/>
   </target>
 	
+  <target name="deploy-jbossws-cxf-modules-as8">
+    <fail message="installserver must be specified"
unless="installserver"/>
+    <fail message="thirdpartydir must be specified"
unless="thirdpartydir"/>
+    <macro-deploy-jbossws-modules-as8 targetdir="${installserver}"
thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"
modules-jbossid="${modules-jbossid}"/>
+  </target>
+	
   <!-- ================================================================== -->
   <!-- Install Spring                                                     -->
   <!-- ================================================================== -->

Added: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as8.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as8.xml	         
              (rev 0)
+++
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as8.xml	2013-04-11
09:10:57 UTC (rev 17491)
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2011, Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags. See the copyright.txt file in the
+  ~ distribution for a full listing of individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+
+<deploymentAspects xmlns="urn:jboss:ws:deployment:aspects:1.0">
+
+  <deploymentAspect
class="org.jboss.ws.common.deployment.ContextPropertiesDeploymentAspect">
+    <property name="provides"
class="java.lang.String">ContextProperties</property>
+    <property name="contextProperties"
class="java.util.HashMap">
+      <map keyClass="java.lang.String"
valueClass="java.lang.String">
+        <entry>
+          <key>stack.transport.class</key>
+          <value>org.jboss.wsf.stack.cxf.CXFServletExt</value>
+        </entry>
+      </map>
+    </property>
+    <property name="forJaxRpc"
class="boolean">false</property>
+  </deploymentAspect>
+
+  <deploymentAspect
class="org.jboss.wsf.stack.cxf.deployment.aspect.DescriptorDeploymentAspect">
+    <property name="requires"
class="java.lang.String">EndpointAddress,JAXBIntros</property>
+    <property name="provides"
class="java.lang.String">StackDescriptor</property>
+    <property name="forJaxRpc"
class="boolean">false</property>
+  </deploymentAspect>
+
+  <deploymentAspect
class="org.jboss.wsf.stack.cxf.deployment.aspect.ResourceResolverDeploymentAspect">
+    <property name="provides"
class="java.lang.String">ResourceResolver</property>
+    <property name="forJaxRpc"
class="boolean">false</property>
+  </deploymentAspect>
+
+  <deploymentAspect
class="org.jboss.ws.common.deployment.EndpointHandlerDeploymentAspect">
+    <property name="requires"
class="java.lang.String">ContainerMetaData</property>
+    <property name="provides"
class="java.lang.String">StackEndpointHandler</property>
+    <property name="forJaxRpc"
class="boolean">false</property>
+  </deploymentAspect>
+
+  <deploymentAspect
class="org.jboss.wsf.stack.cxf.deployment.aspect.CXFInstanceProviderDeploymentAspect">
+    <property name="requires"
class="java.lang.String">ContainerMetaData,BusHolder</property>
+    <property name="provides"
class="java.lang.String">StackInstanceProvider</property>
+    <property name="forJaxRpc"
class="boolean">false</property>
+  </deploymentAspect>
+
+  <deploymentAspect
class="org.jboss.ws.common.deployment.JAXBIntroDeploymentAspect">
+    <property name="provides"
class="java.lang.String">JAXBIntros</property>
+    <property name="forJaxRpc"
class="boolean">false</property>
+  </deploymentAspect>
+
+  <deploymentAspect
class="org.jboss.wsf.stack.cxf.deployment.aspect.BusDeploymentAspect">
+    <property name="provides"
class="java.lang.String">BusHolder</property>
+    <property name="requires"
class="java.lang.String">ResourceResolver,StackDescriptor</property>
+    <property name="forJaxRpc"
class="boolean">false</property>
+  </deploymentAspect>
+
+</deploymentAspects>
+

Modified: stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml	2013-04-11
08:43:20 UTC (rev 17490)
+++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml	2013-04-11
09:10:57 UTC (rev 17491)
@@ -57,13 +57,9 @@
     />
 
     <copy
-      file="${src.dir}/jbossws-cxf-config-as7.xml"
+      file="${src.dir}/jbossws-cxf-config-as8.xml"
      
tofile="${dest.dir}/jbossws-jboss800/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
     />
-    <copy
-      file="${src.dir}/jbossws-jaxrpc-config-as7.xml"
-     
tofile="${dest.dir}/jbossws-jboss800/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml"
-    />
 
   </target>
 

Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml	2013-04-11 08:43:20 UTC (rev 17490)
+++ stack/cxf/trunk/modules/testsuite/pom.xml	2013-04-11 09:10:57 UTC (rev 17491)
@@ -819,6 +819,9 @@
             <configuration>
               <argLine>${surefire.jvm.args} ${surefire.jvm.management.args}
${surefire.default-mgmt-serurity.args}
-Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine>
               <excludes>
+                 <!--# JAX-RPC removed in EE 7 -->
+                 <exclude>org/jboss/test/ws/jaxrpc/**</exclude>
+
                  <!--# [CXF-1519] Explicitly set the namespace of a WebFault-->
                  <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
 


    

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

[jbossws-commits] JBossWS SVN: r17491 - in stack/cxf/trunk/modules: resources/src/main/resources/modules/jboss800/org/jboss/as/webservices/server and 5 other directories.