[jbossws-commits] JBossWS SVN: r6332 - in stack/metro/trunk: ant-import and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2008-04-10 07:57:41 -0400 (Thu, 10 Apr 2008)
New Revision: 6332

Modified:
   stack/metro/trunk/ant-import/build-prepare-deploy.xml
   stack/metro/trunk/build.xml
Log:
Fix jbossws-context war

Modified: stack/metro/trunk/ant-import/build-prepare-deploy.xml
===================================================================
--- stack/metro/trunk/ant-import/build-prepare-deploy.xml	2008-04-10 11:00:52 UTC (rev 6331)
+++ stack/metro/trunk/ant-import/build-prepare-deploy.xml	2008-04-10 11:57:41 UTC (rev 6332)
@@ -37,6 +37,7 @@
         <patternset refid="jbossws.lib.endorsed.patternset"/>
         <patternset refid="jbossws.server.lib.patternset"/>
         <patternset refid="jbossws.service.lib.patternset"/>
+        <include name="jbossws-context.war"/>
       </fileset>      
     </copy>
     <copy todir="${deploy.artifacts.dir}/resources">

Modified: stack/metro/trunk/build.xml
===================================================================
--- stack/metro/trunk/build.xml	2008-04-10 11:00:52 UTC (rev 6331)
+++ stack/metro/trunk/build.xml	2008-04-10 11:57:41 UTC (rev 6332)
@@ -166,18 +166,25 @@
     </jar>
     
     <!-- Build jbossws-context.war -->
-    <copy todir="${metro.output.lib.dir}/jbossws-context.war" filtering="true">
-      <fileset dir="${metro.resources.dir}/jbossws-context.war">
-        <include name="index.html"/>
-        <include name="styles.css"/>
-        <include name="WEB-INF/**"/>
-      </fileset>
+    <copy todir="${metro.output.resources.dir}/jbossws-context.war" overwrite="true" filtering="true">
+      <fileset dir="${metro.resources.dir}/jbossws-context.war"/>
       <filterset>
         <filter token="build.id" value="${build.id}"/>
         <filter token="implementation.version" value="jbossws-${version.id}"/>
         <filtersfile file="${metro.dir}/version.properties"/>
       </filterset>
     </copy>
+    <war warfile="${metro.output.lib.dir}/jbossws-context.war"
+      webxml="${metro.output.resources.dir}/jbossws-context.war/WEB-INF/web.xml"
+      manifest="${metro.output.etc.dir}/default.mf">
+      <fileset dir="${metro.output.resources.dir}/jbossws-context.war">
+        <include name="index.html"/>
+        <include name="styles.css"/>
+      </fileset>
+      <webinf dir="${metro.output.resources.dir}/jbossws-context.war/WEB-INF">
+        <include name="jboss-web.xml"/>
+      </webinf>
+    </war>
     
     <!-- Build jbossws-metro-src.zip -->
     <zip zipfile="${metro.output.lib.dir}/jbossws-metro-src.zip">