Return-Path: 
 <svn-return-7773-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 72834 invoked from network); 22 Aug 2008 09:28:50 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 22 Aug 2008 09:28:50 -0000
Received: (qmail 85773 invoked by uid 500); 22 Aug 2008 09:28:48 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 85725 invoked by uid 500); 22 Aug 2008 09:28:48 -0000
Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:svn-help@forrest.apache.org>
list-unsubscribe: <mailto:svn-unsubscribe@forrest.apache.org>
List-Post: <mailto:svn@forrest.apache.org>
Reply-To: "Forrest Developers List" <dev@forrest.apache.org>
List-Id: <svn.forrest.apache.org>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 85716 invoked by uid 99); 22 Aug 2008 09:28:48 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Aug 2008 02:28:48 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Aug 2008 09:27:59 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 638662388A01; Fri, 22 Aug 2008 02:27:59 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r688037 -
 /forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/xconf/forrest-core.xconf
Date: Fri, 22 Aug 2008 09:27:58 -0000
To: svn@forrest.apache.org
From: crossley@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080822092759.638662388A01@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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.
       |