You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by gr...@apache.org on 2005/03/19 18:56:24 UTC
svn commit: r158259 - in lenya/trunk/src/targets: init-build.xml
properties-build.xml webapp-build.xml
Author: gregor
Date: Sat Mar 19 09:56:22 2005
New Revision: 158259
URL: http://svn.apache.org/viewcvs?view=rev&rev=158259
Log:
Made sure that excludes are actually working while copying cocoon files. This resolves the problem where the Lenya db was not copied correctly.
Modified:
lenya/trunk/src/targets/init-build.xml
lenya/trunk/src/targets/properties-build.xml
lenya/trunk/src/targets/webapp-build.xml
Modified: lenya/trunk/src/targets/init-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/init-build.xml?view=diff&r1=158258&r2=158259
==============================================================================
--- lenya/trunk/src/targets/init-build.xml (original)
+++ lenya/trunk/src/targets/init-build.xml Sat Mar 19 09:56:22 2005
@@ -100,8 +100,9 @@
<fileset dir="${cocoon.webapp.dir}">
<exclude name="*.xml"/>
<exclude name="*.xslt"/>
- <exclude name="test-suite"/>
- <exclude name="legal"/>
+ <exclude name="test-suite/**"/>
+ <exclude name="legal/**"/>
+ <exclude name="WEB-INF/db/**"/>
<exclude name="WEB-INF/cocoon.xconf"/>
<exclude name="WEB-INF/logkit.xconf"/>
<exclude name="WEB-INF/web.xml"/>
Modified: lenya/trunk/src/targets/properties-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/properties-build.xml?view=diff&r1=158258&r2=158259
==============================================================================
--- lenya/trunk/src/targets/properties-build.xml (original)
+++ lenya/trunk/src/targets/properties-build.xml Sat Mar 19 09:56:22 2005
@@ -100,6 +100,8 @@
<property name="tools.tasks.dest" value="tools/anttasks"/>
<!-- cocoon build properties directory -->
<property name="src.cocoon.properties.dir" value="src/cocoon"/>
+ <!-- hsqldb database config files directory -->
+ <property name="src.database.dir" value="src/webapp/WEB-INF/db"/>
<!-- ============================================================ -->
Modified: lenya/trunk/src/targets/webapp-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/webapp-build.xml?view=diff&r1=158258&r2=158259
==============================================================================
--- lenya/trunk/src/targets/webapp-build.xml (original)
+++ lenya/trunk/src/targets/webapp-build.xml Sat Mar 19 09:56:22 2005
@@ -146,7 +146,14 @@
</fileset>
</copy>
- <condition property="servlet.engine.tomcat">
+ <!-- Copy database files to ${build.webapp}/WEB-INF/db -->
+ <copy todir="${build.webapp}/WEB-INF/db">
+ <fileset dir="${src.database.dir}">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+
+ <condition property="servlet.engine.tomcat">
<equals arg1="${web.app.server}" arg2="Tomcat"/>
</condition>
<antcall target="successfully-built-message-tomcat"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org