Author: rick
Date: Tue Dec 7 09:16:16 2004
New Revision: 110113
URL: http://svn.apache.org/viewcvs?view=rev&rev=110113
Log:
Resolves: FOR-403
Copy the {forrest.home}/build/plugins directory to the generated webapp.
This gets plugins working in a deployed webapp.
Not sure this is the best solution. Suspect this would be better
located somewhere in WEB-INF and perhaps copy the plugins/**/lib/*.jar
to the WEB-INF/lib location as well .... Hmmmm ....
Modified:
forrest/trunk/main/forrest.build.xml
forrest/trunk/main/targets/webapp.xml
Modified: forrest/trunk/main/forrest.build.xml
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/forrest.build.xml?view=diff&rev=110113&p1=forrest/trunk/main/forrest.build.xml&r1=110112&p2=forrest/trunk/main/forrest.build.xml&r2=110113
==============================================================================
--- forrest/trunk/main/forrest.build.xml (original)
+++ forrest/trunk/main/forrest.build.xml Tue Dec 7 09:16:16 2004
@@ -96,8 +96,9 @@
<property file="${forrest.core.webapp}/default-forrest.properties" />
<!-- people should use forrest.properties to override following defaults -->
+ <property name="build.plugins-dir" value="build/plugins"/>
<property name="forrest.skins-dir" location="${forrest.core.webapp}/skins"/>
- <property name="forrest.plugins-dir" location="${forrest.home}/build/plugins"/>
+ <property name="forrest.plugins-dir" location="${forrest.home}/${build.plugins-dir}"/>
<property name="project.site-dir" location="${project.build-dir}/site" />
<property name="project.war" location="${project.build-dir}/${project.name}.war"
/>
<property name="project.webapp" location="${project.build-dir}/webapp" />
Modified: forrest/trunk/main/targets/webapp.xml
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/targets/webapp.xml?view=diff&rev=110113&p1=forrest/trunk/main/targets/webapp.xml&r1=110112&p2=forrest/trunk/main/targets/webapp.xml&r2=110113
==============================================================================
--- forrest/trunk/main/targets/webapp.xml (original)
+++ forrest/trunk/main/targets/webapp.xml Tue Dec 7 09:16:16 2004
@@ -150,7 +150,12 @@
<target name="war" depends="webapp"
description="* Generates a dynamic servlet-based website (a packaged .war file)">
- <jar destfile="${project.war}" basedir="${project.webapp}"/>
+ <jar destfile="${project.war}">
+ <fileset dir="${project.webapp}"/>
+ <fileset dir="${forrest.home}">
+ <include name="${build.plugins-dir}/**"/>
+ </fileset>
+ </jar>
<echo>
---------------------------------
Webapp .war file generated:
|