[jboss-cvs] JBossAS SVN: r99758 - in trunk: webservices/src/assembly and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2010-01-21 11:54:45 -0500 (Thu, 21 Jan 2010)
New Revision: 99758

Modified:
   trunk/build/build.xml
   trunk/webservices/src/assembly/jbossws-jboss60-deployer.xml
Log:
refactoring - COMMON, FRAMEWORK and ASIL have to be in AS/common/lib not in deployers folder

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2010-01-21 16:46:59 UTC (rev 99757)
+++ trunk/build/build.xml	2010-01-21 16:54:45 UTC (rev 99758)
@@ -1951,7 +1951,6 @@
       <fileset refid="javax.jws:jsr181-api:jar"/>
       <fileset refid="javax.xml:jaxrpc-api:jar"/>
       <fileset refid="javax.xml.soap:saaj-api:jar"/>
-      <fileset refid="org.jboss.ws.native:jbossws-native-factories:jar"/>
       <fileset refid="org.jboss.ws:jbossws-common:jar"/>
       <fileset refid="org.jboss.ws:jbossws-framework:jar"/>
       <fileset refid="org.jboss.ws:jbossws-spi:jar"/>
@@ -2045,6 +2044,10 @@
       <mapper refid="remove-versions" />
     </copy>
 
+    <!-- Install JBossWS ASIL to common/lib directory -->
+    <copy file="${webservices.module.output}/jboss-as-webservices.jar"
+            tofile="${install.common.lib}/jbossws-jboss60.jar"/>
+
     <copy file="${snmptrapappender:snmpTrapAppender:jar}"
             tofile="${install.common.lib}/log4j-snmp-appender.jar"/>
 
@@ -2177,7 +2180,6 @@
       <fileset refid="javax.jws:jsr181-api:jar"/>
       <fileset refid="org.jboss.ws.native:jbossws-native-client:jar"/>
       <fileset refid="org.jboss.ws.native:jbossws-native-core:jar"/>
-      <fileset refid="org.jboss.ws.native:jbossws-native-factories:jar"/>
       <fileset refid="javax.xml:jaxrpc-api:jar"/>
       <fileset refid="javax.xml.soap:saaj-api:jar"/>
       <fileset refid="org.jboss.ws:jbossws-common:jar"/>

Modified: trunk/webservices/src/assembly/jbossws-jboss60-deployer.xml
===================================================================
--- trunk/webservices/src/assembly/jbossws-jboss60-deployer.xml	2010-01-21 16:46:59 UTC (rev 99757)
+++ trunk/webservices/src/assembly/jbossws-jboss60-deployer.xml	2010-01-21 16:54:45 UTC (rev 99758)
@@ -13,20 +13,4 @@
       </includes>
     </fileSet>
   </fileSets>
-  <files>
-    <file>
-      <source>target/${project.build.finalName}.jar</source>
-      <outputDirectory>/</outputDirectory>
-      <destName>jbossws-jboss60.jar</destName>
-    </file>
-  </files>
-  <dependencySets>
-    <dependencySet>
-      <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-      <includes>
-        <include>org.jboss.ws:jbossws-common</include>
-        <include>org.jboss.ws:jbossws-framework</include>
-      </includes>
-    </dependencySet>
-  </dependencySets>
 </assembly>