[jbossws-commits] JBossWS SVN: r8722 - in stack/metro/trunk: modules/testsuite and 1 other directories.

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Thu Nov 13 09:47:08 EST 2008 

Author: alessio.soldano at jboss.com
Date: 2008-11-13 09:47:08 -0500 (Thu, 13 Nov 2008)
New Revision: 8722

Modified:
   stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf
   stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
   stack/metro/trunk/modules/testsuite/pom.xml
   stack/metro/trunk/src/main/distro/build-setup.xml
Log:
[JBWS-2383] use common/lib


Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf	2008-11-13 14:44:00 UTC (rev 8721)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf	2008-11-13 14:47:08 UTC (rev 8722)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/lib/jboss-jaxrpc.jar server/lib/jboss-jaxws-ext.jar server/lib/jboss-jaxws.jar server/lib/jboss-saaj.jar server/lib/jbossws-native-jaxrpc.jar server/lib/jbossws-native-jaxws-ext.jar server/lib/jbossws-native!
 -jaxws.jar server/lib/jbossws-native-saaj.jar server/lib/jbossws-common.jar server/lib/jbossws-framework.jar server/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml 
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native!
 -jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml 

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-11-13 14:44:00 UTC (rev 8721)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml	2008-11-13 14:47:08 UTC (rev 8722)
@@ -380,7 +380,7 @@
     <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
     <macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
     <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
-    <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/../lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <!-- Please note the ".." to use common server lib! -->
+    <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-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-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>

Modified: stack/metro/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/pom.xml	2008-11-13 14:44:00 UTC (rev 8721)
+++ stack/metro/trunk/modules/testsuite/pom.xml	2008-11-13 14:47:08 UTC (rev 8722)
@@ -538,7 +538,7 @@
               <!-- TODO: replace with maven dependencies -->
               <additionalClasspathElements>
                 <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
-                <additionalClasspathElement>${jboss.home}/server/lib/jboss-ejb3-core.jar</additionalClasspathElement>
+                <additionalClasspathElement>${jboss.home}/common/lib/jboss-ejb3-core.jar</additionalClasspathElement>
               </additionalClasspathElements>
             </configuration>
           </plugin>

Modified: stack/metro/trunk/src/main/distro/build-setup.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build-setup.xml	2008-11-13 14:44:00 UTC (rev 8721)
+++ stack/metro/trunk/src/main/distro/build-setup.xml	2008-11-13 14:47:08 UTC (rev 8722)
@@ -48,7 +48,7 @@
     <property name="jboss501.lib" value="${jboss501.home}/lib"/>
     <property name="jboss501.client" value="${jboss501.home}/client"/>
     <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/>
-    <property name="jboss501.server.lib" value="${jboss501.home}/server/lib"/>
+    <property name="jboss501.server.lib" value="${jboss501.home}/common/lib"/>
     <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/>
     <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/>

More information about the jbossws-commits mailing list