svn commit: r111738 - /forrest/trunk/main/targets/webapp.xml

[ri...@apache.org]

Author: rick
Date: Mon Dec 13 10:22:16 2004
New Revision: 111738

URL: http://svn.apache.org/viewcvs?view=rev&rev=111738
Log:
Get the plugins working with a deployed web app.  The move to having the
plugin xmap files under the project's temp dir needed to be reflected in
in the deployed (war) web application.

These plugin xmap files are now copied explicitly during the creation of
the web application.

Modified:
   forrest/trunk/main/targets/webapp.xml

Modified: forrest/trunk/main/targets/webapp.xml
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/targets/webapp.xml?view=diff&rev=111738&p1=forrest/trunk/main/targets/webapp.xml&r1=111737&p2=forrest/trunk/main/targets/webapp.xml&r2=111738
==============================================================================
--- forrest/trunk/main/targets/webapp.xml	(original)
+++ forrest/trunk/main/targets/webapp.xml	Mon Dec 13 10:22:16 2004
@@ -130,6 +130,25 @@
     <copy toDir="${project.webapp}/project/build/tmp"
       file="${project.temp-dir}/build-info.xml"/>
 
+    <!-- Grab the plugin xmaps as these are no longer in the
+         plugins-dir.
+
+         During the build, the plugin information is copied during the
+         init-plugins task.  However, those are not sufficient when
+         creating a deployable war file.  That is because the
+         properties used for "project.webapp", "project.home" etc.
+         have different values when being built and when being run as
+         a war file.
+
+         The value of "todir" below corresponds to 
+         {project:temp-dir} when running as a web application. -->
+
+    <copy todir="${project.webapp}/project/build/tmp">
+     <fileset dir="${project.temp-dir}">
+       <include name="*.xmap"/>
+     </fileset>
+    </copy>
+
     <loadfile  property="webapp-generated-message" 
       srcFile="${forrest.core}/var/webapp-generated-message.txt">
         <filterchain><expandproperties/></filterchain>