2:09 a.m.
Author: alessio.soldano(a)jboss.com
Date: 2011-10-11 03:09:02 -0400 (Tue, 11 Oct 2011)
New Revision: 15070
Added:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/jaxrpc-integration/
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/jaxrpc-integration/main/
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-jaxrpc-config-as7.xml
Removed:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/jaxrpc-integration/main/
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf
stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
stack/cxf/trunk/modules/testsuite/pom.xml
stack/cxf/trunk/pom.xml
Log:
[JBWS-3366] Merging changes from JBWS-3366 branch:
------------------------------------------------------------------------
r15047 | alessio.soldano(a)jboss.com | 2011-10-07 16:44:44 +0200 (Fri, 07 Oct 2011) | 2
lines
Adding jaxrpc-integration module
------------------------------------------------------------------------
r15046 | alessio.soldano(a)jboss.com | 2011-10-07 16:43:45 +0200 (Fri, 07 Oct 2011) | 2
lines
Fixing list of modules do undeploy
------------------------------------------------------------------------
r15044 | alessio.soldano(a)jboss.com | 2011-10-07 10:45:33 +0200 (Fri, 07 Oct 2011) | 3
lines
- Adding jaxrpc deployment aspects
- Fixing testsuite classpath / dependencies and enabling few jaxrpc tests (DII only)
------------------------------------------------------------------------
Deleted:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml
===================================================================
---
stack/cxf/branches/JBWS-3366/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml 2011-10-07
14:44:44 UTC (rev 15047)
+++
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml 2011-10-11
07:09:02 UTC (rev 15070)
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- ~ JBoss, Home of Professional Open Source.
- ~ Copyright 2010, 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.
- -->
-
-<module xmlns="urn:jboss:module:1.0"
name="org.jboss.as.webservices.server.jaxrpc-integration">
-
- <resources>
- </resources>
-
- <dependencies>
- <module name="javax.api" export="true"/>
- <module name="javax.xml.rpc.api" export="true"/>
- <module name="javax.wsdl4j.api" export="true"/>
- <module name="com.sun.xml.bind" services="export"
export="true"/>
- <module name="org.jboss.ws.api" export="true"/>
- <module name="org.jboss.ws.spi" export="true"/>
- <module name="org.jboss.ws.common" services="import"
export="true"/>
- <module name="org.jboss.ws.native.jbossws-native-factories"
services="export" export="true"/>
- <module name="org.jboss.ws.native.jbossws-native-core"
services="export" export="true">
- <imports>
- <include path="META-INF"/>
- <include path="dtd"/>
- <include path="schema"/>
- </imports>
- <exports>
- <include path="META-INF"/>
- <include path="dtd"/>
- <include path="schema"/>
- </exports>
- </module>
- <module name="org.jboss.ws.native.jbossws-native-services"
services="export" export="true"/>
- <module name="org.apache.xalan" services="export"
export="true"/>
- <module name="org.apache.xerces" services="export"
export="true"/>
- <module name="org.jboss.as.webservices" services="export"
export="true"/>
- </dependencies>
-</module>
Copied:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml
(from rev 15047,
stack/cxf/branches/JBWS-3366/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml)
===================================================================
---
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml
(rev 0)
+++
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml 2011-10-11
07:09:02 UTC (rev 15070)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2010, 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.
+ -->
+
+<module xmlns="urn:jboss:module:1.0"
name="org.jboss.as.webservices.server.jaxrpc-integration">
+
+ <resources>
+ </resources>
+
+ <dependencies>
+ <module name="javax.api" export="true"/>
+ <module name="javax.xml.rpc.api" export="true"/>
+ <module name="javax.wsdl4j.api" export="true"/>
+ <module name="com.sun.xml.bind" services="export"
export="true"/>
+ <module name="org.jboss.ws.api" export="true"/>
+ <module name="org.jboss.ws.spi" export="true"/>
+ <module name="org.jboss.ws.common" services="import"
export="true"/>
+ <module name="org.jboss.ws.native.jbossws-native-factories"
services="export" export="true"/>
+ <module name="org.jboss.ws.native.jbossws-native-core"
services="export" export="true">
+ <imports>
+ <include path="META-INF"/>
+ <include path="dtd"/>
+ <include path="schema"/>
+ </imports>
+ <exports>
+ <include path="META-INF"/>
+ <include path="dtd"/>
+ <include path="schema"/>
+ </exports>
+ </module>
+ <module name="org.jboss.ws.native.jbossws-native-services"
services="export" export="true"/>
+ <module name="org.apache.xalan" services="export"
export="true"/>
+ <module name="org.apache.xerces" services="export"
export="true"/>
+ <module name="org.jboss.as.webservices" services="export"
export="true"/>
+ </dependencies>
+</module>
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf
===================================================================
---
stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf 2011-10-11
06:58:56 UTC (rev 15069)
+++
stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf 2011-10-11
07:09:02 UTC (rev 15070)
@@ -1 +1 @@
-org/apache/cxf/**, org/apache/neethi/**, org/apache/ws/commons/xmlschema/**,
org/jboss/ws/cxf/**, org/jboss/ws/**, org/springframework/spring/**
\ No newline at end of file
+org/apache/cxf/**, org/apache/neethi/**, org/apache/ws/commons/xmlschema/**,
org/jboss/ws/cxf/**, org/jboss/ws/api/**, org/jboss/ws/common/**,
org/jboss/ws/jaxws-client/**, org/jboss/ws/jaxws-jboss-httpserver-httpspi/**,
org/jboss/ws/saaj-impl/**, org/jboss/ws/spi/**, org/jboss/ws/tools/**,
org/springframework/spring/**
\ No newline at end of file
Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-jaxrpc-config-as7.xml
(from rev 15047,
stack/cxf/branches/JBWS-3366/modules/server/src/main/resources/jbossws-jaxrpc-config-as7.xml)
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-jaxrpc-config-as7.xml
(rev 0)
+++
stack/cxf/trunk/modules/server/src/main/resources/jbossws-jaxrpc-config-as7.xml 2011-10-11
07:09:02 UTC (rev 15070)
@@ -0,0 +1,76 @@
+<?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, StackDescriptor</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.jbws.EndpointServlet</value>
+ </entry>
+ </map>
+ </property>
+ <property name="forJaxWs"
class="boolean">false</property>
+ </deploymentAspect>
+
+ <deploymentAspect
class="org.jboss.wsf.stack.jbws.EagerInitializeDeploymentAspect">
+ <property name="requires"
class="java.lang.String">UnifiedMetaDataModel</property>
+ <property name="provides"
class="java.lang.String">InitializedMetaDataModel</property>
+ <property name="forJaxWs"
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="forJaxWs"
class="boolean">false</property>
+ </deploymentAspect>
+
+ <deploymentAspect
class="org.jboss.wsf.stack.jbws.NativeInstanceProviderDeploymentAspect">
+ <property name="requires"
class="java.lang.String">ContainerMetaData</property>
+ <property name="provides"
class="java.lang.String">StackInstanceProvider</property>
+ <property name="forJaxWs"
class="boolean">false</property>
+ </deploymentAspect>
+
+ <deploymentAspect
class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect">
+ <property name="requires"
class="java.lang.String">UnifiedMetaDataModel, JAXBIntros</property>
+ <property name="provides"
class="java.lang.String">PublishedContract</property>
+ <property name="forJaxWs"
class="boolean">false</property>
+ </deploymentAspect>
+
+ <deploymentAspect
class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeploymentAspect">
+ <property name="requires"
class="java.lang.String">UnifiedMetaDataModel</property>
+ <property name="forJaxWs"
class="boolean">false</property>
+ </deploymentAspect>
+
+ <deploymentAspect
class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect">
+ <property name="requires"
class="java.lang.String">ContainerMetaData, URLPattern, EndpointAddress,
VFSRoot, JAXBIntros</property>
+ <property name="provides"
class="java.lang.String">UnifiedMetaDataModel</property>
+ <property name="forJaxWs"
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 2011-10-11
06:58:56 UTC (rev 15069)
+++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2011-10-11
07:09:02 UTC (rev 15070)
@@ -41,9 +41,18 @@
tofile="${dest.dir}/jbossws-jboss700/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
/>
<copy
+ file="${src.dir}/jbossws-jaxrpc-config-as7.xml"
+
tofile="${dest.dir}/jbossws-jboss700/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml"
+ />
+
+ <copy
file="${src.dir}/jbossws-cxf-config-as7.xml"
tofile="${dest.dir}/jbossws-jboss710/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
/>
+ <copy
+ file="${src.dir}/jbossws-jaxrpc-config-as7.xml"
+
tofile="${dest.dir}/jbossws-jboss710/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml"
+ />
</target>
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-10-11 06:58:56 UTC (rev 15069)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-10-11 07:09:02 UTC (rev 15070)
@@ -1151,6 +1151,57 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <version>${jboss.xb.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>wutka-dtdparser</groupId>
+ <artifactId>dtdparser121</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -1167,8 +1218,6 @@
<phase>test-compile</phase>
<configuration>
<testExcludes>
- <!-- AS7 compilation excludes -->
- <exclude>org/jboss/test/ws/jaxrpc/**</exclude>
<!-- EJB3 client API dependencies -->
<exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
@@ -1186,8 +1235,11 @@
<argLine>${surefire.jvm.args} ${surefire.jvm.management.args}
-Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine>
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
- <!-- Lib below required just for jaxrpc tests; listed here to prevent
CXF stack from depending on Native stack -->
-
<additionalClasspathElement>${jboss.home}/common/lib/jbossws-native-core.jar</additionalClasspathElement>
+ <!-- Lib below required just for jaxrpc tests; listed here to prevent
CXF stack from depending on Native stack -->
+ <!-- JBossWS Native Core version available on 710 -->
+
<additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.0-SNAPSHOT.jar</additionalClasspathElement>
+ <!-- JBossWS Native Core version overwritte by jbossws-native stack
install -->
+
<additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalClasspathElement>
</additionalClasspathElements>
<excludes>
<!--# UsernameTestCase requires trustore in jboss-web tomcat
configuration-->
@@ -1249,7 +1301,6 @@
<exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
<!-- # [JBWS-3234] JNDI over RMI not available on AS7 -->
- <exclude>org/jboss/test/ws/jaxrpc/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/serviceref/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
@@ -1275,6 +1326,20 @@
<!-- JAXR not available -->
<exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
+
+ <!-- appclient not available for JAXRPC clients -->
+
<exclude>org/jboss/test/ws/jaxrpc/samples/docstyle/**</exclude>
+
<exclude>org/jboss/test/ws/jaxrpc/samples/exception/**</exclude>
+
<exclude>org/jboss/test/ws/jaxrpc/samples/handler/**</exclude>
+
<exclude>org/jboss/test/ws/jaxrpc/samples/jsr109ejb/**</exclude>
+
<exclude>org/jboss/test/ws/jaxrpc/samples/jsr109pojo/**</exclude>
+
<exclude>org/jboss/test/ws/jaxrpc/samples/message/**</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/mtom/**</exclude>
+
<exclude>org/jboss/test/ws/jaxrpc/samples/oneway/**</exclude>
+
<exclude>org/jboss/test/ws/jaxrpc/samples/rpcstyle/**</exclude>
+
<exclude>org/jboss/test/ws/jaxrpc/samples/secureejb/**</exclude>
+
<exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/**</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/swa/**</exclude>
<!-- Former JMS endpoint functionalities replaced by SOAP-over-JMS on
AS7 -->
<exclude>org/jboss/test/ws/jaxws/samples/**/jmstransport/**</exclude>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2011-10-11 06:58:56 UTC (rev 15069)
+++ stack/cxf/trunk/pom.xml 2011-10-11 07:09:02 UTC (rev 15070)
@@ -62,7 +62,7 @@
<jboss.logging.version>3.0.0.Beta5</jboss.logging.version>
<jboss.security.spi.version>2.0.4.SP4</jboss.security.spi.version>
<jboss.security.sx.version>2.0.4</jboss.security.sx.version>
- <jboss.xb.version>2.0.2.Beta7</jboss.xb.version>
+ <jboss.xb.version>2.0.3.GA</jboss.xb.version>
<picketbox.version>3.0.0.Beta5</picketbox.version>
<jaxws-jboss-httpserver-httpspi.version>1.0.0.GA</jaxws-jboss-httpserver-httpspi.version>
<httpserver.version>1.0.0.Beta1</httpserver.version>