Author: thorsten
Date: Wed Sep 14 14:09:59 2005
New Revision: 280940

URL: http://svn.apache.org/viewcvs?rev=280940&view=rev
Log:
Readded jxpath-1.2.jar that have been removed -r111170. Readded linkrewriter 
block to make sure that we are using the last version. Activated the template 
block in the forrest-core.xconf

Removed:
    
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/lib/cocoon-template-block.jar
Modified:
    forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf

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=280940&r1=280939&r2=280940&view=diff
==============================================================================
--- forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf (original)
+++ forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf Wed Sep 14 
14:09:59 2005
@@ -34,6 +34,27 @@
     |  (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.JXTExpressionCompiler" 
class="org.apache.cocoon.template.expression.DefaultJXTExpressionCompiler"/>
+
+     <!-- Include roles -->
+  <include 
src="resource://org/apache/cocoon/components/expression/expression.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>
+<!--+
+    | cocoon-template and cocoon-template-expression block
+    | config - end
+    +-->
 <!-- =========================== Sitemap =============================== -->
 
   <!--+