Author: ropalka Date: 2012-05-29 10:12:03 -0400 (Tue, 29 May 2012) New Revision: 16326 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml Log: Merged revisions 16323 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r16323 | ropalka | 2012-05-29 15:56:15 +0200 (Tue, 29 May 2012) | 1 line [JBWS-3499] removing JAXR, Apache Scout & Apache JUDDi dependency ....... 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-16087,16096,16176,16183,16204-16205,16227,16230,16244-16245 + /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-16087,16096,16176,16183,16204-16205,16227,16230,16244-16245,16323 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml 2012-05-29 14:03:00 UTC (rev 16325) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml 2012-05-29 14:12:03 UTC (rev 16326) @@ -93,27 +93,6 @@ <groupId>org.springframework</groupId> <artifactId>spring-jms</artifactId> </dependency> - - <!--juddi--> - <dependency> - <groupId>org.jboss.jaxr</groupId> - <artifactId>juddi-service</artifactId> - <type>sar</type> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>apache-scout</groupId> - <artifactId>scout</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>juddi</groupId> - <artifactId>juddi</artifactId> - <scope>provided</scope> - </dependency> - <!--junit--> <dependency> <groupId>junit</groupId> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-05-29 14:03:00 UTC (rev 16325) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-05-29 14:12:03 UTC (rev 16326) @@ -75,9 +75,6 @@ <include>org.springframework:spring-expression:jar</include> <include>org.springframework:spring-jms:jar</include> <include>org.springframework:spring-tx:jar</include> - <include>org.jboss.jaxr:juddi-service:sar</include> - <include>apache-scout:scout:jar</include> - <include>juddi:juddi:jar</include> <include>org.jboss.ws:jbossws-common-tools:jar</include> <include>org.jboss.ws:jbossws-jboss*:jar</include> <include>org.jboss.as:jboss-as-webservices-tests-integration:jar</include> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-05-29 14:03:00 UTC (rev 16325) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-05-29 14:12:03 UTC (rev 16326) @@ -25,32 +25,9 @@ <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 --> <!-- ================================================================== --> - + <macrodef name="macro-deploy-jbossws-modules"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/pom.xml 2012-05-29 14:03:00 UTC (rev 16325) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/pom.xml 2012-05-29 14:12:03 UTC (rev 16326) @@ -244,11 +244,6 @@ <groupId>org.jboss.spec.javax.jms</groupId> <artifactId>jboss-jms-api_1.1_spec</artifactId> </dependency> - <dependency> - <groupId>org.jboss.jaxr</groupId> - <artifactId>juddi-service</artifactId> - <type>sar</type> - </dependency> </dependencies> <!-- Plugins --> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-05-29 14:03:00 UTC (rev 16325) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-05-29 14:12:03 UTC (rev 16326) @@ -81,26 +81,7 @@ <artifactId>junit</artifactId> <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>log4j</groupId> <artifactId>log4j</artifactId> <version>${log4j.version}</version> @@ -730,20 +711,6 @@ <endorseddirs>${project.build.directory}/endorsed</endorseddirs> </compilerArguments> </configuration> - <executions> - <execution> - <id>default-testCompile</id> - <phase>test-compile</phase> - <configuration> - <testExcludes> - <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> - </testExcludes> - </configuration> - <goals> - <goal>testCompile</goal> - </goals> - </execution> - </executions> </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> @@ -789,9 +756,6 @@ <exclude>org/jboss/test/ws/jaxws/cxf/jms/**</exclude> <exclude>org/jboss/test/ws/jaxws/cxf/jms_http/**</exclude> - <!-- # TODO: JAXR not available --> - <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> - <!-- # Tests migrated from JBossWS-Native specific testsuite which are meant to pass with JBossWS-CXF too, but are still to be fixed --> <exclude>org/jboss/test/ws/jaxws/jbws2978/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws3124/**</exclude> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-05-29 14:03:00 UTC (rev 16325) +++ stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-05-29 14:12:03 UTC (rev 16326) @@ -82,10 +82,7 @@ <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> <jsr181.api.version>1.0-MR1</jsr181.api.version> - <apache.scout.version>1.1.1</apache.scout.version> - <juddi.version>0.9RC4</juddi.version> <commons-collections.version>3.2.1</commons-collections.version> <commons-lang.version>2.4</commons-lang.version> <commons.logging.version>1.1.1</commons.logging.version> @@ -1086,22 +1083,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>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>${commons.logging.version}</version>