Author: richard.opalka(a)jboss.com Date: 2009-01-07 09:01:44 -0500 (Wed, 07 Jan 2009) New Revision: 8978 Modified: stack/cxf/trunk/modules/management/pom.xml stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/trunk/modules/server/pom.xml stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt stack/cxf/trunk/pom.xml stack/cxf/trunk/src/main/distro/build-deploy.xml stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBWS-1683] enabling jaxr samples Modified: stack/cxf/trunk/modules/management/pom.xml =================================================================== --- stack/cxf/trunk/modules/management/pom.xml 2009-01-07 11:25:21 UTC (rev 8977) +++ stack/cxf/trunk/modules/management/pom.xml 2009-01-07 14:01:44 UTC (rev 8978) @@ -64,7 +64,7 @@ </dependency> <!-- END --> <dependency> - <groupId>jboss.jaxr</groupId> + <groupId>org.jboss.jaxr</groupId> <artifactId>juddi-service</artifactId> <scope>runtime</scope> <type>sar</type> 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 2009-01-07 11:25:21 UTC (rev 8977) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-01-07 14:01:44 UTC (rev 8978) @@ -274,6 +274,29 @@ </macrodef> <!-- ================================================================== --> + <!-- 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> + + <!-- ================================================================== --> <!-- Deploy JBossWS Service --> <!-- ================================================================== --> @@ -435,6 +458,7 @@ <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <macro-deploy-jbossws-cxf42-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> </target> <target name="deploy-jbossws-cxf50" depends="check-parameters,deploy-jbossws-endorsed"> @@ -444,6 +468,7 @@ <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <!-- Please note the "../../common" to use common server lib! --> <macro-deploy-jbossws-cxf50-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> </target> <target name="deploy-jbossws-cxf51" depends="check-parameters,deploy-jbossws-endorsed"> @@ -453,6 +478,7 @@ <macro-deploy-jbossws-server-lib51 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <!-- Please note the "../../common" to use common server lib! --> <macro-deploy-jbossws-cxf51-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <macro-deploy-jbossws-deployers51 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> </target> <target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6"> @@ -499,6 +525,9 @@ <!-- delete jbossws.sar --> <delete dir="@{targetdir}"/> + <!-- delete juddi-service.sar --> + <delete dir="@{targetdir}/../juddi-service.sar"/> + </sequential> </macrodef> @@ -535,6 +564,9 @@ <!-- delete jbossws.sar --> <delete dir="@{targetdir}"/> + <!-- delete juddi-service.sar --> + <delete dir="@{targetdir}/../juddi-service.sar"/> + </sequential> </macrodef> @@ -571,6 +603,9 @@ <!-- delete jbossws.sar --> <delete dir="@{targetdir}"/> + <!-- delete juddi-service.sar --> + <delete dir="@{targetdir}/../juddi-service.sar"/> + </sequential> </macrodef> Modified: stack/cxf/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/trunk/modules/server/pom.xml 2009-01-07 11:25:21 UTC (rev 8977) +++ stack/cxf/trunk/modules/server/pom.xml 2009-01-07 14:01:44 UTC (rev 8978) @@ -130,7 +130,7 @@ <artifactId>jaxb-api</artifactId> </dependency> <dependency> - <groupId>jboss.jaxr</groupId> + <groupId>org.jboss.jaxr</groupId> <artifactId>juddi-service</artifactId> <type>sar</type> </dependency> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2009-01-07 11:25:21 UTC (rev 8977) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2009-01-07 14:01:44 UTC (rev 8978) @@ -62,6 +62,34 @@ <version>3.8.1</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>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> </dependencies> <!-- Build --> Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt 2009-01-07 11:25:21 UTC (rev 8977) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt 2009-01-07 14:01:44 UTC (rev 8978) @@ -65,9 +65,6 @@ # [CXF-1624] XmlSchemaException: Schema name conflict in collection org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.* -# [JBWS-1683] Fix JAXR samples for CXF -org/jboss/test/ws/jaxws/samples/jaxr/** - # [JBWS-1774] Provide tools implementation for CXF org/jboss/test/ws/jaxws/complex/** org/jboss/test/ws/jaxws/holder/** Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-01-07 11:25:21 UTC (rev 8977) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-01-07 14:01:44 UTC (rev 8978) @@ -65,9 +65,6 @@ # [CXF-1624] XmlSchemaException: Schema name conflict in collection org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.* -# [JBWS-1683] Fix JAXR samples for CXF -org/jboss/test/ws/jaxws/samples/jaxr/** - # [JBWS-1774] Provide tools implementation for CXF org/jboss/test/ws/jaxws/complex/** org/jboss/test/ws/jaxws/holder/** Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt 2009-01-07 11:25:21 UTC (rev 8977) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt 2009-01-07 14:01:44 UTC (rev 8978) @@ -65,9 +65,6 @@ # [CXF-1624] XmlSchemaException: Schema name conflict in collection org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.* -# [JBWS-1683] Fix JAXR samples for CXF -org/jboss/test/ws/jaxws/samples/jaxr/** - # [JBWS-1774] Provide tools implementation for CXF org/jboss/test/ws/jaxws/complex/** org/jboss/test/ws/jaxws/holder/** Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-01-07 11:25:21 UTC (rev 8977) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-01-07 14:01:44 UTC (rev 8978) @@ -72,9 +72,6 @@ # [JBWS-1178] Multiple virtual host and soap:address problem org/jboss/test/ws/jaxws/jbws1178/** -# [JBWS-1683] Fix JAXR samples for CXF -org/jboss/test/ws/jaxws/samples/jaxr/** - # [JBWS-1774] Provide tools implementation for CXF org/jboss/test/ws/jaxws/complex/** org/jboss/test/ws/jaxws/holder/** Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-01-07 11:25:21 UTC (rev 8977) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-01-07 14:01:44 UTC (rev 8978) @@ -72,9 +72,6 @@ # [JBWS-1178] Multiple virtual host and soap:address problem org/jboss/test/ws/jaxws/jbws1178/** -# [JBWS-1683] Fix JAXR samples for CXF -org/jboss/test/ws/jaxws/samples/jaxr/** - # [JBWS-1774] Provide tools implementation for CXF org/jboss/test/ws/jaxws/complex/** org/jboss/test/ws/jaxws/holder/** Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-01-07 11:25:21 UTC (rev 8977) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-01-07 14:01:44 UTC (rev 8978) @@ -72,9 +72,6 @@ # [JBWS-1178] Multiple virtual host and soap:address problem org/jboss/test/ws/jaxws/jbws1178/** -# [JBWS-1683] Fix JAXR samples for CXF -org/jboss/test/ws/jaxws/samples/jaxr/** - # [JBWS-1774] Provide tools implementation for CXF org/jboss/test/ws/jaxws/complex/** org/jboss/test/ws/jaxws/holder/** Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2009-01-07 11:25:21 UTC (rev 8977) +++ stack/cxf/trunk/pom.xml 2009-01-07 14:01:44 UTC (rev 8978) @@ -64,7 +64,10 @@ <jaxb.impl.version>2.1.6</jaxb.impl.version> <jaxrpc.api.version>1.1</jaxrpc.api.version> <jaxws.api.version>2.1-1</jaxws.api.version> - <juddi.service.version>1.2.0.GA</juddi.service.version> + <juddi.version>0.9RC4</juddi.version> + <jboss.jaxr.version>1.2.1.GA</jboss.jaxr.version> + <apache.scout.version>0.7rc2</apache.scout.version> + <commons.logging.version>1.1.1</commons.logging.version> <log4j.version>1.2.14</log4j.version> <saaj.api.version>1.3</saaj.api.version> <xmlsec.version>1.3.0</xmlsec.version> @@ -315,11 +318,26 @@ <version>${jaxb.impl.version}</version> </dependency> <dependency> - <groupId>jboss.jaxr</groupId> + <groupId>org.jboss.jaxr</groupId> <artifactId>juddi-service</artifactId> - <version>${juddi.service.version}</version> + <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> + </dependency> </dependencies> </dependencyManagement> Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build-deploy.xml 2009-01-07 11:25:21 UTC (rev 8977) +++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2009-01-07 14:01:44 UTC (rev 8978) @@ -195,7 +195,7 @@ <macrodef name="macro-create-deploy-conf"> <attribute name="deploystructure"/> <sequential> - <fileset id="jbossws.deploy.fileset" dir="@{deploystructure}" excludes="**/jbossws.sar/**"/> + <fileset id="jbossws.deploy.fileset" dir="@{deploystructure}" excludes="**/jbossws.sar/**,**/juddi-service.sar/**"/> <property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/> <property name="jbossws.sar.dir" value=&quot;(a){deploystructure}/server/${jboss.server.instance}/deploy/jbossws.sar&quot;/&gt; <echo file="${jbossws.sar.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset}"/> Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-01-07 11:25:21 UTC (rev 8977) +++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-01-07 14:01:44 UTC (rev 8978) @@ -79,7 +79,9 @@ <include>org.jboss.ws:jbossws-jboss422:jar</include> <include>org.jboss.ws:jbossws-jboss423:jar</include> <include>org.jboss.ws:jbossws-jboss500:jar</include> - <include>jboss.jaxr:juddi-service:sar</include> + <include>org.jboss.jaxr:juddi-service:sar</include> + <include>apache-scout:scout:jar</include> + <include>juddi:juddi:jar</include> </includes> </dependencySet> <dependencySet>