Author: richard.opalka(a)jboss.com Date: 2008-07-10 11:11:48 -0400 (Thu, 10 Jul 2008) New Revision: 7815 Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/metro/trunk/modules/testsuite/pom.xml stack/metro/trunk/pom.xml stack/metro/trunk/src/main/distro/build-deploy.xml Log: [JBWS-1673] fix jaxr (WIP) Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-07-10 14:05:08 UTC (rev 7814) +++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-07-10 15:11:48 UTC (rev 7815) @@ -223,6 +223,23 @@ </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> + </sequential> + </macrodef> + + <!-- ================================================================== --> <!-- Deploy JBossWS Service --> <!-- ================================================================== --> @@ -347,6 +364,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-sar42 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-metro50" depends="check-parameters,deploy-jbossws-endorsed"> @@ -357,6 +375,7 @@ <macro-deploy-jbossws-sar50 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-jbossws-deploy50 targetdir="${installserver}/deploy" 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"> @@ -403,6 +422,9 @@ <!-- delete jbossws.sar --> <delete dir="@{targetdir}"/> + <!-- delete juddi-service.sar --> + <delete dir="@{targetdir}/../juddi-service.sar"/> + </sequential> </macrodef> Modified: stack/metro/trunk/modules/testsuite/pom.xml =================================================================== --- stack/metro/trunk/modules/testsuite/pom.xml 2008-07-10 14:05:08 UTC (rev 7814) +++ stack/metro/trunk/modules/testsuite/pom.xml 2008-07-10 15:11:48 UTC (rev 7815) @@ -17,7 +17,7 @@ <!-- Properties --> <properties> <surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/etc/tst.policy</surefire.security.args> - <surefire.jdwp.args>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</surefire.jdwp.args> + <surefire.jdwp.args>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</surefire.jdwp.args> <surefire.gc.args>-XX:MaxPermSize=128m</surefire.gc.args> <test.archive.directory>${project.build.directory}/test-libs</test.archive.directory> <test.classes.directory>${project.build.directory}/test-classes</test.classes.directory> @@ -74,6 +74,34 @@ <artifactId>wsit-rt</artifactId> <scope>test</scope> </dependency> + <!-- JAXR samples --> + <dependency> + <groupId>apache-scout</groupId> + <artifactId>scout</artifactId> + <version>0.7rc2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>juddi</groupId> + <artifactId>juddi</artifactId> + <version>0.9RC4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>jboss.jaxr</groupId> + <artifactId>juddi-saaj</artifactId> + <version>1.2.0.GA</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/metro/trunk/pom.xml =================================================================== --- stack/metro/trunk/pom.xml 2008-07-10 14:05:08 UTC (rev 7814) +++ stack/metro/trunk/pom.xml 2008-07-10 15:11:48 UTC (rev 7815) @@ -55,6 +55,7 @@ <jbossws.jboss500.version>3.0.2-SNAPSHOT</jbossws.jboss500.version> <jbossws.jboss501.version>3.0.2-SNAPSHOT</jbossws.jboss501.version> <jboss.common.version>1.2.1.GA</jboss.common.version> + <commons.logging.version>1.1.1</commons.logging.version> <jaxb.api.version>2.1</jaxb.api.version> <jaxb.impl.version>2.1.6</jaxb.impl.version> <jaxrpc.api.version>1.1</jaxrpc.api.version> @@ -270,6 +271,11 @@ <version>${juddi.service.version}</version> <type>sar</type> </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${commons.logging.version}</version> + </dependency> </dependencies> </dependencyManagement> Modified: stack/metro/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/metro/trunk/src/main/distro/build-deploy.xml 2008-07-10 14:05:08 UTC (rev 7814) +++ stack/metro/trunk/src/main/distro/build-deploy.xml 2008-07-10 15:11:48 UTC (rev 7815) @@ -150,7 +150,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}"/>