forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r688031 - /forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/xconf/forrest-core.xconf
Date Fri, 22 Aug 2008 09:13:43 GMT
Author: crossley
Date: Fri Aug 22 02:13:42 2008
New Revision: 688031

URL: http://svn.apache.org/viewvc?rev=688031&view=rev
Log:
Only formatting changes. Move "Template Block" section down to its block order to enable comparison
with Cocoon-2.1 xconf.

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=688031&r1=688030&r2=688031&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:13:42 2008
@@ -39,32 +39,6 @@
     |  (stuff like XML parsers or XSLT processors).
     +-->
 
-<!--+
-    | 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"/>
-
-  <expression-factory/>
-  <expression-compilers>
-    <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"/>
-  </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
-    +-->
 <!-- =========================== Sitemap =============================== -->
 
   <!--+
@@ -1062,6 +1036,34 @@
   logger="debug"/>
 -->
 
+<!-- ========== 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"/>
+
+  <expression-factory/>
+  <expression-compilers>
+    <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"/>
+  </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
+    +-->
+
 <!-- ========== Components used for xml validation ========== -->
  <include src="resource://org/apache/cocoon/components/validation/validation.roles"/>
   <!--+



Mime
View raw message