svn commit: r533784 - in /lenya/trunk/src: cocoon/local.build.properties targets/init-build.xml

[an...@apache.org]

Author: andreas
Date: Mon Apr 30 09:03:37 2007
New Revision: 533784

URL: http://svn.apache.org/viewvc?view=rev&rev=533784
Log:
Disable cocoon.reload parameter in local.build.properties (fixes bug 37631, thanks to Joern Nettingsmeier and Josias Thoeny), updated note about version check.

Modified:
    lenya/trunk/src/cocoon/local.build.properties
    lenya/trunk/src/targets/init-build.xml

Modified: lenya/trunk/src/cocoon/local.build.properties
URL: http://svn.apache.org/viewvc/lenya/trunk/src/cocoon/local.build.properties?view=diff&rev=533784&r1=533783&r2=533784
==============================================================================
--- lenya/trunk/src/cocoon/local.build.properties (original)
+++ lenya/trunk/src/cocoon/local.build.properties Mon Apr 30 09:03:37 2007
@@ -16,10 +16,11 @@
 
 #------------------------------------------------------------------------------------
 # Build properties version to make sure that local.build.properties is kept in sync
-# NOTE: Version check is not implemented yet!
 # NOTE: Do NOT modify this number unless you are a Dev and want to modify this file
+# NOTE for Devs: Update this number if this file is being updated.
+#                Also update the version number within src/targets/init-build.xml
 
-lenya.build.properties.version=386155
+lenya.build.properties.version=529161
 lenya.version=1.4-dev
 
 #----------------------------------------------
@@ -50,7 +51,7 @@
 #include.driver.oracle=true
 #include.driver.postgre=true
 #include.driver.odbc=true
-#config.allow-reloads=true
+config.allow-reloads=false
 
 # TODO: Since externals/cocoon_2_1_x/src/webapp/WEB-INF/web.xml is true already this won't help ...
 config.enable-uploads=false

Modified: lenya/trunk/src/targets/init-build.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/targets/init-build.xml?view=diff&rev=533784&r1=533783&r2=533784
==============================================================================
--- lenya/trunk/src/targets/init-build.xml (original)
+++ lenya/trunk/src/targets/init-build.xml Mon Apr 30 09:03:37 2007
@@ -86,7 +86,7 @@
   <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"/>
+      <equals arg1="${lenya.build.properties.version}" arg2="529161"/>
     </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-all' and rebuild Lenya."/>
   </target>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org