[jbossws-commits] JBossWS SVN: r7680 - in stack/cxf/trunk: modules/management and 3 other directories.

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Thu Jun 19 10:37:03 EDT 2008


Author: richard.opalka at jboss.com
Date: 2008-06-19 10:37:03 -0400 (Thu, 19 Jun 2008)
New Revision: 7680

Modified:
   stack/cxf/trunk/modules/management/pom.xml
   stack/cxf/trunk/modules/server/pom.xml
   stack/cxf/trunk/modules/testsuite/pom.xml
   stack/cxf/trunk/pom.xml
   stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
sync trunk with QA tag

Modified: stack/cxf/trunk/modules/management/pom.xml
===================================================================
--- stack/cxf/trunk/modules/management/pom.xml	2008-06-19 14:24:44 UTC (rev 7679)
+++ stack/cxf/trunk/modules/management/pom.xml	2008-06-19 14:37:03 UTC (rev 7680)
@@ -37,28 +37,28 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.ws</groupId>
-      <artifactId>jbossws-jboss423</artifactId>
+      <artifactId>jbossws-jboss423x</artifactId>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.jboss.ws</groupId>
-      <artifactId>jbossws-jboss500</artifactId>
+      <artifactId>jbossws-jboss500Beta4</artifactId>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.jboss.ws</groupId>
-      <artifactId>jbossws-jboss500</artifactId>
+      <artifactId>jbossws-jboss500Beta4</artifactId>
       <classifier>container</classifier>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.jboss.ws</groupId>
-      <artifactId>jbossws-jboss501</artifactId>
+      <artifactId>jbossws-jboss500x</artifactId>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.jboss.ws</groupId>
-      <artifactId>jbossws-jboss501</artifactId>
+      <artifactId>jbossws-jboss500x</artifactId>
       <classifier>container</classifier>
       <scope>runtime</scope>
     </dependency>

Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml	2008-06-19 14:24:44 UTC (rev 7679)
+++ stack/cxf/trunk/modules/server/pom.xml	2008-06-19 14:37:03 UTC (rev 7680)
@@ -39,7 +39,7 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.ws</groupId>
-      <artifactId>jbossws-jboss423</artifactId>
+      <artifactId>jbossws-jboss423x</artifactId>
       <version>${jbossws.jboss423.version}</version>
       <classifier>resources</classifier>
       <type>zip</type>
@@ -168,7 +168,7 @@
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.jboss.ws</groupId>
-                  <artifactId>jbossws-jboss423</artifactId>
+                  <artifactId>jbossws-jboss423x</artifactId>
                   <version>${jbossws.jboss423.version}</version>
                   <classifier>resources</classifier>
                   <type>zip</type>
@@ -176,7 +176,7 @@
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.jboss.ws</groupId>
-                  <artifactId>jbossws-jboss500</artifactId>
+                  <artifactId>jbossws-jboss500Beta4</artifactId>
                   <version>${jbossws.jboss500.version}</version>
                   <classifier>resources</classifier>
                   <type>zip</type>
@@ -184,7 +184,7 @@
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.jboss.ws</groupId>
-                  <artifactId>jbossws-jboss501</artifactId>
+                  <artifactId>jbossws-jboss500x</artifactId>
                   <version>${jbossws.jboss501.version}</version>
                   <classifier>resources</classifier>
                   <type>zip</type>

Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml	2008-06-19 14:24:44 UTC (rev 7679)
+++ stack/cxf/trunk/modules/testsuite/pom.xml	2008-06-19 14:37:03 UTC (rev 7680)
@@ -299,7 +299,7 @@
         </dependency>
         <dependency>
           <groupId>org.jboss.ws</groupId>
-          <artifactId>jbossws-jboss423</artifactId>
+          <artifactId>jbossws-jboss423x</artifactId>
         </dependency>
       </dependencies>
       <build>
@@ -349,7 +349,7 @@
         </dependency>
         <dependency>
           <groupId>org.jboss.ws</groupId>
-          <artifactId>jbossws-jboss500</artifactId>
+          <artifactId>jbossws-jboss500Beta4</artifactId>
         </dependency>
       </dependencies>
       <build>
@@ -389,7 +389,7 @@
         </dependency>
         <dependency>
           <groupId>org.jboss.ws</groupId>
-          <artifactId>jbossws-jboss501</artifactId>
+          <artifactId>jbossws-jboss500x</artifactId>
         </dependency>
       </dependencies>
       <build>

Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml	2008-06-19 14:24:44 UTC (rev 7679)
+++ stack/cxf/trunk/pom.xml	2008-06-19 14:37:03 UTC (rev 7680)
@@ -46,13 +46,13 @@
   
   <!-- Properties -->
   <properties>
-    <jbossws.common.version>1.0.5-SNAPSHOT</jbossws.common.version>
-    <jbossws.framework.version>3.0.3-SNAPSHOT</jbossws.framework.version>
-    <jbossws.spi.version>1.0.4-SNAPSHOT</jbossws.spi.version>
-    <jbossws.jboss422.version>3.0.2-SNAPSHOT</jbossws.jboss422.version>
-    <jbossws.jboss423.version>3.0.2-SNAPSHOT</jbossws.jboss423.version>
-    <jbossws.jboss500.version>3.0.2-SNAPSHOT</jbossws.jboss500.version>
-    <jbossws.jboss501.version>3.0.2-SNAPSHOT</jbossws.jboss501.version>
+    <jbossws.common.version>1.0.5.GA</jbossws.common.version>
+    <jbossws.framework.version>3.0.2.GA</jbossws.framework.version>
+    <jbossws.spi.version>1.0.4.GA</jbossws.spi.version>
+    <jbossws.jboss422.version>3.0.2.GA</jbossws.jboss422.version>
+    <jbossws.jboss423.version>3.0.2.GA</jbossws.jboss423.version>
+    <jbossws.jboss500.version>3.0.2.GA</jbossws.jboss500.version>
+    <jbossws.jboss501.version>3.0.2.GA</jbossws.jboss501.version>
     <cxf.version>2.1</cxf.version>
     <cxf.stax.version>1.0.1</cxf.stax.version>
     <fastinfoset.api.version>1.2.2</fastinfoset.api.version>
@@ -108,48 +108,48 @@
       </dependency>
       <dependency>
         <groupId>org.jboss.ws</groupId>
-        <artifactId>jbossws-jboss423</artifactId>
+        <artifactId>jbossws-jboss423x</artifactId>
         <version>${jbossws.jboss423.version}</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.ws</groupId>
-        <artifactId>jbossws-jboss423</artifactId>
+        <artifactId>jbossws-jboss423x</artifactId>
         <version>${jbossws.jboss423.version}</version>
         <classifier>resources</classifier>
         <type>zip</type>
       </dependency>
       <dependency>
         <groupId>org.jboss.ws</groupId>
-        <artifactId>jbossws-jboss500</artifactId>
+        <artifactId>jbossws-jboss500Beta4</artifactId>
         <version>${jbossws.jboss500.version}</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.ws</groupId>
-        <artifactId>jbossws-jboss500</artifactId>
+        <artifactId>jbossws-jboss500Beta4</artifactId>
         <version>${jbossws.jboss500.version}</version>
         <classifier>container</classifier>
       </dependency>
       <dependency>
         <groupId>org.jboss.ws</groupId>
-        <artifactId>jbossws-jboss500</artifactId>
+        <artifactId>jbossws-jboss500Beta4</artifactId>
         <version>${jbossws.jboss500.version}</version>
         <classifier>resources</classifier>
         <type>zip</type>
       </dependency>
       <dependency>
         <groupId>org.jboss.ws</groupId>
-        <artifactId>jbossws-jboss501</artifactId>
+        <artifactId>jbossws-jboss500x</artifactId>
         <version>${jbossws.jboss501.version}</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.ws</groupId>
-        <artifactId>jbossws-jboss501</artifactId>
+        <artifactId>jbossws-jboss500x</artifactId>
         <version>${jbossws.jboss501.version}</version>
         <classifier>container</classifier>
       </dependency>
       <dependency>
         <groupId>org.jboss.ws</groupId>
-        <artifactId>jbossws-jboss501</artifactId>
+        <artifactId>jbossws-jboss500x</artifactId>
         <version>${jbossws.jboss501.version}</version>
         <classifier>resources</classifier>
         <type>zip</type>

Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml	2008-06-19 14:24:44 UTC (rev 7679)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml	2008-06-19 14:37:03 UTC (rev 7680)
@@ -78,23 +78,59 @@
             <includes>
               <include>*:jbossws-framework:jar</include>
               <include>*:jbossws-jboss422:jar</include>
-              <include>*:jbossws-jboss423:jar</include>
-              <include>*:jbossws-jboss500:jar</include>
-              <include>*:jbossws-jboss501:jar</include>
               <include>*:juddi-service:sar</include>
             </includes>
           </dependencySet>
           <dependencySet>
             <outputDirectory>lib</outputDirectory>
-            <outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping>
+            <outputFileNameMapping>jbossws-jboss423.${module.extension}</outputFileNameMapping>
             <useStrictFiltering>true</useStrictFiltering>
             <scope>runtime</scope>
             <unpack>false</unpack>
             <includes>
-              <include>*:jbossws-jboss500:jar:container</include>
-              <include>*:jbossws-jboss501:jar:container</include>
+              <include>*:jbossws-jboss423x:jar</include>
             </includes>
           </dependencySet>
+          <dependencySet>
+            <outputDirectory>lib</outputDirectory>
+            <outputFileNameMapping>jbossws-jboss500.${module.extension}</outputFileNameMapping>
+            <useStrictFiltering>true</useStrictFiltering>
+            <scope>runtime</scope>
+            <unpack>false</unpack>
+            <includes>
+              <include>*:jbossws-jboss500Beta4:jar</include>
+            </includes>
+          </dependencySet>
+          <dependencySet>
+            <outputDirectory>lib</outputDirectory>
+            <outputFileNameMapping>jbossws-jboss501.${module.extension}</outputFileNameMapping>
+            <useStrictFiltering>true</useStrictFiltering>
+            <scope>runtime</scope>
+            <unpack>false</unpack>
+            <includes>
+              <include>*:jbossws-jboss500x:jar</include>
+            </includes>
+          </dependencySet>
+          <dependencySet>
+            <outputDirectory>lib</outputDirectory>
+            <outputFileNameMapping>jbossws-jboss500-${artifact.classifier}.${artifact.extension}</outputFileNameMapping>
+            <useStrictFiltering>true</useStrictFiltering>
+            <scope>runtime</scope>
+            <unpack>false</unpack>
+            <includes>
+              <include>*:jbossws-jboss500Beta4:jar:container</include>
+            </includes>
+          </dependencySet>
+          <dependencySet>
+            <outputDirectory>lib</outputDirectory>
+            <outputFileNameMapping>jbossws-jboss501-${artifact.classifier}.${artifact.extension}</outputFileNameMapping>
+            <useStrictFiltering>true</useStrictFiltering>
+            <scope>runtime</scope>
+            <unpack>false</unpack>
+            <includes>
+              <include>*:jbossws-jboss500x:jar:container</include>
+            </includes>
+          </dependencySet>
         </dependencySets>
       </binaries>
     </moduleSet>




More information about the jbossws-commits mailing list