You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by jo...@apache.org on 2006/12/17 21:16:42 UTC
svn commit: r488038 - in /cocoon: branches/BRANCH_2_1_X/
trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/COB-INF/
trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/
Author: joerg
Date: Sun Dec 17 12:16:41 2006
New Revision: 488038
URL: http://svn.apache.org/viewvc?view=rev&rev=488038
Log:
redeclaring the generator type="jx" to new template block for mounted blocks
Modified:
cocoon/branches/BRANCH_2_1_X/blocks.properties
cocoon/branches/BRANCH_2_1_X/gump.xml
cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/COB-INF/sitemap.xmap
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sitemap.xmap
Modified: cocoon/branches/BRANCH_2_1_X/blocks.properties
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/blocks.properties?view=diff&rev=488038&r1=488037&r2=488038
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/blocks.properties (original)
+++ cocoon/branches/BRANCH_2_1_X/blocks.properties Sun Dec 17 12:16:41 2006
@@ -87,7 +87,7 @@
#-----[dependency]: "fop" depends on "batik", "xsp" (for samples).
#-----[dependency]: "fop" is needed by "tour".
#include.block.fop=false
-#-----[dependency]: "forms" depends on "ajax".
+#-----[dependency]: "forms" depends on "ajax", "template" (for samples).
#-----[dependency]: "forms" is needed by "apples", "javaflow", "ojb", "petstore", "portal", "querybean", "tour".
#include.block.forms=false
#-----[dependency]: "hsqldb" depends on "databases".
@@ -112,7 +112,7 @@
#-----[dependency]: "portal" depends on "auth", "authentication-fw", "cron", "forms", "ojb", "session-fw".
#-----[dependency]: "portal" is needed by "faces".
#include.block.portal=false
-#-----[dependency] "profiler" depends on "auth".
+#-----[dependency]: "profiler" depends on "auth".
#include.block.profiler=false
#-----[dependency]: "python" depends on "xsp".
#include.block.python=false
@@ -151,6 +151,7 @@
# its development as things might change over time before they are marked
# stable.
+#-----[dependency]: "ajax" depends on "template" (for samples).
#-----[dependency]: "ajax" is needed by "forms".
#include.block.ajax=false
#-----[dependency]: "apples" depends on "forms" (for samples).
@@ -161,6 +162,7 @@
#include.block.auth=false
#-----[dependency]: "axis" depends on "xsp" (for samples).
#include.block.axis=false
+#-----[dependency]: "captcha" depends on "template" (for samples).
#include.block.captcha=false
#-----[dependency]: "cron" is needed by "jms", "portal".
#include.block.cron=false
@@ -197,6 +199,7 @@
#include.block.stx=false
#-----[dependency]: "taglib" is needed by "faces".
#include.block.taglib=false
+#-----[dependency]: "template" is needed by "ajax", "captcha", "forms".
#include.block.template=false
#-----[dependency]: "tour" depends on "batik", "fop", "forms", "slop".
#include.block.tour=false
Modified: cocoon/branches/BRANCH_2_1_X/gump.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/gump.xml?view=diff&rev=488038&r1=488037&r2=488038
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/gump.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/gump.xml Sun Dec 17 12:16:41 2006
@@ -966,6 +966,7 @@
<depend project="cocoon" inherit="all"/>
<depend project="cocoon-block-ajax"/>
+ <depend project="cocoon-block-template" type="samples"/>
<depend project="xreporter-expression"/>
<depend project="jakarta-oro"/>
<depend project="nekohtml"/>
@@ -1661,6 +1662,7 @@
</ant>
<depend project="cocoon" inherit="all"/>
+ <depend project="cocoon-block-template" type="samples"/>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -1681,11 +1683,11 @@
</ant>
<depend project="cocoon" inherit="all"/>
+ <depend project="cocoon-block-template" type="samples"/>
<depend project="dojo-rsrc"/>
<library name="dojo-rsrc"/>
- <work nested="build/cocoon-@@DATE@@/blocks/forms/ajax"/>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -1706,7 +1708,6 @@
<depend project="cocoon" inherit="all"/>
- <work nested="build/cocoon-@@DATE@@/blocks/forms/imageop"/>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
Modified: cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=488038&r1=488037&r2=488038
==============================================================================
--- cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/COB-INF/sitemap.xmap Sun Dec 17 12:16:41 2006
@@ -23,6 +23,13 @@
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+ <map:components>
+ <map:generators default="file">
+ <!-- use the new implementation of JX -->
+ <map:generator name="jx" src="org.apache.cocoon.template.JXTemplateGenerator"/>
+ </map:generators>
+ </map:components>
+
<map:flow language="javascript">
<map:script src="captcha.js"/>
</map:flow>
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=488038&r1=488037&r2=488038
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sitemap.xmap Sun Dec 17 12:16:41 2006
@@ -20,6 +20,8 @@
<map:components>
<map:generators default="file">
+ <!-- use the new implementation of JX -->
+ <map:generator name="jx" src="org.apache.cocoon.template.JXTemplateGenerator"/>
<map:generator name="suggestion-list" src="org.apache.cocoon.forms.generation.SuggestionListGenerator"/>
</map:generators>