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 2004/11/04 05:54:41 UTC
svn commit: rev 56565 - incubator/lenya/trunk/src/targets
Author: gregor
Date: Wed Nov 3 20:54:39 2004
New Revision: 56565
Modified:
incubator/lenya/trunk/src/targets/compile-build.xml
incubator/lenya/trunk/src/targets/dist-build.xml
incubator/lenya/trunk/src/targets/docs-build.xml
incubator/lenya/trunk/src/targets/export-build.xml
incubator/lenya/trunk/src/targets/ide-build.xml
incubator/lenya/trunk/src/targets/init-build.xml
incubator/lenya/trunk/src/targets/properties-build.xml
incubator/lenya/trunk/src/targets/publication-test-build-template.xml
incubator/lenya/trunk/src/targets/publication-test-build.xml
incubator/lenya/trunk/src/targets/test-build.xml
incubator/lenya/trunk/src/targets/webapp-build.xml
Log:
fix build erors, improve integration with cooon build
Modified: incubator/lenya/trunk/src/targets/compile-build.xml
==============================================================================
--- incubator/lenya/trunk/src/targets/compile-build.xml (original)
+++ incubator/lenya/trunk/src/targets/compile-build.xml Wed Nov 3 20:54:39 2004
@@ -15,9 +15,9 @@
limitations under the License.
-->
-<!-- $Id: compile-build.xml,v 1.4 2004/05/04 13:46:26 michi Exp $ -->
+<!-- $Id$ -->
-<project name="compile">
+<project name="lenya-compile">
<description>
Compilation Targets
Modified: incubator/lenya/trunk/src/targets/dist-build.xml
==============================================================================
--- incubator/lenya/trunk/src/targets/dist-build.xml (original)
+++ incubator/lenya/trunk/src/targets/dist-build.xml Wed Nov 3 20:54:39 2004
@@ -17,7 +17,7 @@
<!-- $Id$ -->
-<project name="dist">
+<project name="lenya-dist">
<description>
Distribution Targets
Modified: incubator/lenya/trunk/src/targets/docs-build.xml
==============================================================================
--- incubator/lenya/trunk/src/targets/docs-build.xml (original)
+++ incubator/lenya/trunk/src/targets/docs-build.xml Wed Nov 3 20:54:39 2004
@@ -15,9 +15,9 @@
limitations under the License.
-->
-<!-- $Id: docs-build.xml,v 1.3 2004/03/21 18:35:15 gregor Exp $ -->
+<!-- $Id$ -->
-<project name="documentation">
+<project name="lenya-documentation">
<description>
Documentation Targets
Modified: incubator/lenya/trunk/src/targets/export-build.xml
==============================================================================
--- incubator/lenya/trunk/src/targets/export-build.xml (original)
+++ incubator/lenya/trunk/src/targets/export-build.xml Wed Nov 3 20:54:39 2004
@@ -17,7 +17,7 @@
<!-- $Id$ -->
-<project name="export">
+<project name="lenya-export">
<description>
Export Targets
Modified: incubator/lenya/trunk/src/targets/ide-build.xml
==============================================================================
--- incubator/lenya/trunk/src/targets/ide-build.xml (original)
+++ incubator/lenya/trunk/src/targets/ide-build.xml Wed Nov 3 20:54:39 2004
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="ide">
+<project name="lenya-ide">
<description>
IDE targets
Modified: incubator/lenya/trunk/src/targets/init-build.xml
==============================================================================
--- incubator/lenya/trunk/src/targets/init-build.xml (original)
+++ incubator/lenya/trunk/src/targets/init-build.xml Wed Nov 3 20:54:39 2004
@@ -17,7 +17,7 @@
<!-- $Id: init-build.xml 46135 2004-09-15 21:58:38Z antonio $ -->
-<project name="init">
+<project name="lenya-init">
<description>
Initialization Targets
@@ -54,8 +54,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">
@@ -82,7 +80,8 @@
<!-- ============================================================ -->
<!-- Prepares the build webapp directory -->
<!-- ============================================================ -->
- <target name="build-cocoon" depends="init, build-custom-tasks">
+ <target name="build-cocoon" depends="init">
+ <taskdef name="xpatch" classname="XConfToolTask" classpath="${tools.tasks.dest}"/>
<echo>Building Cocoon with our properties</echo>
<copy todir="${cocoon.src.dir}" filtering="off">
<fileset dir="${src.cocoon.properties.dir}"/>
@@ -92,7 +91,7 @@
includes="src/confpatch/*.xmap"/>
</target>
- <target name="prepare-cocoon" depends="init, build-cocoon">
+ <target name="prepare-cocoon" depends="build-cocoon">
<echo>INFO: exclude: WEB-INF/cocoon.xconf</echo>
<echo>INFO: exclude: WEB-INF/logkit.xconf</echo>
<echo>INFO: exclude: WEB-INF/web.xml</echo>
Modified: incubator/lenya/trunk/src/targets/properties-build.xml
==============================================================================
--- incubator/lenya/trunk/src/targets/properties-build.xml (original)
+++ incubator/lenya/trunk/src/targets/properties-build.xml Wed Nov 3 20:54:39 2004
@@ -17,7 +17,7 @@
<!-- $Id: properties-build.xml 43145 2004-07-27 03:07:25Z michi $ -->
-<project name="properties">
+<project name="lenya-properties">
<description>
Properties Targets
@@ -104,7 +104,10 @@
<fileset dir="${lib.dir}">
<include name="*.jar"/>
</fileset>
- <fileset dir="${build.webapp}/WEB-INF/lib">
+ <fileset dir="${src.webapp.dir}/WEB-INF/lib">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${cocoon.webapp.dir}/WEB-INF/lib">
<include name="*.jar"/>
</fileset>
<fileset dir="tools/jetty/lib">
Modified: incubator/lenya/trunk/src/targets/publication-test-build-template.xml
==============================================================================
--- incubator/lenya/trunk/src/targets/publication-test-build-template.xml (original)
+++ incubator/lenya/trunk/src/targets/publication-test-build-template.xml Wed Nov 3 20:54:39 2004
@@ -15,8 +15,8 @@
limitations under the License.
-->
-<!-- $Id: publication-test-build-template.xml,v 1.2 2004/03/21 18:35:46 gregor Exp $ -->
-<project name="pubtest">
+<!-- $Id$ -->
+<project name="lenya-pubtest">
<description>
Publication Test Targets
Modified: incubator/lenya/trunk/src/targets/publication-test-build.xml
==============================================================================
--- incubator/lenya/trunk/src/targets/publication-test-build.xml (original)
+++ incubator/lenya/trunk/src/targets/publication-test-build.xml Wed Nov 3 20:54:39 2004
@@ -16,7 +16,7 @@
-->
<!-- $Id$ -->
-<project name="pubtest">
+<project name="lenya-pubtest">
<description>
Publication Test Targets
Modified: incubator/lenya/trunk/src/targets/test-build.xml
==============================================================================
--- incubator/lenya/trunk/src/targets/test-build.xml (original)
+++ incubator/lenya/trunk/src/targets/test-build.xml Wed Nov 3 20:54:39 2004
@@ -15,9 +15,9 @@
limitations under the License.
-->
-<!-- $Id: test-build.xml,v 1.18 2004/03/21 18:35:15 gregor Exp $ -->
+<!-- $Id$ -->
-<project name="test">
+<project name="lenya-test">
<description>
Test Targets
Modified: incubator/lenya/trunk/src/targets/webapp-build.xml
==============================================================================
--- incubator/lenya/trunk/src/targets/webapp-build.xml (original)
+++ incubator/lenya/trunk/src/targets/webapp-build.xml Wed Nov 3 20:54:39 2004
@@ -17,24 +17,12 @@
<!-- $Id: webapp-build.xml 46135 2004-09-15 21:58:38Z antonio $ -->
-<project name="webapp">
+<project name="lenya-webapp">
<description>
Webapp Targets
</description>
- <target name="check-cocoon" description="Check if Cocoon webapp exists">
- <echo>INFO: Check if Cocoon webapp exists</echo>
- <available file="${cocoon.webapp.dir}" property="cocoon.exists"/>
-
- <antcall target="cocoon-does-not-exist"/>
- </target>
-
- <target name="cocoon-does-not-exist" description="Check if Cocoon webapp exists" unless="cocoon.exists">
- <echo>ERROR: Cocoon webapp does not exist: ${cocoon.webapp.dir}</echo>
- <fail message="Cocoon webapp does not exist: ${cocoon.webapp.dir}"/>
- </target>
-
<!-- ============================================================ -->
<!-- Produce the webapp -->
<!-- ============================================================ -->
@@ -48,8 +36,8 @@
in the server.xml configuration is set to true so changes in the classes
are reflected immediately.
-->
- <target name="webapp" depends="check-cocoon, compile" description="Builds the webapp directory ready to be linked into a servlet engines context directory" if="cocoon.exists">
-
+ <target name="webapp" depends="compile"
+ description="Builds the webapp directory ready to be linked into a servlet engines context directory">
<!--
Copy CMS files and overwrite some parts of the previously unpacked cocoon webapp package with our customized files
-->
@@ -69,7 +57,7 @@
</copyPubs>
<!-- Patch cocoon.xconf -->
- <echo>INFO: Patch cocoon.xconf</echo>
+ <echo>INFO: Patch cocoon.xconf with publication-specific changes</echo>
<xpatch file="${build.webapp}/WEB-INF/cocoon.xconf"
srcdir="${build.webapp}/lenya/pubs"
includes="*/config/*.xconf"
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org