svn commit: r739234 - in /forrest/trunk: main/targets/webapp.xml site-author/status.xml

[th...@apache.org]

Author: thorsten
Date: Fri Jan 30 10:59:28 2009
New Revision: 739234

URL: http://svn.apache.org/viewvc?rev=739234&view=rev
Log:
FOR-1074 Using the war ant task to include the plugin libs

Modified:
    forrest/trunk/main/targets/webapp.xml
    forrest/trunk/site-author/status.xml

Modified: forrest/trunk/main/targets/webapp.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/targets/webapp.xml?rev=739234&r1=739233&r2=739234&view=diff
==============================================================================
--- forrest/trunk/main/targets/webapp.xml (original)
+++ forrest/trunk/main/targets/webapp.xml Fri Jan 30 10:59:28 2009
@@ -166,12 +166,34 @@
     </xslt>
 <!-- FIXME: The xslt task did not like writing to the same file (Mac OS X?) -->
     <move file="${project.webapp}/WEB-INF/cocoon.xconf2" tofile="${project.webapp}/WEB-INF/cocoon.xconf"/>
-    <jar destfile="${project.war}">
-      <fileset dir="${project.webapp}"/>
-      <fileset dir="${forrest.home}">
+   
+   <!-- Generate the war.
+    We need to copy not only the core libararies but as well any that may come from
+    the plugins (cp. FOR-1074) -->
+    <war destfile="${project.war}"
+      webxml="${project.webapp}/WEB-INF/web.xml">
+      <lib dir="${project.webapp}/WEB-INF/lib">
+        <include name="*.jar"/>
+        <exclude name="servlet*.jar"/>
+      </lib>
+      <lib dir="${forrest.home}/${build.plugins-dir}/lib">
+        <include name="*.jar"/>
+        <exclude name="servlet*.jar"/>
+      </lib>
+      <webinf dir="${project.webapp}/WEB-INF">
+        <exclude name="**/web.xml"/>
+        <exclude name="**/lib/*"/>
+      </webinf>
+      <fileset dir="${project.webapp}">
+        <exclude name="**/WEB-INF/"/>
+      </fileset>
+     <fileset dir="${forrest.home}">
+        <exclude name="${build.plugins-dir}/**/lib/"/>
         <include name="${build.plugins-dir}/**"/>
       </fileset>
-    </jar>
+    </war>
+   
+   <!-- Finishing by echoing the location of the ready to use war -->
     <echo>
 ---------------------------------
 Webapp .war file generated:

Modified: forrest/trunk/site-author/status.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/status.xml?rev=739234&r1=739233&r2=739234&view=diff
==============================================================================
--- forrest/trunk/site-author/status.xml (original)
+++ forrest/trunk/site-author/status.xml Fri Jan 30 10:59:28 2009
@@ -151,6 +151,12 @@
         Added document to facilitate
         <link href="site:upgrading_09">upgrading to v0.9</link>
       </action>
+<!-- 2009-01 -->     
+     <action context="code" type="fix" dev="TS" fixes-bug="FOR-1074"
+        importance="high">
+        There was a problem with plugins libs not being copied. Using 
+        the war task from ant fixes this issue.   
+      </action>
 <!-- 2008-11 -->
       <action context="code" type="update" dev="DC">
         Forrestbot deploy.scp workstage now reports which files were transferred.