[jbossws-commits] JBossWS SVN: r8537 - in stack/metro/trunk: modules/resources/src/main/resources/resources and 2 other directories.

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2008-10-21 09:38:35 -0400 (Tue, 21 Oct 2008)
New Revision: 8537

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/scripts/assembly-deploy-artifacts.xml
Log:
[JAXR-10] switch to jaxr 1.2.1.GA

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-10-20 08:38:33 UTC (rev 8536)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml	2008-10-21 13:38:35 UTC (rev 8537)
@@ -253,6 +253,12 @@
           <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>
   

Modified: stack/metro/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/pom.xml	2008-10-20 08:38:33 UTC (rev 8536)
+++ stack/metro/trunk/modules/testsuite/pom.xml	2008-10-21 13:38:35 UTC (rev 8537)
@@ -78,13 +78,13 @@
     <dependency>
       <groupId>apache-scout</groupId>
       <artifactId>scout</artifactId>
-      <version>0.7rc2</version>
+      <version>${apache.scout.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>juddi</groupId>
       <artifactId>juddi</artifactId>
-      <version>0.9RC4</version>
+      <version>${juddi.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: stack/metro/trunk/pom.xml
===================================================================
--- stack/metro/trunk/pom.xml	2008-10-20 08:38:33 UTC (rev 8536)
+++ stack/metro/trunk/pom.xml	2008-10-21 13:38:35 UTC (rev 8537)
@@ -61,7 +61,9 @@
     <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>
-    <jboss.jaxr.version>1.2.0.SP2</jboss.jaxr.version>
+    <jboss.jaxr.version>1.2.1.GA</jboss.jaxr.version>
+    <apache.scout.version>0.7rc2</apache.scout.version>
+    <juddi.version>0.9RC4</juddi.version>
     <sun.fastinfoset.version>1.2.2</sun.fastinfoset.version>
     <sun.sjsxp.version>1.0.1</sun.sjsxp.version>
     <sun.jaxws.version>2.1.3</sun.jaxws.version>
@@ -290,6 +292,16 @@
         <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>

Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml	2008-10-20 08:38:33 UTC (rev 8536)
+++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml	2008-10-21 13:38:35 UTC (rev 8537)
@@ -83,6 +83,8 @@
               <include>*:jbossws-jboss422:jar</include>
               <include>*:jbossws-jboss423:jar</include>
               <include>*:juddi-service:sar</include>
+              <include>*:scout:jar</include>
+              <include>*:juddi:jar</include>
             </includes>
           </dependencySet>
           <dependencySet>