Author: lgawron
Date: Sat Apr 23 13:36:39 2005
New Revision: 164418

URL: http://svn.apache.org/viewcvs?rev=164418&view=rev
Log:
template block goes official
apples samples fixed (used continuation.id instead of $cocoon.continuation.id)
jxtg is now o.a.c.template.jxtg.JXTemplateGenerator
dummy deprecated o.a.c.generation.JXTemplateGenerator introduced to keep 
backward compatibility (same for transformer)
dependencies reflected in gump.xml

Removed:
    cocoon/trunk/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java
    
cocoon/trunk/src/java/org/apache/cocoon/transformation/JXTemplateTransformer.java
Modified:
    cocoon/trunk/blocks.properties
    cocoon/trunk/gump.xml
    
cocoon/trunk/src/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java
    cocoon/trunk/src/webapp/sitemap.xmap

Modified: cocoon/trunk/blocks.properties
URL: 
http://svn.apache.org/viewcvs/cocoon/trunk/blocks.properties?rev=164418&r1=164417&r2=164418&view=diff
==============================================================================
--- cocoon/trunk/blocks.properties (original)
+++ cocoon/trunk/blocks.properties Sat Apr 23 13:36:39 2005
@@ -58,6 +58,7 @@
 #-----[dependency]: "batik" is needed by "fop", "scratchpad", "tour".
 #include.block.batik=false
 #include.block.bsf=false
+#-----[dependency]: "chaperon" depends on "template" (for samples).
 #include.block.chaperon=false
 #-----[dependency]: "databases" is needed by "hsqldb", "jms", "ojb", 
"petstore", "repository", "xmldb", "xsp".
 #include.block.databases=false
@@ -73,6 +74,7 @@
 #include.block.jfor=false
 #include.block.jsp=false
 #include.block.linkrewriter=false
+#-----[dependency]: "lucene" depends on "template" (for samples).
 #-----[dependency]: "lucene" is needed by "querybean".
 #include.block.lucene=false
 #include.block.naming=false
@@ -81,7 +83,7 @@
 #include.block.ojb=false
 #include.block.paranoid=false
 #include.block.poi=false
-#-----[dependency]: "portal" depends on "authentication-fw", "cron", "forms", 
"session-fw".
+#-----[dependency]: "portal" depends on "authentication-fw", "cron", "forms", 
"session-fw", "template" (for samples).
 #-----[dependency]: "portal" is needed by "faces".
 #include.block.portal=false
 #include.block.profiler=false
@@ -114,17 +116,20 @@
 #include.block.asciiart=false
 #-----[dependency]: "axis" is needed by "scratchpad".
 #include.block.axis=false
+#-----[dependency]: "cron" depends on "template" (for samples).
 #-----[dependency]: "cron" is needed by "portal", "scratchpad".
 #include.block.cron=false
 #include.block.deli=false
-#-----[dependency]: "eventcache" depends on "jms".
+#-----[dependency]: "eventcache" depends on "jms", "template" (for samples).
 #-----[dependency]: "eventcache" is needed by "repository".
 #include.block.eventcache=false
 #-----[dependency]: "faces" depends on "portal", "taglib".
 #-----[dependency]: "faces" is needed by "scratchpad".
 #include.block.faces=false
+#-----[dependency]: "forms" depends on "template".
 #-----[dependency]: "forms" is needed by "apples", "ojb", "petstore", 
"portal", "querybean", "tour".
 #include.block.forms=false
+#-----[dependency]: "javaflow" depends on "template" (for samples).
 #-----[dependency]: "javaflow" is needed by "scratchpad".
 #include.block.javaflow=false
 #-----[dependency]: "jms" depends on "databases" (for samples), "hsqldb" (for 
samples).
@@ -133,28 +138,29 @@
 #-----[dependency]: "mail" depends on "asciiart", "scratchpad".
 #include.block.mail=false
 #include.block.midi=false
-#-----[dependency]: "petstore" depends on "databases", "forms", "hsqldb", 
"velocity".
+#-----[dependency]: "petstore" depends on "databases", "forms", "hsqldb", 
"template", "velocity".
 #include.block.petstore=false
 #include.block.proxy=false
 #include.block.qdox=false
-#-----[dependency]: "querybean" depends on "forms" (for samples), "lucene", 
"ojb".
+#-----[dependency]: "querybean" depends on "forms" (for samples), "lucene", 
"ojb", "template" (for samples).
 #include.block.querybean=false
 #-----[dependency]: "repository" depends on "databases" (for samples), 
"eventcache".
 #-----[dependency]: "repository" is needed by "scratchpad", "slide", "webdav".
 #include.block.repository=false
-#-----[dependency]: "scratchpad" depends on "axis" (for samples), "batik" (for 
samples), "cron", "faces" (for samples), "javaflow", "repository", "velocity" 
(for samples), "xsp".
+#-----[dependency]: "scratchpad" depends on "axis" (for samples), "batik" (for 
samples), "cron", "faces" (for samples), "javaflow", "repository", "template" 
(for samples), "velocity" (for samples), "xsp".
 #-----[dependency]: "scratchpad" is needed by "mail".
 #include.block.scratchpad=false
 #include.block.serializers=false
-#-----[dependency]: "slide" depends on "jms", "repository".
+#-----[dependency]: "slide" depends on "jms", "repository", "template" (for 
samples).
 #include.block.slide=false
 #-----[dependency]: "slop" is needed by "tour".
 #include.block.slop=false
 #include.block.stx=false
 #-----[dependency]: "taglib" is needed by "faces".
 #include.block.taglib=false
+#-----[dependency]: "template" is needed by "chaperon", "cron", "eventcache", 
"forms", "javaflow", "lucene", "petstore", "portal", "querybean", "scratchpad", 
"slide", "tour", "webdav".
 #include.block.template=false
-#-----[dependency]: "tour" depends on "batik", "fop", "forms", "slop".
+#-----[dependency]: "tour" depends on "batik", "fop", "forms", "slop", 
"template".
 #include.block.tour=false
-#-----[dependency]: "webdav" depends on "repository".
+#-----[dependency]: "webdav" depends on "repository", "template" (for samples).
 #include.block.webdav=false

Modified: cocoon/trunk/gump.xml
URL: 
http://svn.apache.org/viewcvs/cocoon/trunk/gump.xml?rev=164418&r1=164417&r2=164418&view=diff
==============================================================================
--- cocoon/trunk/gump.xml (original)
+++ cocoon/trunk/gump.xml Sat Apr 23 13:36:39 2005
@@ -165,6 +165,7 @@
     <depend project="cocoon-block-repository"/>
     <depend project="cocoon-block-faces" type="samples"/>
     <depend project="cocoon-block-axis" type="samples"/>
+    <depend project="cocoon-block-template" type="samples"/>
     
     <library name="velocity"/>
     <library name="castor"/>
@@ -215,6 +216,7 @@
     <depend project="cocoon" inherit="all"/>
     <depend project="chaperon"/>
     <depend project="castor"/>
+    <depend project="cocoon-block-template" type="samples"/>
 
     <library name="chaperon"/>
     <library name="castor"/>
@@ -444,6 +446,7 @@
 
     <depend project="cocoon" inherit="all"/>
     <depend project="jakarta-lucene"/>
+    <depend project="cocoon-block-template" type="samples"/>
 
     <library name="lucene"/>
 
@@ -592,6 +595,7 @@
     <depend project="cocoon" inherit="all"/>
     <depend project="cocoon-block-repository"/>
     <depend project="cocoon-block-jms"/>
+    <depend project="cocoon-block-template" type="samples"/>
     <depend project="jta"/>
     <depend project="jakarta-slide"/>
     <depend project="jdom"/>
@@ -791,6 +795,7 @@
     <depend project="daisy-util"/>
     <depend project="daisy-htmlcleaner"/>
     <depend project="icu4j"/>
+    <depend project="cocoon-block-template"/>
 
     <library name="xreporter-expression"/>
     <library name="jakarta-oro"/>
@@ -844,6 +849,7 @@
     <depend project="cocoon-block-authentication-fw"/>
     <depend project="cocoon-block-forms"/>
     <depend project="cocoon-block-cron"/>
+    <depend project="cocoon-block-template" type="samples"/>
     <depend project="jtidy"/>
     <depend project="castor"/>
     <depend project="commons-collections"/>
@@ -876,6 +882,7 @@
     <depend project="cocoon-block-hsqldb"/>
     <depend project="cocoon-block-velocity"/>
     <depend project="cocoon-block-forms"/>
+    <depend project="cocoon-block-template"/>
 
     <work nested="tools/anttasks"/>
     <home nested="build/cocoon-@@DATE@@"/>
@@ -918,6 +925,7 @@
 
     <depend project="cocoon" inherit="all"/>
     <depend project="cocoon-block-repository"/>
+    <depend project="cocoon-block-template" type="samples"/>
     <depend project="jakarta-slide"/>
 
     <library name="commons-httpclient"/>
@@ -944,7 +952,7 @@
     <depend project="cocoon" inherit="all"/>
     <depend project="cocoon-block-jms"/>
     <depend project="jms"/>
-    <depend project="jms"/>
+    <depend project="cocoon-block-template" type="samples"/>
 
     <work nested="build/cocoon-@@DATE@@/blocks/eventcache/dest"/>
     <work nested="build/cocoon-@@DATE@@/blocks/eventcache/test"/>
@@ -985,6 +993,7 @@
 
     <depend project="cocoon" inherit="all"/>
     <depend project="cocoon-block-forms" type="samples"/>
+    <depend project="cocoon-block-template" type="samples"/>
     <depend project="cocoon-block-lucene"/>
     <depend project="cocoon-block-ojb"/>
     <depend project="jakarta-lucene"/>
@@ -1044,6 +1053,7 @@
     <depend project="cocoon" inherit="all"/>
     <depend project="quartz"/>
     <depend project="excalibur-datasource"/>
+    <depend project="cocoon-block-template" type="samples"/>
 
     <library name="quartz"/>
     <library name="excalibur-datasource"/>
@@ -1195,6 +1205,7 @@
     <depend project="commons-jci"/>
     <depend project="commons-io"/>
     <depend project="jdtcore"/>
+    <depend project="cocoon-block-template" type="samples"/>
 
     <library name="commons-javaflow"/>
     <library name="commons-jci"/>
@@ -1242,6 +1253,7 @@
     <depend project="cocoon-block-fop"/>
     <depend project="cocoon-block-forms"/>
     <depend project="cocoon-block-slop"/>
+    <depend project="cocoon-block-template"/>
 
     <work nested="tools/anttasks"/>
     <home nested="build/cocoon-@@DATE@@"/>

Modified: 
cocoon/trunk/src/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java
URL: 
http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java?rev=164418&r1=164417&r2=164418&view=diff
==============================================================================
--- 
cocoon/trunk/src/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java
 (original)
+++ 
cocoon/trunk/src/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java
 Sat Apr 23 13:36:39 2005
@@ -42,7 +42,6 @@
  * @version CVS $Id$
  */
 public class TemplateObjectModelHelper {
-
     /** Avoid instantiation */
     private TemplateObjectModelHelper() {}
 

Modified: cocoon/trunk/src/webapp/sitemap.xmap
URL: 
http://svn.apache.org/viewcvs/cocoon/trunk/src/webapp/sitemap.xmap?rev=164418&r1=164417&r2=164418&view=diff
==============================================================================
--- cocoon/trunk/src/webapp/sitemap.xmap (original)
+++ cocoon/trunk/src/webapp/sitemap.xmap Sat Apr 23 13:36:39 2005
@@ -72,7 +72,6 @@
     <map:generator label="content" logger="sitemap.generator.request" 
name="request" pool-max="16" 
src="org.apache.cocoon.generation.RequestGenerator"/>
     <map:generator label="content" logger="sitemap.generator.stream" 
name="stream" pool-max="16" src="org.apache.cocoon.generation.StreamGenerator"/>
     <map:generator label="content" logger="sitemap.generator.status" 
name="status" pool-max="16" src="org.apache.cocoon.generation.StatusGenerator"/>
-    <map:generator label="content" logger="sitemap.generator.jx" name="jx" 
pool-max="16" src="org.apache.cocoon.generation.JXTemplateGenerator"/>
     <!-- The notifying generator can only be used in a <handle-errors> section 
: it produces an XML
          representation of the exception that caused the error handler to be 
executed -->
     <map:generator name="notifying" 
src="org.apache.cocoon.sitemap.NotifyingGenerator"/>
@@ -133,7 +132,6 @@
     <map:transformer logger="sitemap.transformer.writeDOMsession" 
name="writeDOMsession" 
src="org.apache.cocoon.transformation.WriteDOMSessionTransformer"/>
     <map:transformer logger="sitemap.transformer.readDOMsession" 
name="readDOMsession" 
src="org.apache.cocoon.transformation.ReadDOMSessionTransformer"/>
     <map:transformer logger="sitemap.transformer.log" name="log" pool-max="16" 
src="org.apache.cocoon.transformation.LogTransformer"/>
-    <map:transformer logger="sitemap.transformer.jx" name="jx" pool-max="16" 
src="org.apache.cocoon.transformation.JXTemplateTransformer"/>
     <map:transformer logger="sitemap.transformer.paginate" name="paginate" 
src="org.apache.cocoon.transformation.pagination.Paginator"/>
   </map:transformers>
 


Reply via email to