[jbossws-commits] JBossWS SVN: r13557 - in stack/native/trunk: modules/client and 6 other directories.

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Tue Jan 11 11:32:59 EST 2011


Author: richard.opalka at jboss.com
Date: 2011-01-11 11:32:58 -0500 (Tue, 11 Jan 2011)
New Revision: 13557

Modified:
   stack/native/trunk/modules/client/pom.xml
   stack/native/trunk/modules/core/pom.xml
   stack/native/trunk/modules/management/pom.xml
   stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.bat
   stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.sh
   stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.bat
   stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.sh
   stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
   stack/native/trunk/modules/testsuite/pom.xml
   stack/native/trunk/pom.xml
   stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
refactoring framework sources to common

Modified: stack/native/trunk/modules/client/pom.xml
===================================================================
--- stack/native/trunk/modules/client/pom.xml	2011-01-11 16:11:01 UTC (rev 13556)
+++ stack/native/trunk/modules/client/pom.xml	2011-01-11 16:32:58 UTC (rev 13557)
@@ -51,7 +51,7 @@
         <configuration>
           <archive>
             <manifestEntries>
-              <Class-Path>jbossws-api.jar jbossws-spi.jar jbossws-common.jar jbossws-framework.jar jbossws-native-core.jar jbossws-native-factories.jar jbossws-native-services.jar jaxrpc-api.jar jaxws-api.jar jsr181-api.jar saaj-api.jar activation.jar commons-logging.jar concurrent.jar javassist.jar jaxb-api.jar jaxb-impl.jar mail.jar jboss-logging-spi.jar jboss-logging-log4j.jar jcl-over-slf4j.jar slf4j-api.jar slf4j-jboss-logging.jar jbosssx-client.jar jboss-javaee.jar jboss-xml-binding.jar jbossxb.jar netty.jar wscommons-policy.jar stax-api.jar wsdl4j.jar</Class-Path>
+              <Class-Path>jbossws-api.jar jbossws-spi.jar jbossws-common.jar jbossws-native-core.jar jbossws-native-factories.jar jbossws-native-services.jar jaxrpc-api.jar jaxws-api.jar jsr181-api.jar saaj-api.jar activation.jar commons-logging.jar concurrent.jar javassist.jar jaxb-api.jar jaxb-impl.jar mail.jar jboss-logging-spi.jar jboss-logging-log4j.jar jcl-over-slf4j.jar slf4j-api.jar slf4j-jboss-logging.jar jbosssx-client.jar jboss-javaee.jar jboss-xml-binding.jar jbossxb.jar netty.jar wscommons-policy.jar stax-api.jar wsdl4j.jar</Class-Path>
             </manifestEntries>
           </archive>
         </configuration>

Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml	2011-01-11 16:11:01 UTC (rev 13556)
+++ stack/native/trunk/modules/core/pom.xml	2011-01-11 16:32:58 UTC (rev 13557)
@@ -29,10 +29,6 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.ws</groupId>
-      <artifactId>jbossws-framework</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.ws</groupId>
       <artifactId>jbossws-spi</artifactId>
     </dependency>
     <dependency>

Modified: stack/native/trunk/modules/management/pom.xml
===================================================================
--- stack/native/trunk/modules/management/pom.xml	2011-01-11 16:11:01 UTC (rev 13556)
+++ stack/native/trunk/modules/management/pom.xml	2011-01-11 16:32:58 UTC (rev 13557)
@@ -20,11 +20,6 @@
     <dependency>
       <groupId>org.jboss.ws</groupId>
       <artifactId>jbossws-framework</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.ws</groupId>
-      <artifactId>jbossws-framework</artifactId>
       <classifier>testsuite</classifier>
       <scope>provided</scope>
       <type>zip</type>

Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.bat
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.bat	2011-01-11 16:11:01 UTC (rev 13556)
+++ stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.bat	2011-01-11 16:32:58 UTC (rev 13557)
@@ -36,7 +36,6 @@
 set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-api.jar
 set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-spi.jar
 set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-common.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-framework.jar
 
 rem Shared jaxws libs
 set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxws-tools.jar

Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.sh
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.sh	2011-01-11 16:11:01 UTC (rev 13556)
+++ stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.sh	2011-01-11 16:32:58 UTC (rev 13557)
@@ -72,7 +72,6 @@
 WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-api.jar"
 WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-spi.jar"
 WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-common.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-framework.jar"
 
 # Shared jaxws libs
 WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxws-tools.jar"

Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.bat
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.bat	2011-01-11 16:11:01 UTC (rev 13556)
+++ stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.bat	2011-01-11 16:32:58 UTC (rev 13557)
@@ -29,7 +29,6 @@
 set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-api.jar
 set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-spi.jar
 set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-common.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-framework.jar
 set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/activation.jar
 set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/getopt.jar
 set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar

Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.sh
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.sh	2011-01-11 16:11:01 UTC (rev 13556)
+++ stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.sh	2011-01-11 16:32:58 UTC (rev 13557)
@@ -65,7 +65,6 @@
 WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-api.jar"
 WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-spi.jar"
 WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-common.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-framework.jar"
 WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/activation.jar"
 WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/getopt.jar"
 WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar"

Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml	2011-01-11 16:11:01 UTC (rev 13556)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml	2011-01-11 16:32:58 UTC (rev 13557)
@@ -38,7 +38,6 @@
     <include name="**/policy.jar"/>
     <include name="**/jbossws-api.jar"/>
     <include name="**/jbossws-common.jar"/>
-    <include name="**/jbossws-framework.jar"/>
     <include name="**/jbossws-native-client.jar"/>
     <include name="**/jbossws-native-core.jar"/>
     <include name="**/jbossws-native-services.jar"/>
@@ -75,7 +74,6 @@
     <include name="**/jboss-jaxb-intros.jar"/>
     <include name="**/jbossws-api.jar"/>
     <include name="**/jbossws-common.jar"/>
-    <include name="**/jbossws-framework.jar"/>
     <include name="**/jbossws-native-core.jar"/>
     <include name="**/jaxrpc-api.jar"/>
     <include name="**/netty.jar"/>

Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml	2011-01-11 16:11:01 UTC (rev 13556)
+++ stack/native/trunk/modules/testsuite/pom.xml	2011-01-11 16:32:58 UTC (rev 13557)
@@ -39,10 +39,6 @@
   <!-- Dependencies -->
   <dependencies>
     <dependency>
-      <groupId>org.jboss.ws</groupId>
-      <artifactId>jbossws-framework</artifactId>
-    </dependency>
-    <dependency>
       <groupId>xerces</groupId>
       <artifactId>xercesImpl</artifactId>
     </dependency>

Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml	2011-01-11 16:11:01 UTC (rev 13556)
+++ stack/native/trunk/pom.xml	2011-01-11 16:32:58 UTC (rev 13557)
@@ -98,11 +98,6 @@
         <groupId>org.jboss.ws</groupId>
         <artifactId>jbossws-framework</artifactId>
         <version>${jbossws.framework.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jboss.ws</groupId>
-        <artifactId>jbossws-framework</artifactId>
-        <version>${jbossws.framework.version}</version>
         <classifier>testsuite</classifier>
         <type>zip</type>
       </dependency>

Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml	2011-01-11 16:11:01 UTC (rev 13556)
+++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml	2011-01-11 16:32:58 UTC (rev 13557)
@@ -126,7 +126,6 @@
             <scope>provided</scope>
             <unpack>false</unpack>
             <includes>
-              <include>org.jboss.ws:jbossws-framework:jar</include>
               <include>org.jboss.jaxr:juddi-service:sar</include>
               <include>apache-scout:scout:jar</include>
               <include>juddi:juddi:jar</include>



More information about the jbossws-commits mailing list