You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2004/12/04 07:48:13 UTC
svn commit: r109785 - /lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml /lenya/branches/BRANCH_1_2_X/tools/anttasks
Author: antonio
Date: Fri Dec 3 22:48:13 2004
New Revision: 109785
URL: http://svn.apache.org/viewcvs?view=rev&rev=109785
Log:
Use cocoon XConfToolTask.class
Removed:
lenya/branches/BRANCH_1_2_X/tools/anttasks/
Modified:
lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml
Modified: lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml
Url: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml?view=diff&rev=109785&p1=lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml&r1=109784&p2=lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml&r2=109785
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml (original)
+++ lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml Fri Dec 3 22:48:13 2004
@@ -30,13 +30,14 @@
<tstamp>
<format property="SNAPSHOT_STAMP" pattern="yyyyMMdd'T'HHmmss"/>
</tstamp>
-
+
<property name="Name" value="Apache Lenya"/>
<property name="release" value="1th"/>
<property name="year" value="1999-2004"/>
<echo message="------------------- ${Name} ${version} [${year}] ----------------"/>
- <echo>Building with ${ant.version} using build file ${ant.file}</echo>
+ <echo>Building with ${ant.version}</echo>
+ <echo>Using build file ${ant.file}</echo>
<property name="debug" value="on"/>
<property name="optimize" value="off"/>
@@ -54,8 +55,6 @@
<property name="snapshot.src.name" value="${fullname}-${SNAPSHOT_STAMP}-src"/>
<property name="snapshot.bin.dir" value="${dist.root}/${snapshot.bin.name}"/>
<property name="snapshot.src.dir" value="${dist.root}/${snapshot.src.name}"/>
-
-
</target>
<target name="build-custom-tasks" depends="init">
@@ -71,12 +70,12 @@
nowarn="${nowarn}"
includes="org/apache/lenya/cms/ant/**"
classpathref="classpath"
- source="1.4"/>
+ source="${target.vm}"/>
<taskdef name="copyJavaSources" classpath="${build.dir}/tools/anttasks" classname="org.apache.lenya.cms.ant.CopyJavaSourcesTask"/>
<taskdef name="bulkCopy" classpath="${build.dir}/tools/anttasks" classname="org.apache.lenya.cms.ant.BulkCopyTask"/>
<taskdef name="copyPubs" classpath="${build.dir}/tools/anttasks" classname="org.apache.lenya.cms.ant.CopyTask"/>
- <taskdef name="xpatch" classname="XConfToolTask" classpath="${tools.tasks.dest}"/>
+ <taskdef name="xpatch" classname="XConfToolTask" classpath="${cocoon.src.dir}/tools/anttasks"/>
</target>
<!-- ============================================================ -->
@@ -84,8 +83,8 @@
<!-- ============================================================ -->
<target name="prepare-cocoon" depends="init">
<echo>INFO: exclude: sitemap.xmap</echo>
- <echo>INFO: exclude: WEB-INF/cocoon.xconf</echo>
- <echo>INFO: exclude: WEB-INF/logkit.xconf</echo>
+ <echo>INFO: exclude: WEB-INF/cocoon.xconf</echo>
+ <echo>INFO: exclude: WEB-INF/logkit.xconf</echo>
<echo>INFO: exclude: WEB-INF/web.xml</echo>
<echo>INFO: exclude: WEB-INF/lib/lucene**.jar</echo>
<echo>INFO: exclude: **/javac.jar</echo>
@@ -99,7 +98,7 @@
<exclude name="**/javac.jar"/>
</fileset>
</copy>
-
+
<!-- patch cocoon.xconf -->
<echo>INFO: patching cocoon.xconf with XSLT stylesheet</echo>
<xslt
@@ -112,7 +111,7 @@
<param name="xopus-path" expression="${xopus.path}"/>
<outputproperty name="indent" value="yes"/>
</xslt>
-
+
<!-- patch logkit.xconf -->
<echo>INFO: patching logkit.xconf with XSLT stylesheet</echo>
<xslt
@@ -122,7 +121,7 @@
>
<outputproperty name="indent" value="yes"/>
</xslt>
-
+
<!-- patch web.xml -->
<echo>INFO: patching web.xml with XSLT stylesheet</echo>
<xslt
@@ -133,7 +132,7 @@
>
<param name="enableUploads" expression="${enable.uploads}"/>
<xmlcatalog>
- <dtd
+ <dtd
publicId="-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
location="${src.webapp.dir}/WEB-INF/entities/web-app_2_3.dtd"/>
</xmlcatalog>
@@ -148,9 +147,9 @@
</fileset>
</copy>
- <!-- Copy Entities
+ <!-- Copy Entities
<echo>INFO: Copy publication-specific entities to Cocoon catalog</echo>
- <copyJavaSources pubsrootdirs="${pubs.root.dirs}" javadir="${src.entities.dir}" builddir="${build.webapp}/${build.entities.dir}" />
+ <copyJavaSources pubsrootdirs="${pubs.root.dirs}" javadir="${src.entities.dir}" builddir="${build.webapp}/${build.entities.dir}" />
-->
</target>
@@ -167,7 +166,7 @@
<!-- Prepares the source code -->
<!-- ============================================================ -->
<target name="prepare-src" depends="prepare, build-custom-tasks">
-
+
<echo>INFO: Create log4j.properties (${build.src}/log4j.properties)</echo>
<!-- using stylesheet as input file so we don't need a dummy xml -->
<xslt
@@ -191,11 +190,11 @@
<!-- FIXME: Use bulkCopy task in the future; needs regexp mapper which is part of ant optional package. -->
<echo>INFO: Copy java source files from ${pubs.root.dirs} to ${build.src}</echo>
<copyJavaSources pubsrootdirs="${pubs.root.dirs}" javadir="java/src" builddir="${build.src}" />
-
+
<echo>INFO: Copy publication specific libraries from ${pubs.root.dirs} (java/lib) to ${build.webapp}/WEB-INF/lib</echo>
- <bulkCopy
- sourcedirs="${pubs.root.dirs}"
- todir="${build.webapp}/WEB-INF/lib"
+ <bulkCopy
+ sourcedirs="${pubs.root.dirs}"
+ todir="${build.webapp}/WEB-INF/lib"
flatten="true">
<fileset includes="*/java/lib/*"/>
</bulkCopy>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org