JBossWS SVN: r16187 - legacy/branches.
by jbossws-commits＠lists.jboss.org
Author: bmaxwell
Date: 2012-04-19 13:20:12 -0400 (Thu, 19 Apr 2012)
New Revision: 16187
Added:
legacy/branches/jbossws-1.2.1.GA_CP06-patch-02_JBPAPP-8785/
Log:
[JBPAPP-8785] create one off patch branch
12 years
JBossWS SVN: r16184 - in stack/cxf/trunk: modules/dist and 18 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-04-19 07:24:18 -0400 (Thu, 19 Apr 2012)
New Revision: 16184
Added:
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/main/
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-services/
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-services/main/
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-services/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-services/
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-services/main/
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-services/main/module.xml
Modified:
stack/cxf/trunk/modules/dist/pom.xml
stack/cxf/trunk/modules/dist/src/main/distro/build.xml
stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf
stack/cxf/trunk/modules/testsuite/pom.xml
stack/cxf/trunk/pom.xml
Log:
[JBWS-3473] Adding jbossws-native dependency into jbossws-cxf for installing/updating native-core as part of jbws-cxf deploy and for simplyfing testsuite dependencies configuration now that jbossws-native has been slimmed down
Modified: stack/cxf/trunk/modules/dist/pom.xml
===================================================================
--- stack/cxf/trunk/modules/dist/pom.xml 2012-04-19 11:17:05 UTC (rev 16183)
+++ stack/cxf/trunk/modules/dist/pom.xml 2012-04-19 11:24:18 UTC (rev 16184)
@@ -69,6 +69,16 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-services</artifactId>
+ </dependency>
+
<!--test-suite-->
<dependency>
<groupId>org.jboss.ws</groupId>
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2012-04-19 11:17:05 UTC (rev 16183)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2012-04-19 11:24:18 UTC (rev 16184)
@@ -76,9 +76,11 @@
<target name="tests-init" depends="init,tests-classpath">
<!-- JBossWS jars first to override META-INF/services declarations duplicated in CXF jars (alternative is using endorsing) -->
+ <!-- Avoid including jbossws-native-services.jar, we just need and want jbossws-native-core for jaxrpc tests -->
<path id="ws.stack.classpath">
<fileset dir="${thirdparty.dir}">
<include name="**/jbossws*.jar"/>
+ <exclude name="**/jbossws-native-services.jar"/>
<exclude name="**/jbossws-jboss*.jar"/>
</fileset>
<fileset dir="${thirdparty.dir}">
Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-04-19 11:17:05 UTC (rev 16183)
+++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-04-19 11:24:18 UTC (rev 16184)
@@ -34,6 +34,8 @@
<include>org.jboss.ws.cxf:jbossws-cxf-factories:jar</include>
<include>org.jboss.ws.cxf:jbossws-cxf-server:jar</include>
<include>org.jboss.ws.cxf:jbossws-cxf-transports-httpserver:jar</include>
+ <include>org.jboss.ws.native:jbossws-native-core:jar</include>
+ <include>org.jboss.ws.native:jbossws-native-services:jar</include>
<include>org.jboss.ws.projects:jaxws-jboss-httpserver-httpspi:jar</include>
<include>org.jboss.com.sun.httpserver:httpserver:jar</include>
<include>org.apache.cxf:cxf-*</include>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml 2012-04-19 11:17:05 UTC (rev 16183)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml 2012-04-19 11:24:18 UTC (rev 16184)
@@ -35,7 +35,6 @@
<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"/>
Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/main/module.xml (rev 0)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-04-19 11:24:18 UTC (rev 16184)
@@ -0,0 +1,49 @@
+<?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.
+ -->
+
+<module xmlns="urn:jboss:module:1.0" name="org.jboss.ws.native.jbossws-native-core">
+
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+
+ <dependencies>
+ <module name="javax.api" />
+ <module name="javax.servlet.api" />
+ <module name="javax.mail.api" />
+ <module name="javax.wsdl4j.api" />
+ <module name="javax.xml.stream.api" />
+ <module name="javax.xml.rpc.api" />
+ <module name="org.apache.xerces" services="import"/>
+ <module name="org.javassist" />
+ <module name="org.jboss.netty" />
+ <module name="org.jboss.xb" />
+ <module name="org.jboss.ws.api" />
+ <module name="org.jboss.ws.spi" />
+ <module name="org.jboss.ws.common" />
+ <module name="org.jboss.ws.native.jbossws-native-services" services="import"/>
+ <module name="org.jboss.common-core" />
+ <module name="org.jboss.logging" />
+ </dependencies>
+</module>
Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-services/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-services/main/module.xml (rev 0)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-services/main/module.xml 2012-04-19 11:24:18 UTC (rev 16184)
@@ -0,0 +1,34 @@
+<?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.
+ -->
+
+<module xmlns="urn:jboss:module:1.0" name="org.jboss.ws.native.jbossws-native-services">
+
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+
+ <dependencies>
+
+ </dependencies>
+</module>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml 2012-04-19 11:17:05 UTC (rev 16183)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml 2012-04-19 11:24:18 UTC (rev 16184)
@@ -35,7 +35,6 @@
<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"/>
Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml (rev 0)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-04-19 11:24:18 UTC (rev 16184)
@@ -0,0 +1,49 @@
+<?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.
+ -->
+
+<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.native.jbossws-native-core">
+
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+
+ <dependencies>
+ <module name="javax.api" />
+ <module name="javax.servlet.api" />
+ <module name="javax.mail.api" />
+ <module name="javax.wsdl4j.api" />
+ <module name="javax.xml.stream.api" />
+ <module name="javax.xml.rpc.api" />
+ <module name="org.apache.xerces" services="import"/>
+ <module name="org.javassist" />
+ <module name="org.jboss.netty" />
+ <module name="org.jboss.xb" />
+ <module name="org.jboss.ws.api" />
+ <module name="org.jboss.ws.spi" />
+ <module name="org.jboss.ws.common" />
+ <module name="org.jboss.ws.native.jbossws-native-services" services="import"/>
+ <module name="org.jboss.common-core" />
+ <module name="org.jboss.logging" />
+ </dependencies>
+</module>
Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-services/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-services/main/module.xml (rev 0)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-services/main/module.xml 2012-04-19 11:24:18 UTC (rev 16184)
@@ -0,0 +1,34 @@
+<?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.
+ -->
+
+<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.native.jbossws-native-services">
+
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+
+ <dependencies>
+
+ </dependencies>
+</module>
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 2012-04-19 11:17:05 UTC (rev 16183)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-04-19 11:24:18 UTC (rev 16184)
@@ -83,8 +83,18 @@
<include name="**/jbossws-cxf-transports-httpserver.jar"/>
</fileset>
</copy>
- <copy todir="@{targetdir}/org/apache/cxf//main" flatten="false" overwrite="true">
+ <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"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/org/jboss/ws/native/jbossws-native-services/main" flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/jbossws-native-services.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/org/apache/cxf/main" flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
<include name="**/cxf-*.jar"/>
</fileset>
</copy>
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 2012-04-19 11:17:05 UTC (rev 16183)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf 2012-04-19 11:24:18 UTC (rev 16184)
@@ -1 +1 @@
-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/opensaml/**, 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/opensaml/**, org/springframework/spring/**, org/jboss/ws/native/**
\ No newline at end of file
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2012-04-19 11:17:05 UTC (rev 16183)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-04-19 11:24:18 UTC (rev 16184)
@@ -78,6 +78,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -651,11 +656,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<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>
- </additionalClasspathElements>
<excludes>
<!--# UsernameTestCase requires trustore in jboss-web tomcat configuration-->
<exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*</exclude>
@@ -931,16 +931,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.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 -->
- <!-- JBossWS Native Core version overwritten by jbossws-native stack install -->
- <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalClasspathElement>
- <!-- JBossWS Native Core version available on 710 -->
- <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.1.GA.jar</additionalClasspathElement>
- <!-- JBossWS Native Core version specified through system property -->
- <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/${jbossws-native-core.filename}</additionalClasspathElement>
- </additionalClasspathElements>
<excludes>
<!--# UsernameTestCase requires trustore in jboss-web tomcat configuration-->
<exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*</exclude>
@@ -1165,16 +1155,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.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 -->
- <!-- JBossWS Native Core version overwritten by jbossws-native stack install -->
- <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalClasspathElement>
- <!-- JBossWS Native Core version available on 711 -->
- <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.2.GA.jar</additionalClasspathElement>
- <!-- JBossWS Native Core version specified through system property -->
- <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/${jbossws-native-core.filename}</additionalClasspathElement>
- </additionalClasspathElements>
<excludes>
<!--# UsernameTestCase requires trustore in jboss-web tomcat configuration-->
<exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*</exclude>
@@ -1389,16 +1369,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.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 -->
- <!-- JBossWS Native Core version overwritten by jbossws-native stack install -->
- <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalClasspathElement>
- <!-- JBossWS Native Core version available on 712 -->
- <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.2.GA.jar</additionalClasspathElement>
- <!-- JBossWS Native Core version specified through system property -->
- <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/${jbossws-native-core.filename}</additionalClasspathElement>
- </additionalClasspathElements>
<excludes>
<!--# UsernameTestCase requires trustore in jboss-web tomcat configuration-->
<exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*</exclude>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2012-04-19 11:17:05 UTC (rev 16183)
+++ stack/cxf/trunk/pom.xml 2012-04-19 11:24:18 UTC (rev 16184)
@@ -61,12 +61,13 @@
<properties>
<jbossws.api.version>1.0.0.GA</jbossws.api.version>
<jbossws.spi.version>2.1.0-SNAPSHOT</jbossws.spi.version>
- <jbossws.common.version>2.0.2.GA</jbossws.common.version> <!-- TODO [JBWS-3473] move back to 2.1.0-SNAPSHOT -->
+ <jbossws.common.version>2.1.0-SNAPSHOT</jbossws.common.version>
<jbossws.common.tools.version>1.1.0-SNAPSHOT</jbossws.common.tools.version>
<jbossws.shared.testsuite.version>4.1.0-SNAPSHOT</jbossws.shared.testsuite.version>
<jbossws.jboss702.version>4.1.0-SNAPSHOT</jbossws.jboss702.version>
<jbossws.jboss710.version>4.1.0-SNAPSHOT</jbossws.jboss710.version>
<jbossws.jboss711.version>4.1.0-SNAPSHOT</jbossws.jboss711.version>
+ <jbossws.native.version>4.1.0-SNAPSHOT</jbossws.native.version>
<jboss702.version>7.0.2.Final</jboss702.version>
<jboss710.version>7.1.0.Final</jboss710.version>
<jboss711.version>7.1.1.Final</jboss711.version>
@@ -1115,7 +1116,53 @@
<scope>provided</scope>
</dependency>
+ <!-- JBossWS Native dependencies for installation and testsuite only -->
<dependency>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-core</artifactId>
+ <version>${jbossws.native.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.netty</groupId>
+ <artifactId>netty</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-services</artifactId>
+ <version>${jbossws.native.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>javax.jws</groupId>
<artifactId>jsr181-api</artifactId>
<version>${jsr181.api.version}</version>
12 years
JBossWS SVN: r16185 - shared-testsuite/trunk/testsuite/src/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-04-19 07:26:13 -0400 (Thu, 19 Apr 2012)
New Revision: 16185
Modified:
shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
Log:
[JBWS-3473] Removing explicit native-core dependencies in ant build-testsuite; the native core dependency is coming from the stack configuration only now
Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2012-04-19 11:24:18 UTC (rev 16184)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2012-04-19 11:26:13 UTC (rev 16185)
@@ -115,17 +115,6 @@
<isset property="jboss.home"/>
</condition>
- <!-- JBossWS Native Core version -->
- <condition property="jbossws-native-core.default-filename" value="4.0.1.GA">
- <equals arg1="${jbossws.integration.target}" arg2="jboss710"/>
- </condition>
- <condition property="jbossws-native-core.default-filename" value="4.0.2.GA">
- <equals arg1="${jbossws.integration.target}" arg2="jboss711"/>
- </condition>
- <condition property="jbossws-native-core.default-filename" value="4.0.2.GA">
- <equals arg1="${jbossws.integration.target}" arg2="jboss712"/>
- </condition>
-
<echo/>
<echo message="-----------------------------------------------"/>
<echo message="jboss.home = ${jboss.home}"/>
@@ -404,15 +393,6 @@
<fileset dir="${jboss.home}/modules/org/jboss/xb/main/">
<include name="jbossxb-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/">
- <include name="jbossws-native-core-${jbossws-native-core.filename}.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/">
- <include name="jbossws-native-core.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/">
- <include name="jbossws-native-core-${jbossws-native-core.default-filename}.jar"/>
- </fileset>
<!-- END ## jaxrpc tests ## -->
<fileset dir="${jboss.home}/modules/org/apache/xalan/main/">
<include name="serializer-*.jar"/>
12 years
JBossWS SVN: r16183 - stack/cxf/trunk/modules/dist/src/main/scripts.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-04-19 07:17:05 -0400 (Thu, 19 Apr 2012)
New Revision: 16183
Modified:
stack/cxf/trunk/modules/dist/src/main/scripts/assembly-bin-dist.xml
Log:
[JBWS-3489] Adding modules-deploy.conf to binary distro
Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-bin-dist.xml 2012-04-19 04:47:36 UTC (rev 16182)
+++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-bin-dist.xml 2012-04-19 11:17:05 UTC (rev 16183)
@@ -37,8 +37,7 @@
<directory>../resources/src/main/resources/resources</directory>
<outputDirectory>jbossws-cxf-bin-dist/build</outputDirectory>
<includes>
- <include>deploy.conf</include>
- <include>server-deploy.conf</include>
+ <include>modules-deploy.conf</include>
<include>jbossws-deploy-macros.xml</include>
</includes>
</fileSet>
12 years
JBossWS SVN: r16182 - in stack/native/trunk: modules and 21 other directories.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-04-19 00:47:36 -0400 (Thu, 19 Apr 2012)
New Revision: 16182
Removed:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SAAJVisitable.java
stack/native/trunk/modules/endorsed/
stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-factories/
stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/saaj-impl/
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/soap/
Modified:
stack/native/trunk/modules/core/pom.xml
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/utils/SOAPUtils.java
stack/native/trunk/modules/dist/pom.xml
stack/native/trunk/modules/dist/src/main/distro/build.xml
stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml
stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml
stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbws1692/JBWS1692TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/HRefHandler.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java
stack/native/trunk/modules/testsuite/pom.xml
stack/native/trunk/pom.xml
Log:
[JBWS-3486] removing endorsed module
Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml 2012-04-18 07:56:53 UTC (rev 16181)
+++ stack/native/trunk/modules/core/pom.xml 2012-04-19 04:47:36 UTC (rev 16182)
@@ -36,11 +36,6 @@
<artifactId>jboss-saaj-api_1.3_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-factories</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>org.jboss.spec.javax.ejb</groupId>
<artifactId>jboss-ejb-api_3.1_spec</artifactId>
</dependency>
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2012-04-18 07:56:53 UTC (rev 16181)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2012-04-19 04:47:36 UTC (rev 16182)
@@ -54,7 +54,6 @@
import org.jboss.ws.core.jaxrpc.ParameterWrapping;
import org.jboss.ws.core.soap.SOAPBodyElementDoc;
import org.jboss.ws.core.soap.SOAPBodyElementRpc;
-import org.jboss.ws.core.soap.SOAPBodyImpl;
import org.jboss.ws.core.soap.SOAPContentElement;
import org.jboss.ws.core.soap.SOAPElementImpl;
import org.jboss.ws.core.soap.SOAPFaultImpl;
@@ -439,8 +438,8 @@
throw new WSException(BundleUtils.getMessage(bundle, "MESSAGECONTEXT_NOT_AVAILABLE"));
SOAPHeader soapHeader = soapEnvelope.getHeader();
- SOAPBodyImpl soapBody = (SOAPBodyImpl)soapEnvelope.getBody();
- SOAPBodyElement soapBodyElement = soapBody.getBodyElement();
+ SOAPBody soapBody = (SOAPBody)soapEnvelope.getBody();
+ SOAPBodyElement soapBodyElement = SOAPUtils.getFirstSOAPBodyElement(soapBody);
// Translate the SOAPFault to an exception and throw it
if (soapBodyElement instanceof SOAPFaultImpl)
Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SAAJVisitable.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SAAJVisitable.java 2012-04-18 07:56:53 UTC (rev 16181)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SAAJVisitable.java 2012-04-19 04:47:36 UTC (rev 16182)
@@ -1,30 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, 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.
- */
-package org.jboss.ws.core.soap;
-
-/**
- * @author Heiko Braun <heiko.braun(a)jboss.com>
- * @since Sep 26, 2006
- */
-public interface SAAJVisitable {
- public void accept(SAAJVisitor visitor);
-}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2012-04-18 07:56:53 UTC (rev 16181)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2012-04-19 04:47:36 UTC (rev 16182)
@@ -60,7 +60,7 @@
*
* @author Thomas.Diesler(a)jboss.org
*/
-public class SOAPElementImpl extends NodeImpl implements SOAPElement, SAAJVisitable
+public class SOAPElementImpl extends NodeImpl implements SOAPElement
{
private static final ResourceBundle bundle = BundleUtils.getBundle(SOAPElementImpl.class);
// The org.w3c.dom.Element
@@ -868,11 +868,6 @@
this.element.setIdAttributeNS(namespaceURI, localName, isId);
}
- public void accept(SAAJVisitor visitor)
- {
- visitor.visitSOAPElement(this);
- }
-
@Override
public void setPrefix(String prefix) throws DOMException
{
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/utils/SOAPUtils.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/utils/SOAPUtils.java 2012-04-18 07:56:53 UTC (rev 16181)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/utils/SOAPUtils.java 2012-04-19 04:47:36 UTC (rev 16182)
@@ -21,8 +21,13 @@
*/
package org.jboss.ws.core.soap.utils;
+import java.util.Iterator;
+
import javax.xml.namespace.QName;
import javax.xml.soap.Name;
+import javax.xml.soap.SOAPBody;
+import javax.xml.soap.SOAPBodyElement;
+import javax.xml.soap.SOAPConnectionFactory;
import javax.xml.soap.SOAPConstants;
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPException;
@@ -31,6 +36,7 @@
import javax.xml.soap.SOAPMessage;
import org.jboss.ws.core.soap.MessageFactoryImpl;
+import org.jboss.ws.core.soap.SOAPConnectionFactoryImpl;
import org.jboss.ws.core.soap.SOAPFactoryImpl;
/**
@@ -69,6 +75,24 @@
return newSOAPFactory(SOAPConstants.SOAP_1_2_PROTOCOL);
}
+ public static SOAPConnectionFactory newSOAPConnectionFactory() throws SOAPException {
+ return new SOAPConnectionFactoryImpl();
+ // TODO: use standard SOAP API to create objects
+ //return SOAPConnectionFactory.newInstance();
+ }
+
+ public static SOAPBodyElement getFirstSOAPBodyElement(final SOAPBody soapBody) {
+ SOAPBodyElement bodyElement = null;
+ final Iterator<?> it = soapBody.getChildElements();
+ while (bodyElement == null && it.hasNext())
+ {
+ Object next = it.next();
+ if (next instanceof SOAPBodyElement)
+ bodyElement = (SOAPBodyElement)next;
+ }
+ return bodyElement;
+ }
+
private static SOAPFactory newSOAPFactory(final String protocol) {
try {
return new SOAPFactoryImpl(protocol);
Modified: stack/native/trunk/modules/dist/pom.xml
===================================================================
--- stack/native/trunk/modules/dist/pom.xml 2012-04-18 07:56:53 UTC (rev 16181)
+++ stack/native/trunk/modules/dist/pom.xml 2012-04-19 04:47:36 UTC (rev 16182)
@@ -19,12 +19,6 @@
<dependencies>
<dependency>
<groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-factories</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-services</artifactId>
<version>${project.version}</version>
</dependency>
Modified: stack/native/trunk/modules/dist/src/main/distro/build.xml
===================================================================
--- stack/native/trunk/modules/dist/src/main/distro/build.xml 2012-04-18 07:56:53 UTC (rev 16181)
+++ stack/native/trunk/modules/dist/src/main/distro/build.xml 2012-04-19 04:47:36 UTC (rev 16182)
@@ -74,7 +74,6 @@
<!-- Move the native API to the front of the classpath -->
<pathelement location="${thirdparty.dir}/jaxrpc-api.jar"/>
<pathelement location="${thirdparty.dir}/saaj-api.jar"/>
- <pathelement location="${thirdparty.dir}/jbossws-native-factories.jar"/>
<fileset dir="${thirdparty.dir}">
<exclude name="**/jbossws-jboss*.jar"/>
</fileset>
Modified: stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-04-18 07:56:53 UTC (rev 16181)
+++ stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-04-19 04:47:36 UTC (rev 16182)
@@ -24,7 +24,6 @@
<include>**/module.xml</include>
</includes>
</fileSet>
-
</fileSets>
<dependencySets>
@@ -32,7 +31,6 @@
<outputDirectory>deploy-artifacts/lib</outputDirectory>
<unpack>false</unpack>
<includes>
- <include>org.jboss.ws.native:jbossws-native-factories:jar</include>
<include>org.jboss.ws.native:jbossws-native-services:jar</include>
<include>org.jboss.ws.native:jbossws-native-core</include>
<include>org.jboss.ws:jbossws-api:jar</include>
@@ -60,7 +58,7 @@
<dependencySet>
<outputDirectory>deploy-artifacts/lib</outputDirectory>
- <unpack>false</unpack>
+ <unpack>false</unpack>
<includes>
<include>org.jboss.ws:jbossws-jboss*:jar</include>
</includes>
@@ -71,7 +69,7 @@
<dependencySet>
<outputDirectory>deploy-artifacts/lib</outputDirectory>
- <unpack>false</unpack>
+ <unpack>false</unpack>
<includes>
<include>org.jboss.ws.native:jbossws-native-resources:jar:*:jboss*</include>
</includes>
Modified: stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml 2012-04-18 07:56:53 UTC (rev 16181)
+++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml 2012-04-19 04:47:36 UTC (rev 16182)
@@ -29,13 +29,10 @@
<dependencies>
<module name="javax.api" export="true"/>
- <module name="javax.jws.api" export="true"/>
<module name="javax.wsdl4j.api" export="true"/>
- <module name="javax.xml.ws.api" 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"/>
@@ -49,8 +46,8 @@
</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/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-04-18 07:56:53 UTC (rev 16181)
+++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-04-19 04:47:36 UTC (rev 16182)
@@ -42,7 +42,6 @@
<module name="org.jboss.ws.api" />
<module name="org.jboss.ws.spi" />
<module name="org.jboss.ws.common" />
- <module name="org.jboss.ws.native.jbossws-native-factories" services="import"/>
<module name="org.jboss.ws.native.jbossws-native-services" services="import"/>
<module name="org.jboss.common-core" />
<module name="org.jboss.logging" />
Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-04-18 07:56:53 UTC (rev 16181)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-04-19 04:47:36 UTC (rev 16182)
@@ -40,11 +40,6 @@
<include name="**/jbossws-native-core.jar"/>
</fileset>
</copy>
- <copy todir="@{targetdir}/org/jboss/ws/native/jbossws-native-factories/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jbossws-native-factories.jar"/>
- </fileset>
- </copy>
<copy todir="@{targetdir}/org/jboss/ws/native/jbossws-native-services/main" flatten="false" overwrite="true">
<fileset dir="@{thirdpartydir}/lib">
<include name="**/jbossws-native-services.jar"/>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java 2012-04-18 07:56:53 UTC (rev 16181)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java 2012-04-19 04:47:36 UTC (rev 16182)
@@ -40,9 +40,8 @@
import org.jboss.ws.core.EndpointInvocation;
import org.jboss.ws.core.jaxrpc.client.CallImpl;
import org.jboss.ws.core.jaxrpc.handler.SOAPMessageContextJAXRPC;
-import org.jboss.ws.core.soap.MessageFactoryImpl;
-import org.jboss.ws.core.soap.SOAPMessageImpl;
import org.jboss.ws.core.soap.utils.MessageContextAssociation;
+import org.jboss.ws.core.soap.utils.SOAPUtils;
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.ws.metadata.umdm.ParameterMetaData;
import org.jboss.ws.common.DOMUtils;
@@ -226,8 +225,8 @@
ByteArrayInputStream inputStream = new ByteArrayInputStream(reqEnvelope.getBytes());
- MessageFactory factory = new MessageFactoryImpl();
- SOAPMessageImpl reqMessage = (SOAPMessageImpl)factory.createMessage(null, inputStream);
+ MessageFactory factory = SOAPUtils.newSOAP12MessageFactory();
+ SOAPMessage reqMessage = (SOAPMessage)factory.createMessage(null, inputStream);
CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
msgContext.setSOAPMessage(reqMessage);
@@ -253,8 +252,8 @@
ByteArrayInputStream inputStream = new ByteArrayInputStream(reqEnvelopeWithBoundHeader.getBytes());
- MessageFactory factory = new MessageFactoryImpl();
- SOAPMessageImpl reqMessage = (SOAPMessageImpl)factory.createMessage(null, inputStream);
+ MessageFactory factory = SOAPUtils.newSOAP12MessageFactory();
+ SOAPMessage reqMessage = factory.createMessage(null, inputStream);
CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
msgContext.setSOAPMessage(reqMessage);
@@ -276,8 +275,8 @@
{
ByteArrayInputStream inputStream = new ByteArrayInputStream(reqEnvelopeWithUnboundHeader.getBytes());
- MessageFactory factory = new MessageFactoryImpl();
- SOAPMessageImpl reqMessage = (SOAPMessageImpl)factory.createMessage(null, inputStream);
+ MessageFactory factory = SOAPUtils.newSOAP12MessageFactory();
+ SOAPMessage reqMessage = (SOAPMessage)factory.createMessage(null, inputStream);
CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
msgContext.setSOAPMessage(reqMessage);
@@ -320,8 +319,8 @@
ByteArrayInputStream inputStream = new ByteArrayInputStream(resEnvelope.getBytes());
- MessageFactory factory = new MessageFactoryImpl();
- SOAPMessageImpl resMessage = (SOAPMessageImpl)factory.createMessage(null, inputStream);
+ MessageFactory factory = SOAPUtils.newSOAP12MessageFactory();
+ SOAPMessage resMessage = factory.createMessage(null, inputStream);
CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
msgContext.setSOAPMessage(resMessage);
@@ -340,8 +339,8 @@
ByteArrayInputStream inputStream = new ByteArrayInputStream(resEnvelopeWithBoundHeader.getBytes());
- MessageFactory factory = new MessageFactoryImpl();
- SOAPMessageImpl resMessage = (SOAPMessageImpl)factory.createMessage(null, inputStream);
+ MessageFactory factory = SOAPUtils.newSOAP12MessageFactory();
+ SOAPMessage resMessage = factory.createMessage(null, inputStream);
CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
msgContext.setSOAPMessage(resMessage);
@@ -371,8 +370,8 @@
ByteArrayInputStream inputStream = new ByteArrayInputStream(resEnvelopeWithFault.getBytes());
- MessageFactory factory = new MessageFactoryImpl();
- SOAPMessageImpl resMessage = (SOAPMessageImpl)factory.createMessage(null, inputStream);
+ MessageFactory factory = SOAPUtils.newSOAP12MessageFactory();
+ SOAPMessage resMessage = factory.createMessage(null, inputStream);
CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
msgContext.setSOAPMessage(resMessage);
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbws1692/JBWS1692TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbws1692/JBWS1692TestCase.java 2012-04-18 07:56:53 UTC (rev 16181)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbws1692/JBWS1692TestCase.java 2012-04-19 04:47:36 UTC (rev 16182)
@@ -29,6 +29,7 @@
import javax.xml.soap.MessageFactory;
import javax.xml.soap.SOAPMessage;
+import org.jboss.ws.core.soap.utils.SOAPUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
@@ -46,7 +47,7 @@
{
public void testImportNode() throws Exception
{
- MessageFactory factory = MessageFactory.newInstance();
+ MessageFactory factory = SOAPUtils.newSOAP11MessageFactory();
File soapreqfile = getResourceFile("common/jbws1692/soap-request-template.xml");
SOAPMessage msg = factory.createMessage(null, new FileInputStream(soapreqfile));
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/HRefHandler.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/HRefHandler.java 2012-04-18 07:56:53 UTC (rev 16181)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/HRefHandler.java 2012-04-19 04:47:36 UTC (rev 16182)
@@ -33,6 +33,7 @@
import javax.xml.soap.SOAPMessage;
import org.jboss.logging.Logger;
+import org.jboss.ws.core.soap.utils.SOAPUtils;
public class HRefHandler extends GenericHandler
{
@@ -77,7 +78,7 @@
"</env:Body>" +
"</env:Envelope>";
- MessageFactory factory = MessageFactory.newInstance();
+ MessageFactory factory = SOAPUtils.newSOAP11MessageFactory();
SOAPMessage reqMessage = factory.createMessage(null, new ByteArrayInputStream(envStr.getBytes()));
((SOAPMessageContext)msgContext).setMessage(reqMessage);
}
@@ -109,7 +110,7 @@
"</env:Body>" +
"</env:Envelope>";
- MessageFactory factory = MessageFactory.newInstance();
+ MessageFactory factory = SOAPUtils.newSOAP11MessageFactory();
SOAPMessage resMessage = factory.createMessage(null, new ByteArrayInputStream(envStr.getBytes()));
((SOAPMessageContext)msgContext).setMessage(resMessage);
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java 2012-04-18 07:56:53 UTC (rev 16181)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java 2012-04-19 04:47:36 UTC (rev 16182)
@@ -39,6 +39,7 @@
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
import org.jboss.ws.common.DOMWriter;
+import org.jboss.ws.core.soap.utils.SOAPUtils;
/**
* Deploying a war that also contains normal servlets the web.xml is modified as if they are all endpoints
@@ -117,7 +118,7 @@
{
URL servletURL = new URL("http://" + getServerHost() + ":8080" + "/jaxrpc-jbws1093/ServletTest?type=soapMessage");
- SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection();
+ SOAPConnection con = SOAPUtils.newSOAPConnectionFactory().createConnection();
SOAPMessage resMessage = con.get(servletURL);
SOAPEnvelope env = resMessage.getSOAPPart().getEnvelope();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase.java 2012-04-18 07:56:53 UTC (rev 16181)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase.java 2012-04-19 04:47:36 UTC (rev 16182)
@@ -38,6 +38,7 @@
import junit.framework.Test;
+import org.jboss.ws.core.soap.utils.SOAPUtils;
import org.jboss.wsf.test.CleanupOperation;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -120,7 +121,7 @@
" </soapenv:Body>" +
"</soapenv:Envelope>";
- MessageFactory msgFactory = MessageFactory.newInstance();
+ MessageFactory msgFactory = SOAPUtils.newSOAP11MessageFactory();
SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection();
MimeHeaders mimeHeaders = new MimeHeaders();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java 2012-04-18 07:56:53 UTC (rev 16181)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java 2012-04-19 04:47:36 UTC (rev 16182)
@@ -28,13 +28,14 @@
import javax.xml.rpc.Service;
import javax.xml.soap.MessageFactory;
import javax.xml.soap.MimeHeaders;
+import javax.xml.soap.SOAPBody;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
import junit.framework.Test;
-import org.jboss.ws.core.soap.SOAPBodyImpl;
+import org.jboss.ws.core.soap.utils.SOAPUtils;
import org.jboss.wsf.test.CleanupOperation;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -201,8 +202,8 @@
mimeHeaders.addHeader("Content-Type", "text/xml; charset=UTF-8");
SOAPMessage soapMessage = mf.createMessage(mimeHeaders, new ByteArrayInputStream(xmlStr.getBytes()));
- SOAPBodyImpl soapBody = (SOAPBodyImpl)soapMessage.getSOAPBody();
- SOAPElement soapElement = soapBody.getBodyElement();
+ SOAPBody soapBody = (SOAPBody)soapMessage.getSOAPBody();
+ SOAPElement soapElement = SOAPUtils.getFirstSOAPBodyElement(soapBody);
StringBuffer builder = new StringBuffer();
NodeList nlist = soapElement.getChildNodes();
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2012-04-18 07:56:53 UTC (rev 16181)
+++ stack/native/trunk/modules/testsuite/pom.xml 2012-04-19 04:47:36 UTC (rev 16182)
@@ -98,35 +98,6 @@
</testResource>
</testResources>
<plugins>
- <plugin> <!-- This copies jbossws-native-factories jar to endorsed dir before the integration-tests are run -->
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-factories-jar</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
- <resources>
- <resource>
- <directory>${basedir}/../endorsed/target/</directory>
- <includes>
- <include>jbossws-native-factories-${project.version}.jar</include>
- </includes>
- </resource>
- <resource>
- <directory>${basedir}/../../endorsed/target/</directory>
- <includes>
- <include>jbossws-native-factories-${project.version}.jar</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
@@ -287,7 +258,6 @@
<properties>
<jboss.version>${jboss711.version}</jboss.version>
<jbossws.integration.target>jboss711</jbossws.integration.target>
- <endorsed.dirs>${project.build.directory}/endorsed</endorsed.dirs>
</properties>
<dependencies>
<dependency>
@@ -355,15 +325,9 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <compilerArgument>-Djava.endorsed.dirs=${endorsed.dirs}</compilerArgument>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${surefire.jvm.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${endorsed.dirs}</argLine>
+ <argLine>${surefire.jvm.args} ${surefire.default-mgmt-serurity.args}</argLine>
<excludes>
<!-- no excludes ATM -->
</excludes>
@@ -382,7 +346,6 @@
<properties>
<jboss.version>${jboss712.version}</jboss.version>
<jbossws.integration.target>jboss712</jbossws.integration.target>
- <endorsed.dirs>${project.build.directory}/endorsed</endorsed.dirs>
</properties>
<dependencies>
<dependency>
@@ -450,15 +413,9 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <compilerArgument>-Djava.endorsed.dirs=${endorsed.dirs}</compilerArgument>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${surefire.jvm.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${endorsed.dirs}</argLine>
+ <argLine>${surefire.jvm.args} ${surefire.default-mgmt-serurity.args}</argLine>
<excludes>
<!-- no excludes ATM -->
</excludes>
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2012-04-18 07:56:53 UTC (rev 16181)
+++ stack/native/trunk/pom.xml 2012-04-19 04:47:36 UTC (rev 16182)
@@ -49,7 +49,6 @@
<!-- Modules -->
<modules>
- <module>modules/endorsed</module>
<module>modules/core</module>
<module>modules/resources</module>
<module>modules/services</module>
12 years
JBossWS SVN: r16181 - stack/cxf/branches/jbossws-cxf-4.0.x.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-04-18 03:56:53 -0400 (Wed, 18 Apr 2012)
New Revision: 16181
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml
Log:
include latest common snapshot
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-04-18 07:55:44 UTC (rev 16180)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-04-18 07:56:53 UTC (rev 16181)
@@ -61,7 +61,7 @@
<properties>
<jbossws.api.version>1.0.0.GA</jbossws.api.version>
<jbossws.spi.version>2.0.3.GA</jbossws.spi.version>
- <jbossws.common.version>2.0.3.GA</jbossws.common.version>
+ <jbossws.common.version>2.0.4-SNAPSHOT</jbossws.common.version>
<jbossws.common.tools.version>1.0.1.GA</jbossws.common.tools.version>
<jbossws.shared.testsuite.version>4.0.4-SNAPSHOT</jbossws.shared.testsuite.version>
<jboss712.version>7.1.2.Final-SNAPSHOT</jboss712.version> <!-- replace with the EAP6 snapshot version -->
12 years
JBossWS SVN: r16180 - stack/native/branches/jbossws-native-4.0.x.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-04-18 03:55:44 -0400 (Wed, 18 Apr 2012)
New Revision: 16180
Modified:
stack/native/branches/jbossws-native-4.0.x/pom.xml
Log:
include latest common snapshot
Modified: stack/native/branches/jbossws-native-4.0.x/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-04-18 07:47:49 UTC (rev 16179)
+++ stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-04-18 07:55:44 UTC (rev 16180)
@@ -59,7 +59,7 @@
<properties>
<jbossws.api.version>1.0.0.GA</jbossws.api.version>
<jbossws.spi.version>2.0.3.GA</jbossws.spi.version>
- <jbossws.common.version>2.0.3.GA</jbossws.common.version>
+ <jbossws.common.version>2.0.4-SNAPSHOT</jbossws.common.version>
<jbossws.common.tools.version>1.0.1.GA</jbossws.common.tools.version>
<jbossws.shared.testsuite.version>4.0.3.GA</jbossws.shared.testsuite.version>
<jboss712.version>7.1.2.Final-SNAPSHOT</jboss712.version>
12 years
JBossWS SVN: r16179 - common/branches/jbossws-common-2.0.x/src/main/java/org/jboss/ws/common/management.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-04-18 03:47:49 -0400 (Wed, 18 Apr 2012)
New Revision: 16179
Modified:
common/branches/jbossws-common-2.0.x/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java
Log:
[JBPAPP-8385] Reducing log level for wrong ip addresses
svn merge -r 16177:16178 https://svn.jboss.org/repos/jbossws/common/trunk .
Modified: common/branches/jbossws-common-2.0.x/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java
===================================================================
--- common/branches/jbossws-common-2.0.x/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java 2012-04-18 07:45:29 UTC (rev 16178)
+++ common/branches/jbossws-common-2.0.x/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java 2012-04-18 07:47:49 UTC (rev 16179)
@@ -119,7 +119,7 @@
}
catch (UnknownHostException e)
{
- log.warn(BundleUtils.getMessage(bundle, "COULD_NOT_GET_ADDRESS_FOR_HOST", host), e);
+ log.debug(BundleUtils.getMessage(bundle, "COULD_NOT_GET_ADDRESS_FOR_HOST", host), e);
//ignore, leave isIPv6Address to false
}
final boolean isIPv6Formatted = isIPv6Address && host.startsWith("[");
12 years
JBossWS SVN: r16178 - common/trunk/src/main/java/org/jboss/ws/common/management.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-04-18 03:45:29 -0400 (Wed, 18 Apr 2012)
New Revision: 16178
Modified:
common/trunk/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java
Log:
Reducing log level for wrong ip addresses
Modified: common/trunk/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java 2012-04-18 07:00:04 UTC (rev 16177)
+++ common/trunk/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java 2012-04-18 07:45:29 UTC (rev 16178)
@@ -119,7 +119,7 @@
}
catch (UnknownHostException e)
{
- log.warn(BundleUtils.getMessage(bundle, "COULD_NOT_GET_ADDRESS_FOR_HOST", host), e);
+ log.debug(BundleUtils.getMessage(bundle, "COULD_NOT_GET_ADDRESS_FOR_HOST", host), e);
//ignore, leave isIPv6Address to false
}
final boolean isIPv6Formatted = isIPv6Address && host.startsWith("[");
12 years
JBossWS SVN: r16177 - stack/cxf/branches/jbossws-cxf-4.0.x.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-04-18 03:00:04 -0400 (Wed, 18 Apr 2012)
New Revision: 16177
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/
stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml
Log:
[JBPAPP-8479] NullPointerException in JAXB in com.sun.xml.bind.v2.runtime.ClassBeanInfoImpl.checkOverrideProperties
Merged revisions 16176 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
.......
r16176 | alessio.soldano(a)jboss.com | 2012-04-18 08:56:13 +0200 (Wed, 18 Apr 2012) | 2 lines
[AS7-4264] Moving to JAXB impl 2.2.5
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x
___________________________________________________________________
Modified: svnmerge-integrated
- https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
+ https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
Modified: svn:mergeinfo
- /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086
+ /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086,16176
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-04-18 06:56:13 UTC (rev 16176)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-04-18 07:00:04 UTC (rev 16177)
@@ -79,7 +79,7 @@
<jaxws-jboss-httpserver-httpspi.version>1.0.1.GA</jaxws-jboss-httpserver-httpspi.version>
<httpserver.version>1.0.0.Final</httpserver.version>
<jaxb.api.version>1.0.3.Final</jaxb.api.version>
- <jaxb.impl.version>2.2.4</jaxb.impl.version>
+ <jaxb.impl.version>2.2.5</jaxb.impl.version>
<jaxrpc.api.version>1.0.0.Final</jaxrpc.api.version>
<jaxws.api.version>2.0.0.Final</jaxws.api.version>
<jboss.jaxr.version>2.0.3</jboss.jaxr.version>
12 years