Author: crossley
Date: Thu Dec 8 20:42:37 2005
New Revision: 355366
URL: http://svn.apache.org/viewcvs?rev=355366&view=rev
Log:
Upgrade Cocoon to r351990 2005-12-08
Added:
forrest/trunk/lib/core/commons-jci-r306555.jar (with props)
forrest/trunk/lib/core/commons-jci-r306555.jar.license.txt
- copied unchanged from r355027,
forrest/trunk/lib/core/commons-jci-r159148.jar.license.txt
forrest/trunk/lib/core/commons-jxpath-1.2-r329470.jar (with props)
forrest/trunk/lib/core/rhino-1.6R2.jar (with props)
forrest/trunk/lib/core/rhino-1.6R2.jar.license.txt
- copied unchanged from r355027,
forrest/trunk/lib/core/rhino-1.6R1.jar.license.txt
Removed:
forrest/trunk/lib/core/commons-jci-r159148.jar
forrest/trunk/lib/core/commons-jci-r159148.jar.license.txt
forrest/trunk/lib/core/commons-jxpath-1.2.jar
forrest/trunk/lib/core/rhino-1.6R1.jar
forrest/trunk/lib/core/rhino-1.6R1.jar.license.txt
Modified:
forrest/trunk/lib/core/cocoon-2.2.0-dev.jar
forrest/trunk/lib/core/cocoon-asciiart-block-2.2.0-dev.jar
forrest/trunk/lib/core/cocoon-batik-block-2.2.0-dev.jar
forrest/trunk/lib/core/cocoon-chaperon-block-2.2.0-dev.jar
forrest/trunk/lib/core/cocoon-fop-block-2.2.0-dev.jar
forrest/trunk/lib/core/cocoon-html-block-2.2.0-dev.jar
forrest/trunk/lib/core/cocoon-linkrewriter-block-2.2.0-dev.jar
forrest/trunk/lib/core/cocoon-lucene-block-2.2.0-dev.jar
forrest/trunk/lib/core/cocoon-profiler-block-2.2.0-dev.jar
forrest/trunk/lib/core/cocoon-template-block-2.2.0-dev.jar
forrest/trunk/lib/core/cocoon-validation-block-2.2.0-dev.jar
forrest/trunk/lib/core/cocoon-xsp-block-2.2.0-dev.jar
forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf
Modified: forrest/trunk/lib/core/cocoon-2.2.0-dev.jar
URL:
http://svn.apache.org/viewcvs/forrest/trunk/lib/core/cocoon-2.2.0-dev.jar?rev=355366&r1=355365&r2=355366&view=diff
==============================================================================
Binary files - no diff available.
Modified: forrest/trunk/lib/core/cocoon-asciiart-block-2.2.0-dev.jar
URL:
http://svn.apache.org/viewcvs/forrest/trunk/lib/core/cocoon-asciiart-block-2.2.0-dev.jar?rev=355366&r1=355365&r2=355366&view=diff
==============================================================================
Binary files - no diff available.
Modified: forrest/trunk/lib/core/cocoon-batik-block-2.2.0-dev.jar
URL:
http://svn.apache.org/viewcvs/forrest/trunk/lib/core/cocoon-batik-block-2.2.0-dev.jar?rev=355366&r1=355365&r2=355366&view=diff
==============================================================================
Binary files - no diff available.
Modified: forrest/trunk/lib/core/cocoon-chaperon-block-2.2.0-dev.jar
URL:
http://svn.apache.org/viewcvs/forrest/trunk/lib/core/cocoon-chaperon-block-2.2.0-dev.jar?rev=355366&r1=355365&r2=355366&view=diff
==============================================================================
Binary files - no diff available.
Modified: forrest/trunk/lib/core/cocoon-fop-block-2.2.0-dev.jar
URL:
http://svn.apache.org/viewcvs/forrest/trunk/lib/core/cocoon-fop-block-2.2.0-dev.jar?rev=355366&r1=355365&r2=355366&view=diff
==============================================================================
Binary files - no diff available.
Modified: forrest/trunk/lib/core/cocoon-html-block-2.2.0-dev.jar
URL:
http://svn.apache.org/viewcvs/forrest/trunk/lib/core/cocoon-html-block-2.2.0-dev.jar?rev=355366&r1=355365&r2=355366&view=diff
==============================================================================
Binary files - no diff available.
Modified: forrest/trunk/lib/core/cocoon-linkrewriter-block-2.2.0-dev.jar
URL:
http://svn.apache.org/viewcvs/forrest/trunk/lib/core/cocoon-linkrewriter-block-2.2.0-dev.jar?rev=355366&r1=355365&r2=355366&view=diff
==============================================================================
Binary files - no diff available.
Modified: forrest/trunk/lib/core/cocoon-lucene-block-2.2.0-dev.jar
URL:
http://svn.apache.org/viewcvs/forrest/trunk/lib/core/cocoon-lucene-block-2.2.0-dev.jar?rev=355366&r1=355365&r2=355366&view=diff
==============================================================================
Binary files - no diff available.
Modified: forrest/trunk/lib/core/cocoon-profiler-block-2.2.0-dev.jar
URL:
http://svn.apache.org/viewcvs/forrest/trunk/lib/core/cocoon-profiler-block-2.2.0-dev.jar?rev=355366&r1=355365&r2=355366&view=diff
==============================================================================
Binary files - no diff available.
Modified: forrest/trunk/lib/core/cocoon-template-block-2.2.0-dev.jar
URL:
http://svn.apache.org/viewcvs/forrest/trunk/lib/core/cocoon-template-block-2.2.0-dev.jar?rev=355366&r1=355365&r2=355366&view=diff
==============================================================================
Binary files - no diff available.
Modified: forrest/trunk/lib/core/cocoon-validation-block-2.2.0-dev.jar
URL:
http://svn.apache.org/viewcvs/forrest/trunk/lib/core/cocoon-validation-block-2.2.0-dev.jar?rev=355366&r1=355365&r2=355366&view=diff
==============================================================================
Binary files - no diff available.
Modified: forrest/trunk/lib/core/cocoon-xsp-block-2.2.0-dev.jar
URL:
http://svn.apache.org/viewcvs/forrest/trunk/lib/core/cocoon-xsp-block-2.2.0-dev.jar?rev=355366&r1=355365&r2=355366&view=diff
==============================================================================
Binary files - no diff available.
Added: forrest/trunk/lib/core/commons-jci-r306555.jar
URL:
http://svn.apache.org/viewcvs/forrest/trunk/lib/core/commons-jci-r306555.jar?rev=355366&view=auto
==============================================================================
Binary file - no diff available.
Propchange: forrest/trunk/lib/core/commons-jci-r306555.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: forrest/trunk/lib/core/commons-jxpath-1.2-r329470.jar
URL:
http://svn.apache.org/viewcvs/forrest/trunk/lib/core/commons-jxpath-1.2-r329470.jar?rev=355366&view=auto
==============================================================================
Binary file - no diff available.
Propchange: forrest/trunk/lib/core/commons-jxpath-1.2-r329470.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: forrest/trunk/lib/core/rhino-1.6R2.jar
URL:
http://svn.apache.org/viewcvs/forrest/trunk/lib/core/rhino-1.6R2.jar?rev=355366&view=auto
==============================================================================
Binary file - no diff available.
Propchange: forrest/trunk/lib/core/rhino-1.6R2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf
URL:
http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf?rev=355366&r1=355365&r2=355366&view=diff
==============================================================================
--- forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf (original)
+++ forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf Thu Dec 8
20:42:37 2005
@@ -40,7 +40,7 @@
+-->
<component role="org.apache.cocoon.template.script.ScriptManager"
class="org.apache.cocoon.template.script.DefaultScriptManager"/>
<component role="org.apache.cocoon.template.script.InstructionFactory"
class="org.apache.cocoon.template.script.DefaultInstructionFactory"/>
- <component
role="org.apache.cocoon.template.expression.JXTExpressionCompiler"
class="org.apache.cocoon.template.expression.DefaultJXTExpressionCompiler"/>
+ <component
role="org.apache.cocoon.template.expression.StringTemplateParser"
class="org.apache.cocoon.template.expression.JXTGStringTemplateParser"/>
<!-- Include roles -->
<include
src="resource://org/apache/cocoon/components/expression/expression.roles"/>
@@ -52,6 +52,10 @@
<component-instance
class="org.apache.cocoon.components.expression.jexl.JexlCompiler" name="jexl"/>
<component-instance
class="org.apache.cocoon.components.expression.jxpath.JXPathCompiler"
name="jxpath"/>
</expression-compilers>
+ <string-template-parsers>
+ <component-instance
class="org.apache.cocoon.template.expression.JXTGStringTemplateParser"
name="jxtg"/>
+ <component-instance
class="org.apache.cocoon.template.expression.DefaultStringTemplateParser"
name="default"/>
+ </string-template-parsers>
<!--+
| cocoon-template and cocoon-template-expression block
| config - end
