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 2006/06/22 18:02:35 UTC
svn commit: r416406 - in /lenya/trunk/src: resources/build/modules2build.xsl
targets/modules-build.xml targets/test-build.xml
Author: andreas
Date: Thu Jun 22 09:02:35 2006
New Revision: 416406
URL: http://svn.apache.org/viewvc?rev=416406&view=rev
Log:
Parameterize module patches to support test configuration
Modified:
lenya/trunk/src/resources/build/modules2build.xsl
lenya/trunk/src/targets/modules-build.xml
lenya/trunk/src/targets/test-build.xml
Modified: lenya/trunk/src/resources/build/modules2build.xsl
URL: http://svn.apache.org/viewvc/lenya/trunk/src/resources/build/modules2build.xsl?rev=416406&r1=416405&r2=416406&view=diff
==============================================================================
--- lenya/trunk/src/resources/build/modules2build.xsl (original)
+++ lenya/trunk/src/resources/build/modules2build.xsl Thu Jun 22 09:02:35 2006
@@ -4,6 +4,8 @@
xmlns:list="http://apache.org/lenya/module-list/1.0">
<xsl:output indent="yes"/>
+
+ <xsl:param name="cocoon-xconf"/>
<xsl:template match="list:modules">
<project name="lenya-modules">
@@ -145,7 +147,6 @@
</target>
<target name="patch-module-{$id}">
- <xsl:variable name="cocoon-xconf">${build.webapp}/WEB-INF/cocoon.xconf</xsl:variable>
<xpatch file="{$cocoon-xconf}"
srcdir="{$src}"
includes="config/cocoon-xconf/*.xconf, config/cocoon-xconf/*/*.xconf"
Modified: lenya/trunk/src/targets/modules-build.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/targets/modules-build.xml?rev=416406&r1=416405&r2=416406&view=diff
==============================================================================
--- lenya/trunk/src/targets/modules-build.xml (original)
+++ lenya/trunk/src/targets/modules-build.xml Thu Jun 22 09:02:35 2006
@@ -27,14 +27,19 @@
<property name="build.modules" value="${build.webapp}/lenya/modules"/>
- <target name="deploy-modules" depends="init-tasks">
+ <target name="deploy-modules" depends="init-tasks">
+
+ <property name="cocoon.xconf" value="${build.webapp}/WEB-INF/cocoon.xconf"/>
+
<generateModuleList
moduleDirs="${modules.root.dirs}"
moduleFile="${build.dir}/temp/modules.xml"/>
<xslt
in="${build.dir}/temp/modules.xml"
out="${build.dir}/temp/modules-build.xml"
- style="${src.resource.dir}/build/modules2build.xsl"/>
+ style="${src.resource.dir}/build/modules2build.xsl">
+ <param name="cocoon-xconf" expression="${cocoon.xconf}"/>
+ </xslt>
<ant antfile="${build.dir}/temp/modules-build.xml"
inheritall="true"
Modified: lenya/trunk/src/targets/test-build.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/targets/test-build.xml?rev=416406&r1=416405&r2=416406&view=diff
==============================================================================
--- lenya/trunk/src/targets/test-build.xml (original)
+++ lenya/trunk/src/targets/test-build.xml Thu Jun 22 09:02:35 2006
@@ -135,6 +135,10 @@
includes="**/*.xconf"
excludes="prepare/*.xconf"
addComments="true"/>
+
+ <antcall target="deploy-modules">
+ <param name="cocoon.xconf" value="${build.temp}/test/xconf-template.xml"/>
+ </antcall>
<xslt in="${build.temp}/test/xconf-template.xml"
out="${build.temp}/test/components.xsl"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org