You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by mi...@apache.org on 2006/03/16 00:23:27 UTC
svn commit: r386213 - /lenya/trunk/src/targets/init-build.xml
Author: michi
Date: Wed Mar 15 15:23:26 2006
New Revision: 386213
URL: http://svn.apache.org/viewcvs?rev=386213&view=rev
Log:
check also Cocoon build properties re version
Modified:
lenya/trunk/src/targets/init-build.xml
Modified: lenya/trunk/src/targets/init-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/init-build.xml?rev=386213&r1=386212&r2=386213&view=diff
==============================================================================
--- lenya/trunk/src/targets/init-build.xml (original)
+++ lenya/trunk/src/targets/init-build.xml Wed Mar 15 15:23:26 2006
@@ -42,7 +42,8 @@
<!-- Prepare the build webapp directory -->
<target name="check-cocoon" depends="init" unless="gump.skipcocoonbuild">
<available file="${cocoon.src.dir}/build/webapp" type="dir" property="cocoon.build.webapp.dir.exists"/>
- <antcall target="check-blocks"/>
+ <antcall target="check-blocks-properties"/>
+ <antcall target="check-build-properties"/>
<antcall target="build-cocoon"/>
</target>
@@ -56,7 +57,7 @@
</target>
<!-- Check local.blocks.properties -->
- <target name="check-blocks" if="cocoon.build.webapp.dir.exists">
+ <target name="check-blocks-properties" if="cocoon.build.webapp.dir.exists">
<property file="${cocoon.src.dir}/local.blocks.properties"/>
<condition property="local.blocks.properties.in.sync">
<equals arg1="${lenya.blocks.properties.version}" arg2="374661"/>
@@ -64,6 +65,15 @@
<fail unless="local.blocks.properties.in.sync" message="It seems that your ${cocoon.src.dir}/local.blocks.properties is NOT in sync with ${src.cocoon.properties.dir}/local.blocks.properties! The file ${src.cocoon.properties.dir}/local.blocks.properties has probably been modified by some Apache Lenya developer. Issue a build clean in your Cocoon directory and rebuild Lenya."/>
</target>
+ <!-- Check local.build.properties -->
+ <target name="check-build-properties" if="cocoon.build.webapp.dir.exists">
+ <property file="${cocoon.src.dir}/local.build.properties"/>
+ <condition property="local.build.properties.in.sync">
+ <equals arg1="${lenya.build.properties.version}" arg2="386155"/>
+ </condition>
+ <fail unless="local.build.properties.in.sync" message="It seems that your ${cocoon.src.dir}/local.build.properties is NOT in sync with ${src.cocoon.properties.dir}/local.build.properties! The file ${src.cocoon.properties.dir}/local.build.properties has probably been modified by some Apache Lenya developer. Issue a 'build clean' and remove 'local.build.properties' in your Cocoon directory (${cocoon.src.dir}) and rebuild Lenya."/>
+ </target>
+
<!-- Copy the bulk of the cocoon webapp to our destination -->
<target name="prepare-cocoon" depends="check-cocoon" unless="gump.skipcocoonbuild">
<copy todir="${build.webapp}" filtering="off">
@@ -93,6 +103,7 @@
includes="src/confpatch/log4j-*.xconf"/>
<!-- patch web.xml -->
+ <echo>PATCH web.xml</echo>
<xpatch file="${build.webapp}/WEB-INF/web.xml"
includes="src/confpatch/*.xweb"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org
Re: svn commit: r386213 - /lenya/trunk/src/targets/init-build.xml
Posted by Michael Wechner <mi...@wyona.com>.
Oliver Schalch wrote:
>>
>>wdyt?
>>
>>
>
>+1,
>
>One step less, to bring lenya up. And no more manually
>copying those files.
>
>
you don't have to copy them manually
>Now, we know where cocoon is located (externals/cocoon) and
>actually can integrate such a copy task in a build target.
>
>
this is just the default, but it doesn't have to be this way.
Michi
>We can just leave the note, if someone doesen take cocoon from the
>svn:external about copy those files.
>
>
>
>Oliver
>
>---------------------------------------------------------------------
>To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
>For additional commands, e-mail: dev-help@lenya.apache.org
>
>
>
>
--
Michael Wechner
Wyona - Open Source Content Management - Apache Lenya
http://www.wyona.com http://lenya.apache.org
michael.wechner@wyona.com michi@apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org
Re: svn commit: r386213 - /lenya/trunk/src/targets/init-build.xml
Posted by Oliver Schalch <ol...@wyona.com>.
On Thu, 16 Mar 2006 11:06:30 +0100
Thorsten Scherler <th...@wyona.com> wrote:
> El mié, 15-03-2006 a las 23:23 +0000, michi@apache.org escribió:
> > Author: michi
> > Date: Wed Mar 15 15:23:26 2006
> > New Revision: 386213
> >
> > URL: http://svn.apache.org/viewcvs?rev=386213&view=rev
> > Log:
> > check also Cocoon build properties re version
> >
> > Modified:
> > lenya/trunk/src/targets/init-build.xml
> >
> > Modified: lenya/trunk/src/targets/init-build.xml
> > URL:
> > http://svn.apache.org/viewcvs/lenya/trunk/src/targets/init-build.xml?rev=386213&r1=386212&r2=386213&view=diff
> > ==============================================================================
> > --- lenya/trunk/src/targets/init-build.xml (original) +++
> > lenya/trunk/src/targets/init-build.xml Wed Mar 15 15:23:26 2006 @@
> > -42,7 +42,8 @@ <!-- Prepare the build webapp directory -->
> > <target name="check-cocoon" depends="init"
> > unless="gump.skipcocoonbuild"> <available
> > file="${cocoon.src.dir}/build/webapp" type="dir"
> > property="cocoon.build.webapp.dir.exists"/>
> > - <antcall target="check-blocks"/>
> > + <antcall target="check-blocks-properties"/>
> > + <antcall target="check-build-properties"/>
> > <antcall target="build-cocoon"/>
> > </target>
> >
> > @@ -56,7 +57,7 @@
> > </target>
> >
> > <!-- Check local.blocks.properties -->
> > - <target name="check-blocks" if="cocoon.build.webapp.dir.exists">
> > + <target name="check-blocks-properties"
> > if="cocoon.build.webapp.dir.exists"> <property
> > file="${cocoon.src.dir}/local.blocks.properties"/> <condition
> > property="local.blocks.properties.in.sync"> <equals
> > arg1="${lenya.blocks.properties.version}" arg2="374661"/> @@ -64,6
> > +65,15 @@ <fail unless="local.blocks.properties.in.sync"
> > message="It seems that your
> > ${cocoon.src.dir}/local.blocks.properties is NOT in sync with
> > ${src.cocoon.properties.dir}/local.blocks.properties! The file
> > ${src.cocoon.properties.dir}/local.blocks.properties has probably
> > been modified by some Apache Lenya developer. Issue a build clean
> > in your Cocoon directory and rebuild Lenya."/> </target>
> > + <!-- Check local.build.properties -->
> > + <target name="check-build-properties"
> > if="cocoon.build.webapp.dir.exists">
> > + <property file="${cocoon.src.dir}/local.build.properties"/>
> > + <condition property="local.build.properties.in.sync">
> > + <equals arg1="${lenya.build.properties.version}"
> > arg2="386155"/>
> > + </condition>
> > + <fail unless="local.build.properties.in.sync" message="It
> > seems that your ${cocoon.src.dir}/local.build.properties is NOT in
> > sync with ${src.cocoon.properties.dir}/local.build.properties! The
> > file ${src.cocoon.properties.dir}/local.build.properties has
> > probably been modified by some Apache Lenya developer. Issue a
> > 'build clean' and remove 'local.build.properties' in your Cocoon
> > directory (${cocoon.src.dir}) and rebuild Lenya."/>
> > + </target>
> > +
>
> I do not understand this.
>
> I am using external/cocoon and this check does not make sense here. I
> think we should rather do in case of external/cocoon a copy from
> src/cocoon/local.b* to external/cocoon.
>
> That saves the trouble of keeping the files in sync. Otherwise we are
> loosing the benefit of having our "own" cocoon. ;)
>
> wdyt?
+1,
One step less, to bring lenya up. And no more manually
copying those files.
Now, we know where cocoon is located (externals/cocoon) and
actually can integrate such a copy task in a build target.
We can just leave the note, if someone doesen take cocoon from the
svn:external about copy those files.
Oliver
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org
Re: svn commit: r386213 - /lenya/trunk/src/targets/init-build.xml
Posted by Michael Wechner <mi...@wyona.com>.
Thorsten Scherler wrote:
>El mié, 15-03-2006 a las 23:23 +0000, michi@apache.org escribió:
>
>
>>Author: michi
>>Date: Wed Mar 15 15:23:26 2006
>>New Revision: 386213
>>
>>URL: http://svn.apache.org/viewcvs?rev=386213&view=rev
>>Log:
>>check also Cocoon build properties re version
>>
>>Modified:
>> lenya/trunk/src/targets/init-build.xml
>>
>>Modified: lenya/trunk/src/targets/init-build.xml
>>URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/init-build.xml?rev=386213&r1=386212&r2=386213&view=diff
>>==============================================================================
>>--- lenya/trunk/src/targets/init-build.xml (original)
>>+++ lenya/trunk/src/targets/init-build.xml Wed Mar 15 15:23:26 2006
>>@@ -42,7 +42,8 @@
>> <!-- Prepare the build webapp directory -->
>> <target name="check-cocoon" depends="init" unless="gump.skipcocoonbuild">
>> <available file="${cocoon.src.dir}/build/webapp" type="dir" property="cocoon.build.webapp.dir.exists"/>
>>- <antcall target="check-blocks"/>
>>+ <antcall target="check-blocks-properties"/>
>>+ <antcall target="check-build-properties"/>
>> <antcall target="build-cocoon"/>
>> </target>
>>
>>@@ -56,7 +57,7 @@
>> </target>
>>
>> <!-- Check local.blocks.properties -->
>>- <target name="check-blocks" if="cocoon.build.webapp.dir.exists">
>>+ <target name="check-blocks-properties" if="cocoon.build.webapp.dir.exists">
>> <property file="${cocoon.src.dir}/local.blocks.properties"/>
>> <condition property="local.blocks.properties.in.sync">
>> <equals arg1="${lenya.blocks.properties.version}" arg2="374661"/>
>>@@ -64,6 +65,15 @@
>> <fail unless="local.blocks.properties.in.sync" message="It seems that your ${cocoon.src.dir}/local.blocks.properties is NOT in sync with ${src.cocoon.properties.dir}/local.blocks.properties! The file ${src.cocoon.properties.dir}/local.blocks.properties has probably been modified by some Apache Lenya developer. Issue a build clean in your Cocoon directory and rebuild Lenya."/>
>> </target>
>>
>>+ <!-- Check local.build.properties -->
>>+ <target name="check-build-properties" if="cocoon.build.webapp.dir.exists">
>>+ <property file="${cocoon.src.dir}/local.build.properties"/>
>>+ <condition property="local.build.properties.in.sync">
>>+ <equals arg1="${lenya.build.properties.version}" arg2="386155"/>
>>+ </condition>
>>+ <fail unless="local.build.properties.in.sync" message="It seems that your ${cocoon.src.dir}/local.build.properties is NOT in sync with ${src.cocoon.properties.dir}/local.build.properties! The file ${src.cocoon.properties.dir}/local.build.properties has probably been modified by some Apache Lenya developer. Issue a 'build clean' and remove 'local.build.properties' in your Cocoon directory (${cocoon.src.dir}) and rebuild Lenya."/>
>>+ </target>
>>+
>>
>>
>
>I do not understand this.
>
>I am using external/cocoon and this check does not make sense here. I
>think we should rather do in case of external/cocoon a copy from
>src/cocoon/local.b* to external/cocoon.
>
>
if the files have been changed, then it tells you that there is a conflict
and you need to rebuild Cocoon.
Just think about somebody customizing Lenya and needs special Cocoon
local.* files.
If we overwrite them automagically, then you won't be very happy
>That saves the trouble of keeping the files in sync. Otherwise we are
>loosing the benefit of having our "own" cocoon. ;)
>
>
these files hardly ever change and it seems to me that INFORMATION is
very clear
what you need to do in the case of a conflict (re versions).
If it's not clear enough then you might want to clarify it.
Michi
>wdyt?
>
>
>
>>
>>
>>
>salu2
>
>
--
Michael Wechner
Wyona - Open Source Content Management - Apache Lenya
http://www.wyona.com http://lenya.apache.org
michael.wechner@wyona.com michi@apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org
Re: svn commit: r386213 - /lenya/trunk/src/targets/init-build.xml
Posted by Thorsten Scherler <th...@wyona.com>.
El mié, 15-03-2006 a las 23:23 +0000, michi@apache.org escribió:
> Author: michi
> Date: Wed Mar 15 15:23:26 2006
> New Revision: 386213
>
> URL: http://svn.apache.org/viewcvs?rev=386213&view=rev
> Log:
> check also Cocoon build properties re version
>
> Modified:
> lenya/trunk/src/targets/init-build.xml
>
> Modified: lenya/trunk/src/targets/init-build.xml
> URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/init-build.xml?rev=386213&r1=386212&r2=386213&view=diff
> ==============================================================================
> --- lenya/trunk/src/targets/init-build.xml (original)
> +++ lenya/trunk/src/targets/init-build.xml Wed Mar 15 15:23:26 2006
> @@ -42,7 +42,8 @@
> <!-- Prepare the build webapp directory -->
> <target name="check-cocoon" depends="init" unless="gump.skipcocoonbuild">
> <available file="${cocoon.src.dir}/build/webapp" type="dir" property="cocoon.build.webapp.dir.exists"/>
> - <antcall target="check-blocks"/>
> + <antcall target="check-blocks-properties"/>
> + <antcall target="check-build-properties"/>
> <antcall target="build-cocoon"/>
> </target>
>
> @@ -56,7 +57,7 @@
> </target>
>
> <!-- Check local.blocks.properties -->
> - <target name="check-blocks" if="cocoon.build.webapp.dir.exists">
> + <target name="check-blocks-properties" if="cocoon.build.webapp.dir.exists">
> <property file="${cocoon.src.dir}/local.blocks.properties"/>
> <condition property="local.blocks.properties.in.sync">
> <equals arg1="${lenya.blocks.properties.version}" arg2="374661"/>
> @@ -64,6 +65,15 @@
> <fail unless="local.blocks.properties.in.sync" message="It seems that your ${cocoon.src.dir}/local.blocks.properties is NOT in sync with ${src.cocoon.properties.dir}/local.blocks.properties! The file ${src.cocoon.properties.dir}/local.blocks.properties has probably been modified by some Apache Lenya developer. Issue a build clean in your Cocoon directory and rebuild Lenya."/>
> </target>
>
> + <!-- Check local.build.properties -->
> + <target name="check-build-properties" if="cocoon.build.webapp.dir.exists">
> + <property file="${cocoon.src.dir}/local.build.properties"/>
> + <condition property="local.build.properties.in.sync">
> + <equals arg1="${lenya.build.properties.version}" arg2="386155"/>
> + </condition>
> + <fail unless="local.build.properties.in.sync" message="It seems that your ${cocoon.src.dir}/local.build.properties is NOT in sync with ${src.cocoon.properties.dir}/local.build.properties! The file ${src.cocoon.properties.dir}/local.build.properties has probably been modified by some Apache Lenya developer. Issue a 'build clean' and remove 'local.build.properties' in your Cocoon directory (${cocoon.src.dir}) and rebuild Lenya."/>
> + </target>
> +
I do not understand this.
I am using external/cocoon and this check does not make sense here. I
think we should rather do in case of external/cocoon a copy from
src/cocoon/local.b* to external/cocoon.
That saves the trouble of keeping the files in sync. Otherwise we are
loosing the benefit of having our "own" cocoon. ;)
wdyt?
>
salu2
--
Thorsten Scherler
COO Spain
Wyona Inc. - Open Source Content Management - Apache Lenya
http://www.wyona.com http://lenya.apache.org
thorsten.scherler@wyona.com thorsten@apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org