Author: crossley
Date: Fri Aug 22 02:27:57 2008
New Revision: 688037
URL: http://svn.apache.org/viewvc?rev=688037&view=rev
Log:
Synchronise "Template Block" section with Cocoon-2.1 xconf.
Mostly formatting changes, and added JavaScriptCompiler.
Modified:
forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/xconf/forrest-core.xconf
Modified:
forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/xconf/forrest-core.xconf
URL:
http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/xconf/forrest-core.xconf?rev=688037&r1=688036&r2=688037&view=diff
==============================================================================
---
forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/xconf/forrest-core.xconf
(original)
+++
forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/xconf/forrest-core.xconf
Fri Aug 22 02:27:57 2008
@@ -1037,15 +1037,7 @@
-->
<!-- ========== Components used for template ========== -->
-<!--+
- | cocoon-template and cocoon-template-expression block
- | config - start
- +-->
- <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.StringTemplateParser"
class="org.apache.cocoon.template.expression.JXTGStringTemplateParser"/>
- <!-- Include roles -->
<include
src="resource://org/apache/cocoon/components/expression/expression.roles"/>
<include
src="resource://org/apache/cocoon/components/accessor/accessor.roles"/>
@@ -1054,18 +1046,19 @@
<component-instance
class="org.apache.cocoon.components.expression.jxpath.JXPathCompiler"
name="default"/>
<component-instance
class="org.apache.cocoon.components.expression.jexl.JexlCompiler" name="jexl"/>
<component-instance
class="org.apache.cocoon.components.expression.jxpath.JXPathCompiler"
name="jxpath"/>
+ <component-instance
class="org.apache.cocoon.components.expression.javascript.JavaScriptCompiler"
name="js"/>
</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
- +-->
+
+ <component class="org.apache.cocoon.template.script.DefaultScriptManager"
role="org.apache.cocoon.template.script.ScriptManager"/>
+ <component
class="org.apache.cocoon.template.script.DefaultInstructionFactory"
role="org.apache.cocoon.template.script.InstructionFactory"/>
+ <component
class="org.apache.cocoon.template.expression.JXTGStringTemplateParser"
role="org.apache.cocoon.template.expression.StringTemplateParser"/>
<!-- ========== Components used for xml validation ========== -->
- <include
src="resource://org/apache/cocoon/components/validation/validation.roles"/>
+ <include
src="resource://org/apache/cocoon/components/validation/validation.roles"/>
<!--+
| The shared Validator instance in Cocoon.
|
