[jboss-cvs] JBossAS SVN: r74691 - branches/ropalka-jbossws302/webservices.

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

Author: richard.opalka at jboss.com
Date: 2008-06-17 10:02:31 -0400 (Tue, 17 Jun 2008)
New Revision: 74691

Modified:
   branches/ropalka-jbossws302/webservices/build.xml
   branches/ropalka-jbossws302/webservices/pom.xml
Log:
[JBAS-5293] update pom

Modified: branches/ropalka-jbossws302/webservices/build.xml
===================================================================
--- branches/ropalka-jbossws302/webservices/build.xml	2008-06-17 14:00:14 UTC (rev 74690)
+++ branches/ropalka-jbossws302/webservices/build.xml	2008-06-17 14:02:31 UTC (rev 74691)
@@ -147,7 +147,7 @@
       <metainf dir="${build.resources}/jbossws-jboss50.jar/META-INF"/>
     </jar>
 
-    <!-- Build jbossws-native50.deployer -->
+    <!-- Build jbossws.deployer -->
     <zip zipfile="${build.lib}/jbossws-jboss50-deployer.zip">
       <fileset dir="${build.lib}">
         <include name="jbossws-jboss50.jar"/>
@@ -174,7 +174,7 @@
   -->
   <target name="deploy" depends="module-jars">
 
-    <!-- Build jbossws-native50.deployer -->
+    <!-- Build jbossws.deployer -->
     <property name="jbossws.deployer.dir" value="../build/output/jboss-${specification.version}/server/default/deployers/jbossws.deployer"/>
     <unzip dest="${jbossws.deployer.dir}" src="${build.lib}/jbossws-jboss50-deployer.zip"/>
     

Modified: branches/ropalka-jbossws302/webservices/pom.xml
===================================================================
--- branches/ropalka-jbossws302/webservices/pom.xml	2008-06-17 14:00:14 UTC (rev 74690)
+++ branches/ropalka-jbossws302/webservices/pom.xml	2008-06-17 14:02:31 UTC (rev 74691)
@@ -12,32 +12,6 @@
   <name>JBoss Application Server Webservices</name>
   <url>http://www.jboss.com/products/jbossas</url>
   <description>JBoss Application Server (webservices module)</description>
-  <build>
-    <sourceDirectory>src/main</sourceDirectory>
-    <resources>
-      <resource>
-        <directory>src/resources</directory>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>assembly</id>
-            <goals>
-              <goal>attached</goal>
-            </goals>
-            <phase>package</phase>
-          </execution>
-        </executions>
-        <configuration>
-          <descriptorSourceDirectory>src/assembly</descriptorSourceDirectory>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
   <dependencies>
     <!-- Compile (global dependencies) -->
     <dependency>
@@ -143,4 +117,36 @@
     </dependency>
   </dependencies>
   
+  <!-- Plugins -->
+  <build>
+    <sourceDirectory>src/main</sourceDirectory>
+    <resources>
+      <resource>
+        <directory>src/resources</directory>
+      </resource>
+      <resource>
+        <directory>src/main/resources/jbossws-jboss50.jar</directory>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <configuration>
+              <descriptors>
+                <descriptor>src/scripts/assembly-container.xml</descriptor>
+                <descriptor>src/scripts/assembly-resources.xml</descriptor>
+              </descriptors>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>