lenya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rfrov...@apache.org
Subject svn commit: r687135 - in /lenya/tags/RELEASE_2_0_2: build.bat build.properties build.sh externals/ src/cocoon/local.build.properties src/modules/neutron/xslt/introspection.xsl tools/proxytest/jetty6.xml
Date Tue, 19 Aug 2008 19:18:49 GMT
Author: rfrovarp
Date: Tue Aug 19 12:18:48 2008
New Revision: 687135

URL: http://svn.apache.org/viewvc?rev=687135&view=rev
Log:
Revert back to development version of cocoon

Modified:
    lenya/tags/RELEASE_2_0_2/build.bat
    lenya/tags/RELEASE_2_0_2/build.properties
    lenya/tags/RELEASE_2_0_2/build.sh
    lenya/tags/RELEASE_2_0_2/externals/   (props changed)
    lenya/tags/RELEASE_2_0_2/src/cocoon/local.build.properties
    lenya/tags/RELEASE_2_0_2/src/modules/neutron/xslt/introspection.xsl
    lenya/tags/RELEASE_2_0_2/tools/proxytest/jetty6.xml

Modified: lenya/tags/RELEASE_2_0_2/build.bat
URL: http://svn.apache.org/viewvc/lenya/tags/RELEASE_2_0_2/build.bat?rev=687135&r1=687134&r2=687135&view=diff
==============================================================================
--- lenya/tags/RELEASE_2_0_2/build.bat (original)
+++ lenya/tags/RELEASE_2_0_2/build.bat Tue Aug 19 12:18:48 2008
@@ -21,7 +21,7 @@
 rem ----------------------------------------------------------------------------
 
 
-set COCOON_HOME=externals\cocoon_2_1_11
+set COCOON_HOME=externals\cocoon_2_1_x
 set COCOON_ENDORSED_DIR=%COCOON_HOME%\lib\endorsed
 
 rem ----- Ignore system CLASSPATH variable

Modified: lenya/tags/RELEASE_2_0_2/build.properties
URL: http://svn.apache.org/viewvc/lenya/tags/RELEASE_2_0_2/build.properties?rev=687135&r1=687134&r2=687135&view=diff
==============================================================================
--- lenya/tags/RELEASE_2_0_2/build.properties (original)
+++ lenya/tags/RELEASE_2_0_2/build.properties Tue Aug 19 12:18:48 2008
@@ -41,7 +41,7 @@
 #------------------------------------------------------------------------------------
 # The root of the Cocoon source tree
 
-cocoon.src.dir=externals/cocoon_2_1_11
+cocoon.src.dir=externals/cocoon_2_1_x
 #cocoon.src.dir=../../cocoon/branches/BRANCH_2_1_X
 
 

Modified: lenya/tags/RELEASE_2_0_2/build.sh
URL: http://svn.apache.org/viewvc/lenya/tags/RELEASE_2_0_2/build.sh?rev=687135&r1=687134&r2=687135&view=diff
==============================================================================
--- lenya/tags/RELEASE_2_0_2/build.sh (original)
+++ lenya/tags/RELEASE_2_0_2/build.sh Tue Aug 19 12:18:48 2008
@@ -30,7 +30,7 @@
 OLD_CLASSPATH="$CLASSPATH"
 unset CLASSPATH
 CLASSPATH="`echo lib/*.jar | tr ' ' $S`"
-ENDORSED_DIR="externals/cocoon_2_1_11/lib/endorsed"
+ENDORSED_DIR="externals/cocoon_2_1_x/lib/endorsed"
 # Add cocoon endorsed libs
 CLASSPATH="$CLASSPATH `echo $ENDORSED_DIR/*.jar | tr ' ' $S`"
 export CLASSPATH

Propchange: lenya/tags/RELEASE_2_0_2/externals/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Tue Aug 19 12:18:48 2008
@@ -1 +1 @@
-cocoon_2_1_11 https://svn.apache.org/repos/asf/cocoon/tags/cocoon-2.1/RELEASE_2_1_11
+cocoon_2_1_x -r 687094 https://svn.apache.org/repos/asf/cocoon/branches/BRANCH_2_1_X

Modified: lenya/tags/RELEASE_2_0_2/src/cocoon/local.build.properties
URL: http://svn.apache.org/viewvc/lenya/tags/RELEASE_2_0_2/src/cocoon/local.build.properties?rev=687135&r1=687134&r2=687135&view=diff
==============================================================================
--- lenya/tags/RELEASE_2_0_2/src/cocoon/local.build.properties (original)
+++ lenya/tags/RELEASE_2_0_2/src/cocoon/local.build.properties Tue Aug 19 12:18:48 2008
@@ -53,7 +53,7 @@
 #include.driver.odbc=true
 config.allow-reloads=false
 
-# TODO: Since externals/cocoon_2_1_11/src/webapp/WEB-INF/web.xml is true already this won't
help ...
+# TODO: Since externals/cocoon_2_1_x/src/webapp/WEB-INF/web.xml is true already this won't
help ...
 config.enable-uploads=false
 #config.enable-instrumentation=true
 

Modified: lenya/tags/RELEASE_2_0_2/src/modules/neutron/xslt/introspection.xsl
URL: http://svn.apache.org/viewvc/lenya/tags/RELEASE_2_0_2/src/modules/neutron/xslt/introspection.xsl?rev=687135&r1=687134&r2=687135&view=diff
==============================================================================
--- lenya/tags/RELEASE_2_0_2/src/modules/neutron/xslt/introspection.xsl (original)
+++ lenya/tags/RELEASE_2_0_2/src/modules/neutron/xslt/introspection.xsl Tue Aug 19 12:18:48
2008
@@ -36,7 +36,7 @@
     TODO: In order to get the WYSIWYG view one needs to change the mime-type
     to xhtml+xml, but somehow this causes problems re saving ...
     See missing mime-type within
-    cocoon_2_1_11/src/java/org/apache/cocoon/generation/StreamGenerator.java
+    cocoon_2_1_x/src/java/org/apache/cocoon/generation/StreamGenerator.java
     -->
     <edit mime-type="application/xhtml+xml" name="Body Content">
 

Modified: lenya/tags/RELEASE_2_0_2/tools/proxytest/jetty6.xml
URL: http://svn.apache.org/viewvc/lenya/tags/RELEASE_2_0_2/tools/proxytest/jetty6.xml?rev=687135&r1=687134&r2=687135&view=diff
==============================================================================
--- lenya/tags/RELEASE_2_0_2/tools/proxytest/jetty6.xml (original)
+++ lenya/tags/RELEASE_2_0_2/tools/proxytest/jetty6.xml Tue Aug 19 12:18:48 2008
@@ -18,7 +18,7 @@
   Now you can start Lenya using Jetty 6.1 from the command line as follows:
   
   $LENYA_HOME:> cd tools/jetty-6.1.6 
-  $LENYA_HOME:> java -Djava.endorsed.dirs="../../externals/cocoon_2_1_11/lib/endorsed/"
\
+  $LENYA_HOME:> java -Djava.endorsed.dirs="../../externals/cocoon_2_1_x/lib/endorsed/"
\
                      -jar start.jar ../proxytest/jetty6.xml
   
   The Lenya webapp is now available at http://localhost:8888/webapp/.



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


Mime
View raw message