Author: crossley
Date: Sun Aug 24 22:17:15 2008
New Revision: 688617
URL: http://svn.apache.org/viewvc?rev=688617&view=rev
Log:
Formatting changes only. Tabs to spaces, remove trailing whitespace.
Modified:
forrest/branches/update_cocoon_2.1.12-dev/etc/cocoon_upgrade/build.xml
Modified: forrest/branches/update_cocoon_2.1.12-dev/etc/cocoon_upgrade/build.xml
URL:
http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12-dev/etc/cocoon_upgrade/build.xml?rev=688617&r1=688616&r2=688617&view=diff
==============================================================================
--- forrest/branches/update_cocoon_2.1.12-dev/etc/cocoon_upgrade/build.xml
(original)
+++ forrest/branches/update_cocoon_2.1.12-dev/etc/cocoon_upgrade/build.xml Sun
Aug 24 22:17:15 2008
@@ -37,7 +37,7 @@
FIXME: This needs more testing do not use it yet
=============================================================== -->
<xslt force="true" style="./upgrade-cocoon-xconf.xsl"
- in="${cocoon.home}/src/webapp/WEB-INF/xconf/cocoon-core.xconf"
+ in="${cocoon.home}/src/webapp/WEB-INF/xconf/cocoon-core.xconf"
out="${forrest.home}/main/webapp/WEB-INF/xconf/forrest-core.xconf" >
<outputproperty name="indent" value="yes"/>
</xslt>
@@ -75,11 +75,11 @@
</fileset>
</copy>
</target>
-
+
<target name="copy-optional-libs" depends="init">
<!-- ===============================================================
Some optional libraries are core to forrest
- FIXME: jing-*.jar comes from iso-relax.sf.net so maybe we need to
+ FIXME: jing-*.jar comes from iso-relax.sf.net so maybe we need to
have a copy-external-libs target
=============================================================== -->
<copy todir="${forrest.home}/lib/core" preservelastmodified="true">
@@ -105,8 +105,8 @@
<fileset dir="${cocoon.home}/lib/optional" includes="nekodtd-*.jar"/>
</copy>
</target>
-
- <target name="copy-endorsed-libs" depends="init">
+
+ <target name="copy-endorsed-libs" depends="init">
<!-- ===============================================================
Endorsed libraries need to go to the endorsed directory
=============================================================== -->
@@ -114,7 +114,7 @@
<fileset dir="${cocoon.home}/lib/endorsed" includes="*.jar"/>
</copy>
</target>
-
+
<target name="build-cocoon" depends="init">
<!-- ===============================================================
Copy local settings and build cocoon
@@ -122,10 +122,10 @@
<copy todir="${cocoon.home}">
<fileset dir="." includes="local.*.properties"/>
</copy>
- <condition property="build.script" value="build.bat">
- <os family="windows"/>
+ <condition property="build.script" value="build.bat">
+ <os family="windows"/>
</condition>
- <condition property="build.script" value="build.sh">
+ <condition property="build.script" value="build.sh">
<not>
<os family="windows"/>
</not>
@@ -133,7 +133,7 @@
<exec dir="${cocoon.home}" executable="${cocoon.home}/${build.script}"/>
</target>
-
+
<target name="copy-cocoon" depends="init">
<!-- ===============================================================
Copy a fresh build from cocoon
@@ -152,7 +152,7 @@
</fileset>
</copy>
<copy todir="${forrest.home}/lib/core">
- <mapper type="glob" from="*.jar"
+ <mapper type="glob" from="*.jar"
to="cocoon-*-${cocoon.version}.jar"/>
<fileset dir="${cocoon.home}/build/cocoon-${cocoon.version}/blocks">
<include name="*-block.jar"/>
