nicolaken 02/03/26 00:04:05
Modified: . build.xml changes.xml
Log:
When including the scratchpad libs in the build, all the scratchpad samples are
copied too.
Revision Changes Path
1.194 +18 -19 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- build.xml 26 Mar 2002 07:52:53 -0000 1.193
+++ build.xml 26 Mar 2002 08:04:05 -0000 1.194
@@ -302,25 +302,6 @@
<property name="install.war" value=""/>
<user-input name="install.war">Please select an installation
directory</user-input>
- <!-- copy scratchpad webapp samples -->
- <!-- NKB:FIXME Doing it here instead of in the webapp target to maintain
original
- behaviour of that target. Should be done there in the future
IMHO. -->
- <mkdir dir="${build.war}"/>
- <copy todir="${build.war}" filtering="on">
- <fileset dir="${scratchpad.webapp}">
- <exclude name="**/*.gif"/>
- <exclude name="**/*.jpg"/>
- <exclude name="**/*.png"/>
- </fileset>
- </copy>
- <copy todir="${build.war}" filtering="off">
- <fileset dir="${scratchpad.webapp}">
- <include name="**/*.gif"/>
- <include name="**/*.jpg"/>
- <include name="**/*.png"/>
- </fileset>
- </copy>
-
<!-- tell the install target to include all libs in dist -->
<property name="include.webapp.libs" value="true"/>
<property name="include.scratchpad.libs" value="true"/>
@@ -1135,6 +1116,24 @@
<xconf-tool directory="${build.scratchpad.src}"
extension="xconf"
configuration="${build.war}/WEB-INF/cocoon.xconf"/>
+
+ <!-- copy scratchpad webapp samples -->
+ <mkdir dir="${build.war}"/>
+ <copy todir="${build.war}" filtering="on">
+ <fileset dir="${scratchpad.webapp}">
+ <exclude name="**/*.gif"/>
+ <exclude name="**/*.jpg"/>
+ <exclude name="**/*.png"/>
+ </fileset>
+ </copy>
+ <copy todir="${build.war}" filtering="off">
+ <fileset dir="${scratchpad.webapp}">
+ <include name="**/*.gif"/>
+ <include name="**/*.jpg"/>
+ <include name="**/*.png"/>
+ </fileset>
+ </copy>
+
</target>
<!-- =================================================================== -->
1.128 +5 -1 xml-cocoon2/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/changes.xml,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- changes.xml 22 Mar 2002 17:40:44 -0000 1.127
+++ changes.xml 26 Mar 2002 08:04:05 -0000 1.128
@@ -4,7 +4,7 @@
<!--
History of Cocoon changes
- $Id: changes.xml,v 1.127 2002/03/22 17:40:44 tcurdt Exp $
+ $Id: changes.xml,v 1.128 2002/03/26 08:04:05 nicolaken Exp $
-->
<changes title="History of Changes">
@@ -35,6 +35,10 @@
</devs>
<release version="@version@" date="@date@">
+ <action dev="NKB" type="update">
+ When including the scratchpad libs in the build,
+ all the scratchpad samples are copied too.
+ </action>
<action dev="SW" type="add">
New BootstrapServlet to allow Cocoon to run in non-compliant servlet
engines that don't handle correctly servlet contexts. This servlet
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
