[jbossws-commits] JBossWS SVN: r16131 - in stack/native/branches/jbossws-native-4.0.x: modules/core/src/main/resources and 8 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Tue Apr 10 04:46:25 EDT 2012
Author: ropalka
Date: 2012-04-10 04:46:22 -0400 (Tue, 10 Apr 2012)
New Revision: 16131
Removed:
stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/jaxbintros/
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1809/
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/jaxbintros/
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1809/
Modified:
stack/native/branches/jbossws-native-4.0.x/
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/jbossws-native-config-as7.xml
stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/common/main/module.xml
stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml
stack/native/branches/jbossws-native-4.0.x/pom.xml
Log:
[JBPAPP-8667] Merged revisions 16052 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/native/trunk
.......
r16052 | ropalka | 2012-03-27 14:59:28 +0200 (Tue, 27 Mar 2012) | 1 line
[JBWS-3474] removing jaxb intros & jaxr
.......
Property changes on: stack/native/branches/jbossws-native-4.0.x
___________________________________________________________________
Modified: svnmerge-integrated
- https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-15678,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15876,15878-15891,15904-15933,15935-15944,15974,15988,15991,15995,15997,15999,16003,16013,16015,16021,16050-16051
+ https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-15678,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15876,15878-15891,15904-15933,15935-15944,15974,15988,15991,15995,15997,15999,16003,16013,16015,16021,16050-16052
Modified: svn:mergeinfo
- /stack/native/branches/asoldano:14057,14069
/stack/native/branches/ropalka:13836-13879
/stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991,15995,15997,15999,16003,16013,16015,16021,16050-16051
+ /stack/native/branches/asoldano:14057,14069
/stack/native/branches/ropalka:13836-13879
/stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991,15995,15997,15999,16003,16013,16015,16021,16050-16052
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/jbossws-native-config-as7.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/jbossws-native-config-as7.xml 2012-04-10 08:39:42 UTC (rev 16130)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/jbossws-native-config-as7.xml 2012-04-10 08:46:22 UTC (rev 16131)
@@ -52,7 +52,7 @@
</deploymentAspect>
<deploymentAspect class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect">
- <property name="requires" class="java.lang.String">UnifiedMetaDataModel, JAXBIntros</property>
+ <property name="requires" class="java.lang.String">UnifiedMetaDataModel</property>
<property name="provides" class="java.lang.String">PublishedContract</property>
</deploymentAspect>
@@ -61,12 +61,8 @@
</deploymentAspect>
<deploymentAspect class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect">
- <property name="requires" class="java.lang.String">ContainerMetaData, URLPattern, EndpointAddress, VFSRoot, JAXBIntros</property>
+ <property name="requires" class="java.lang.String">ContainerMetaData, URLPattern, EndpointAddress, VFSRoot</property>
<property name="provides" class="java.lang.String">UnifiedMetaDataModel</property>
</deploymentAspect>
- <deploymentAspect class="org.jboss.ws.common.deployment.JAXBIntroDeploymentAspect">
- <property name="provides" class="java.lang.String">JAXBIntros</property>
- </deploymentAspect>
-
</deploymentAspects>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-04-10 08:39:42 UTC (rev 16130)
+++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-04-10 08:46:22 UTC (rev 16131)
@@ -40,7 +40,6 @@
<include>com.sun.xml.bind:jaxb-xjc:jar</include>
<include>com.sun.xml.ws:jaxws-tools:jar</include>
<include>com.sun.xml.ws:jaxws-rt:jar</include>
- <include>jboss.jaxbintros:jboss-jaxb-intros:jar</include>
<include>org.jboss.ws:jbossws-api:jar</include>
<include>org.jboss.ws:jbossws-common:jar</include>
<include>org.jboss.ws:jbossws-spi:jar</include>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/common/main/module.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/common/main/module.xml 2012-04-10 08:39:42 UTC (rev 16130)
+++ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/common/main/module.xml 2012-04-10 08:46:22 UTC (rev 16131)
@@ -37,12 +37,10 @@
<module name="javax.servlet.api"/>
<module name="javax.wsdl4j.api" />
<module name="javax.xml.ws.api"/>
- <module name="org.jboss.jaxbintros"/>
<module name="org.jboss.ws.api"/>
<module name="org.jboss.ws.spi"/>
<module name="org.jboss.logging"/>
<module name="org.jboss.common-core"/>
<module name="org.apache.xerces" services="import"/>
- <module name="org.jboss.jaxbintros"/>
</dependencies>
</module>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-04-10 08:39:42 UTC (rev 16130)
+++ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-04-10 08:46:22 UTC (rev 16131)
@@ -25,29 +25,6 @@
<project>
<!-- ================================================================== -->
- <!-- Deploy JUDDI Service -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-juddi-sar">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <unzip dest="@{targetdir}">
- <fileset dir="@{thirdpartydir}">
- <include name="**/juddi-service.sar"/>
- </fileset>
- </unzip>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <include name="**/juddi.jar"/>
- <include name="**/scout.jar"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
<!-- Modules -->
<!-- ================================================================== -->
@@ -58,11 +35,6 @@
<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-native-client.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"/>
@@ -113,11 +85,6 @@
<include name="**/stax-ex.jar"/>
</fileset>
</copy>
- <copy todir="@{targetdir}/org/jboss/jaxbintros/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jboss-jaxb-intros.jar"/>
- </fileset>
- </copy>
<copy todir="@{targetdir}/org/apache/commons/beanutils/main" flatten="false" overwrite="true">
<fileset dir="@{thirdpartydir}/lib">
<include name="**/commons-beanutils.jar"/>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-04-10 08:39:42 UTC (rev 16130)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-04-10 08:46:22 UTC (rev 16131)
@@ -30,22 +30,6 @@
<mkdir dir="${tests.output.dir}/test-libs" />
- <!-- jaxws-jaxbintros -->
- <war warfile="${tests.output.dir}/test-libs/jaxws-jaxbintros.war" webxml="${tests.output.dir}/test-resources/jaxws/jaxbintros/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/jaxbintros/**/*.class" />
- <include name="org/jboss/test/helper/DOMWriter.class" />
- </classes>
-
- <webinf dir="${tests.output.dir}/test-resources/jaxws/jaxbintros/WEB-INF">
- <include name="*.xml" />
- <include name="**/*.wsdl" />
- </webinf>
- <manifest>
- <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/>
- </manifest>
- </war>
-
<!-- jaxws-jbws771 -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws771.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -81,15 +65,6 @@
</metainf>
</jar>
- <!-- jaxws-jbws1809 -->
- <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1809.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/jbws1809/*.class" />
- <exclude name="org/jboss/test/ws/jaxws/jbws1809/*TestCase.class" />
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1809/META-INF" />
- </jar>
-
<!-- jaxws-jbws1909 -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1909.jar" manifest="${tests.output.dir}/test-resources/jaxws/jbws1909/META-INF/MANIFEST.MF">
<fileset dir="${tests.output.dir}/test-classes">
Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-04-10 08:39:42 UTC (rev 16130)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-04-10 08:46:22 UTC (rev 16131)
@@ -82,33 +82,7 @@
<version>3.8.1</version>
<scope>test</scope>
</dependency>
- <!-- required for WS-RM client backports server -->
<dependency>
- <groupId>jboss.web</groupId>
- <artifactId>jbossweb</artifactId>
- <version>2.1.1.CR7</version>
- <scope>test</scope>
- </dependency>
- <!-- JAXR samples -->
- <dependency>
- <groupId>apache-scout</groupId>
- <artifactId>scout</artifactId>
- <version>${apache.scout.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>juddi</groupId>
- <artifactId>juddi</artifactId>
- <version>${juddi.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.jaxr</groupId>
- <artifactId>juddi-saaj</artifactId>
- <version>${jboss.jaxr.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-javaee</artifactId>
<version>${jboss.javaee.version}</version>
Modified: stack/native/branches/jbossws-native-4.0.x/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-04-10 08:39:42 UTC (rev 16130)
+++ stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-04-10 08:46:22 UTC (rev 16131)
@@ -75,9 +75,6 @@
<jaxb.impl.version>2.2.4</jaxb.impl.version>
<jboss.common.core.version>2.2.16.GA</jboss.common.core.version>
<jboss.logging.version>3.1.0.GA</jboss.logging.version>
- <jboss.jaxr.version>2.0.3</jboss.jaxr.version>
- <apache.scout.version>1.1.1</apache.scout.version>
- <juddi.version>0.9RC4</juddi.version>
<netty.version>3.2.6.Final</netty.version>
<sun.jaxws.version>2.2</sun.jaxws.version>
<sun.policy.version>2.0-b01</sun.policy.version>
@@ -296,22 +293,6 @@
<version>${jaxb.impl.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.jaxr</groupId>
- <artifactId>juddi-service</artifactId>
- <version>${jboss.jaxr.version}</version>
- <type>sar</type>
- </dependency>
- <dependency>
- <groupId>apache-scout</groupId>
- <artifactId>scout</artifactId>
- <version>${apache.scout.version}</version>
- </dependency>
- <dependency>
- <groupId>juddi</groupId>
- <artifactId>juddi</artifactId>
- <version>${juddi.version}</version>
- </dependency>
- <dependency>
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
<version>${stax.api.version}</version>
More information about the jbossws-commits
mailing list