You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by br...@apache.org on 2006/03/11 12:09:18 UTC
svn commit: r385058 - in /cocoon/branches/BRANCH_2_1_X: ./
src/blocks/template/ src/blocks/template/conf/
Author: bruno
Date: Sat Mar 11 03:09:14 2006
New Revision: 385058
URL: http://svn.apache.org/viewcvs?rev=385058&view=rev
Log:
Sharing template block with 2.1: step 6: adding the block in Cocoon 2.1 (2.1-specific conf patches, svn external link for java sources, gump.xml change)
Added:
cocoon/branches/BRANCH_2_1_X/src/blocks/template/ (with props)
cocoon/branches/BRANCH_2_1_X/src/blocks/template/conf/
cocoon/branches/BRANCH_2_1_X/src/blocks/template/conf/accessor.xroles
cocoon/branches/BRANCH_2_1_X/src/blocks/template/conf/cocoon-template-expression.xconf (with props)
cocoon/branches/BRANCH_2_1_X/src/blocks/template/conf/cocoon-template.xconf (with props)
cocoon/branches/BRANCH_2_1_X/src/blocks/template/conf/cocoon-template.xmap (with props)
cocoon/branches/BRANCH_2_1_X/src/blocks/template/conf/expression.xroles
Modified:
cocoon/branches/BRANCH_2_1_X/blocks.properties
cocoon/branches/BRANCH_2_1_X/gump.xml
Modified: cocoon/branches/BRANCH_2_1_X/blocks.properties
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/blocks.properties?rev=385058&r1=385057&r2=385058&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/blocks.properties (original)
+++ cocoon/branches/BRANCH_2_1_X/blocks.properties Sat Mar 11 03:09:14 2006
@@ -192,6 +192,7 @@
#include.block.stx=false
#-----[dependency]: "taglib" is needed by "faces".
#include.block.taglib=false
+#include.block.template=false
#-----[dependency]: "tour" depends on "batik", "fop", "forms", "slop".
#include.block.tour=false
#include.block.validation=false
Modified: cocoon/branches/BRANCH_2_1_X/gump.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/gump.xml?rev=385058&r1=385057&r2=385058&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/gump.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/gump.xml Sat Mar 11 03:09:14 2006
@@ -1687,6 +1687,27 @@
<nag from="Gump <general@gump.apache.org>" to="dev@cocoon.apache.org"/>
</project>
+
+ <project name="cocoon-block-template" status="unstable" dir="src/blocks/template">
+ <package>org.apache.cocoon</package>
+
+ <description>Template block from Cocoon 2.2 (new JXTemplate implementation)</description>
+
+ <ant target="gump-block">
+ <property name="block-name" value="validation"/>
+ <property name="version" value="@@DATE@@"/>
+ </ant>
+
+ <depend project="cocoon" inherit="all"/>
+
+ <work nested="tools/anttasks"/>
+ <home nested="build/cocoon-@@DATE@@"/>
+
+ <jar name="blocks/template-block.jar"/>
+
+ <nag from="Gump <general@gump.apache.org>" to="dev@cocoon.apache.org"/>
+ </project>
+
<!--
********************************************
******** COCOON SUPPLIED PROJECTS ********
Propchange: cocoon/branches/BRANCH_2_1_X/src/blocks/template/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Sat Mar 11 03:09:14 2006
@@ -0,0 +1 @@
+java https://svn.apache.org/repos/asf/cocoon/trunk/cocoon-template/cocoon-template-impl/src/main/java
Added: cocoon/branches/BRANCH_2_1_X/src/blocks/template/conf/accessor.xroles
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/template/conf/accessor.xroles?rev=385058&view=auto
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/template/conf/accessor.xroles (added)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/template/conf/accessor.xroles Sat Mar 11 03:09:14 2006
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Id$ -->
+<xroles xpath="/role-list" unless="/role-list[@cocoon-version != '2.1']|role[@name='org.apache.cocoon.components.accessor.AccessorSelector']">
+ <role name="org.apache.cocoon.components.accessor.AccessorSelector"
+ shorthand="accessors"
+ default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+</xroles>
Added: cocoon/branches/BRANCH_2_1_X/src/blocks/template/conf/cocoon-template-expression.xconf
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/template/conf/cocoon-template-expression.xconf?rev=385058&view=auto
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/template/conf/cocoon-template-expression.xconf (added)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/template/conf/cocoon-template-expression.xconf Sat Mar 11 03:09:14 2006
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!--
+ Copyright 1999-2005 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!--+
+ |
+ | SVN $Id$
+ +-->
+<xconf xpath="/cocoon" unless="@version != '2.1' or expression-factory">
+ <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>
+</xconf>
Propchange: cocoon/branches/BRANCH_2_1_X/src/blocks/template/conf/cocoon-template-expression.xconf
------------------------------------------------------------------------------
svn:eol-style = native
Added: cocoon/branches/BRANCH_2_1_X/src/blocks/template/conf/cocoon-template.xconf
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/template/conf/cocoon-template.xconf?rev=385058&view=auto
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/template/conf/cocoon-template.xconf (added)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/template/conf/cocoon-template.xconf Sat Mar 11 03:09:14 2006
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!--
+ Copyright 1999-2005 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- SVN $Id$ -->
+<xconf xpath="/cocoon" unless="@version != '2.1' or component[@role='org.apache.cocoon.template.script.ScriptManager']">
+ <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.AbstractStringTemplateParser" class="org.apache.cocoon.template.expression.JXTGStringTemplateParser"/>
+</xconf>
Propchange: cocoon/branches/BRANCH_2_1_X/src/blocks/template/conf/cocoon-template.xconf
------------------------------------------------------------------------------
svn:eol-style = native
Added: cocoon/branches/BRANCH_2_1_X/src/blocks/template/conf/cocoon-template.xmap
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/template/conf/cocoon-template.xmap?rev=385058&view=auto
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/template/conf/cocoon-template.xmap (added)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/template/conf/cocoon-template.xmap Sat Mar 11 03:09:14 2006
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<xmap xmlns:map="http://apache.org/cocoon/sitemap/1.0"
+ xpath="/sitemap/components/generators" unless="generator[@name='newjx']">
+ <map:generator name="newjx" src="org.apache.cocoon.template.JXTemplateGenerator"
+ logger="sitemap.generator.jx" label="content" pool-max="16">
+ </map:generator>
+
+</xmap>
Propchange: cocoon/branches/BRANCH_2_1_X/src/blocks/template/conf/cocoon-template.xmap
------------------------------------------------------------------------------
svn:eol-style = native
Added: cocoon/branches/BRANCH_2_1_X/src/blocks/template/conf/expression.xroles
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/template/conf/expression.xroles?rev=385058&view=auto
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/template/conf/expression.xroles (added)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/template/conf/expression.xroles Sat Mar 11 03:09:14 2006
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Id$ -->
+<xroles xpath="/role-list" unless="/role-list[@cocoon-version != '2.1']|role[@name='org.apache.cocoon.components.expression.ExpressionCompilerSelector']">
+
+ <role name="org.apache.cocoon.components.expression.ExpressionCompilerSelector"
+ shorthand="expression-compilers"
+ default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+ <role name="org.apache.cocoon.components.expression.ExpressionFactory"
+ shorthand="expression-factory"
+ default-class="org.apache.cocoon.components.expression.DefaultExpressionFactory"/>
+ <!-- TODO move it somewhere else! -->
+ <role name="org.apache.cocoon.template.expression.StringTemplateParserSelector"
+ shorthand="string-template-parsers"
+ default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+
+</xroles>
+