You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2007/12/19 21:48:46 UTC
svn commit: r605689 - in /cocoon/trunk:
blocks/cocoon-html/cocoon-html-impl/src/main/java/org/apache/cocoon/generation/
blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/generation/
blocks/cocoon-template/cocoon-template-i...
Author: vgritsenko
Date: Wed Dec 19 12:48:43 2007
New Revision: 605689
URL: http://svn.apache.org/viewvc?rev=605689&view=rev
Log:
javadoc, minor cleanup
Modified:
cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/main/java/org/apache/cocoon/generation/HTMLGenerator.java
cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/main/java/org/apache/cocoon/generation/NekoHTMLGenerator.java
cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/generation/RequestAttributeGenerator.java
cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/JXTemplateGenerator.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/CIncludeTransformer.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/I18nTransformer.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/SimpleFormInstanceExtractionTransformer.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/SimpleFormTransformer.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/CSVGenerator.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/DirectoryGenerator.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/serialization/HTMLSerializer.java
cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceGenerator.java
cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceSerializer.java
cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceTransformer.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/generation/StatusGenerator.java
Modified: cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/main/java/org/apache/cocoon/generation/HTMLGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/main/java/org/apache/cocoon/generation/HTMLGenerator.java?rev=605689&r1=605688&r2=605689&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/main/java/org/apache/cocoon/generation/HTMLGenerator.java (original)
+++ cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/main/java/org/apache/cocoon/generation/HTMLGenerator.java Wed Dec 19 12:48:43 2007
@@ -62,7 +62,7 @@
* @cocoon.sitemap.component.name html
* @cocoon.sitemap.component.label content
* @cocoon.sitemap.component.documentation.caching Yes.
- * Uses the last modification date of the xml document for validation
+ * Uses the last modification date of the xml document for validation
* @cocoon.sitemap.component.pooling.max 32
*
* @version $Id$
Modified: cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/main/java/org/apache/cocoon/generation/NekoHTMLGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/main/java/org/apache/cocoon/generation/NekoHTMLGenerator.java?rev=605689&r1=605688&r2=605689&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/main/java/org/apache/cocoon/generation/NekoHTMLGenerator.java (original)
+++ cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/main/java/org/apache/cocoon/generation/NekoHTMLGenerator.java Wed Dec 19 12:48:43 2007
@@ -64,7 +64,7 @@
* @cocoon.sitemap.component.name nekohtml
* @cocoon.sitemap.component.label content
* @cocoon.sitemap.component.documentation.caching Yes.
- * Uses the last modification date of the xml document for validation
+ * Uses the last modification date of the xml document for validation
* @cocoon.sitemap.component.pooling.max 32
*
* @version $Id$
Modified: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/generation/RequestAttributeGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/generation/RequestAttributeGenerator.java?rev=605689&r1=605688&r2=605689&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/generation/RequestAttributeGenerator.java (original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/generation/RequestAttributeGenerator.java Wed Dec 19 12:48:43 2007
@@ -29,19 +29,22 @@
/**
* The <code>RequestAttributeGenerator</code> is a class that reads XML from a
* request attribute and generates SAX Events.
- * <p>
- * The response encoding is taken as the encoding of the xml-data.
- * </p>
*
- * @version $Id$
+ * <p>The response encoding is taken as the encoding of the xml-data.
*
+ * @cocoon.sitemap.component.documentation
+ * The <code>RequestAttributeGenerator</code> is a class that reads XML from a
+ * request attribute and generates SAX Events.
* @cocoon.sitemap.component.name req-attr
* @cocoon.sitemap.component.label content
+ * @cocoon.sitemap.component.documentation.caching No
* @cocoon.sitemap.component.parameter attribute-name
* type="String"
* description="Specifies name of request attribute holding xml data. This xml data will be sent into the cocoon pipeline."
* required="no"
* default="org.apache.cocoon.xml-data"
+ *
+ * @version $Id$
*/
public class RequestAttributeGenerator extends ServiceableGenerator {
Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/JXTemplateGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/JXTemplateGenerator.java?rev=605689&r1=605688&r2=605689&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/JXTemplateGenerator.java (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/JXTemplateGenerator.java Wed Dec 19 12:48:43 2007
@@ -22,6 +22,8 @@
import java.util.Map;
import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.excalibur.source.SourceValidity;
+
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.caching.CacheableProcessingComponent;
import org.apache.cocoon.core.xml.SAXParser;
@@ -38,28 +40,32 @@
import org.apache.cocoon.template.script.event.Event;
import org.apache.cocoon.template.script.event.StartDocument;
import org.apache.cocoon.template.xml.AttributeAwareXMLConsumerImpl;
+import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.cocoon.xml.RedundantNamespacesFilter;
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.cocoon.xml.util.NamespacesTable;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.excalibur.source.SourceValidity;
+
import org.xml.sax.SAXException;
/**
- * @cocoon.sitemap.component.documentation Provides a generic page template with embedded JSTL and
- * XPath expression substitution to access data sent by
- * Cocoon Flowscripts.
+ * Provides a generic page template with embedded JSTL and
+ * XPath expression substitution to access data sent by
+ * Cocoon Flowscripts.
*
+ * @cocoon.sitemap.component.documentation
+ * Provides a generic page template with embedded JSTL and
+ * XPath expression substitution to access data sent by
+ * Cocoon Flowscripts.
* @cocoon.sitemap.component.name jx
* @cocoon.sitemap.component.label content
+ * @cocoon.sitemap.component.documentation.caching Supported.
+ * Caching key and validity should be supplied by jx template.
* @cocoon.sitemap.component.pooling.max 16
*
- *
* @version $Id$
*/
-public class JXTemplateGenerator implements Generator, CacheableProcessingComponent {
- protected final static Log logger = LogFactory.getLog(JXTemplateGenerator.class);
+public class JXTemplateGenerator extends AbstractLogEnabled
+ implements Generator, CacheableProcessingComponent {
/** The namespace used by this generator */
public final static String NS = "http://apache.org/cocoon/templates/jx/1.0";
@@ -81,6 +87,7 @@
protected String src;
+
public ScriptManager getScriptManager() {
return scriptManager;
}
@@ -110,11 +117,10 @@
}
/**
- * @see org.apache.cocoon.generation.AbstractGenerator#setup(org.apache.cocoon.environment.SourceResolver,
- * java.util.Map, java.lang.String, org.apache.avalon.framework.parameters.Parameters)
+ * @see org.apache.cocoon.generation.AbstractGenerator#setup(SourceResolver, Map, String, Parameters)
*/
public void setup(SourceResolver resolver, Map objectModel, String src, Parameters parameters)
- throws ProcessingException, SAXException, IOException {
+ throws ProcessingException, SAXException, IOException {
this.parameters = parameters;
this.src = src;
@@ -160,14 +166,16 @@
if (cacheKeyExpr == null) {
return null;
}
+
try {
final Serializable templateKey = (Serializable) cacheKeyExpr.getValue(this.objectModel);
if (templateKey != null) {
return new JXCacheKey(this.startDocument.getUri(), templateKey);
}
} catch (Exception e) {
- logger.error("error evaluating cache key", e);
+ getLogger().error("error evaluating cache key", e);
}
+
return null;
}
@@ -179,6 +187,7 @@
if (validityExpr == null) {
return null;
}
+
try {
final SourceValidity sourceValidity = this.startDocument.getSourceValidity();
final SourceValidity templateValidity = (SourceValidity) validityExpr.getValue(this.objectModel);
@@ -186,8 +195,9 @@
return new JXSourceValidity(sourceValidity, templateValidity);
}
} catch (Exception e) {
- logger.error("error evaluating cache validity", e);
+ getLogger().error("error evaluating cache validity", e);
}
+
return null;
}
}
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/CIncludeTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/CIncludeTransformer.java?rev=605689&r1=605688&r2=605689&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/CIncludeTransformer.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/CIncludeTransformer.java Wed Dec 19 12:48:43 2007
@@ -122,7 +122,7 @@
* which surrounds the included content.
* @cocoon.sitemap.component.name cinclude
* @cocoon.sitemap.component.documentation.caching
- * Limited. See documentation for further information.
+ * Limited. See documentation for further information.
* @cocoon.sitemap.component.pooling.max 16
*
* @version $Id$
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/I18nTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/I18nTransformer.java?rev=605689&r1=605688&r2=605689&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/I18nTransformer.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/I18nTransformer.java Wed Dec 19 12:48:43 2007
@@ -264,7 +264,8 @@
* Internationalization transformer is used to transform i18n markup into text
* based on a particular locale.
* @cocoon.sitemap.component.name i18n
- * @cocoon.sitemap.component.documentation.caching Yes
+ * @cocoon.sitemap.component.documentation.caching Yes.
+ * Currently, validity of used i18n catalogues is not verified
*
* @version $Id$
*/
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/SimpleFormInstanceExtractionTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/SimpleFormInstanceExtractionTransformer.java?rev=605689&r1=605688&r2=605689&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/SimpleFormInstanceExtractionTransformer.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/SimpleFormInstanceExtractionTransformer.java Wed Dec 19 12:48:43 2007
@@ -61,6 +61,7 @@
* that the extracted form instance data is used only when no similar
* request parameter exists.
* @cocoon.sitemap.component.name simple-form-instance
+ * @cocoon.sitemap.component.documentation.caching No
*
* @version $Id$
*/
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/SimpleFormTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/SimpleFormTransformer.java?rev=605689&r1=605688&r2=605689&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/SimpleFormTransformer.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/SimpleFormTransformer.java Wed Dec 19 12:48:43 2007
@@ -142,6 +142,7 @@
* Eliminates the need for XSP to use FormValidatorAction or HTML forms.
* Caveat: Select options need a value attribute to work correctly.
* @cocoon.sitemap.component.name simple-form
+ * @cocoon.sitemap.component.documentation.caching No
*
* @version $Id$
*/
Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/CSVGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/CSVGenerator.java?rev=605689&r1=605688&r2=605689&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/CSVGenerator.java (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/CSVGenerator.java Wed Dec 19 12:48:43 2007
@@ -102,7 +102,7 @@
* A simple parser converting a Comma Separated Values (CSV) file into XML.
* @cocoon.sitemap.component.name csv
* @cocoon.sitemap.component.documentation.caching Yes.
- * Uses the last modification date of the xml document for validation
+ * Uses the last modification date of the xml document for validation
*
* @version $Id$
*/
Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/DirectoryGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/DirectoryGenerator.java?rev=605689&r1=605688&r2=605689&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/DirectoryGenerator.java (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/DirectoryGenerator.java Wed Dec 19 12:48:43 2007
@@ -55,7 +55,7 @@
* @cocoon.sitemap.component.name directory
* @cocoon.sitemap.component.label content
* @cocoon.sitemap.component.documentation.caching Yes.
- * Uses the last modification date of the directory and the contained files.
+ * Uses the last modification date of the directory and the contained files.
* @cocoon.sitemap.component.pooling.max 16
*
* @version $Id$
Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/serialization/HTMLSerializer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/serialization/HTMLSerializer.java?rev=605689&r1=605688&r2=605689&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/serialization/HTMLSerializer.java (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/serialization/HTMLSerializer.java Wed Dec 19 12:48:43 2007
@@ -31,8 +31,8 @@
* @cocoon.sitemap.component.documentation
* The html serializer serializes sax events into an html document.
* @cocoon.sitemap.component.name html
- * @cocoon.sitemap.component.documentation.caching Yes
* @cocoon.sitemap.component.mimetype text/html
+ * @cocoon.sitemap.component.documentation.caching Yes
* @cocoon.sitemap.component.pooling.max 32
*
* @cocoon.sitemap.component.configuration
Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceGenerator.java?rev=605689&r1=605688&r2=605689&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceGenerator.java (original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceGenerator.java Wed Dec 19 12:48:43 2007
@@ -44,6 +44,10 @@
* The <code>ServletServiceGenerator</code> POSTs its input data to a called service and passes the XML data returned
* by the service down the pipeline.
* @cocoon.sitemap.component.name servletService
+ * @cocoon.sitemap.component.documentation.caching Not Implemented
+ *
+ * @since 2.2
+ * @version $Id$
*/
public class ServletServiceGenerator extends AbstractGenerator {
@@ -52,7 +56,16 @@
private PostableSource servletSource;
- /* (non-Javadoc)
+ public SAXParser getSaxParser() {
+ return saxParser;
+ }
+
+ public void setSaxParser(SAXParser saxParser) {
+ this.saxParser = saxParser;
+ }
+
+
+ /**
* @see org.apache.cocoon.generation.Generator#generate()
*/
public void generate() throws IOException, SAXException, ProcessingException {
@@ -63,7 +76,7 @@
}
}
- /* (non-Javadoc)
+ /**
* @see org.apache.cocoon.sitemap.SitemapModelComponent#setup(org.apache.cocoon.environment.SourceResolver, java.util.Map, java.lang.String, org.apache.avalon.framework.parameters.Parameters)
*/
public void setup(SourceResolver resolver, Map objectModel, String src, Parameters par) throws ProcessingException, SAXException, IOException {
@@ -94,13 +107,5 @@
}
IOUtils.copy(inputSource.getInputStream(), servletSource.getOutputStream());
- }
-
- public SAXParser getSaxParser() {
- return saxParser;
- }
-
- public void setSaxParser(SAXParser saxParser) {
- this.saxParser = saxParser;
}
}
Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceSerializer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceSerializer.java?rev=605689&r1=605688&r2=605689&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceSerializer.java (original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceSerializer.java Wed Dec 19 12:48:43 2007
@@ -51,6 +51,10 @@
* service. Result of the serialization is a data returned by the called
* service.
* @cocoon.sitemap.component.name servletService
+ * @cocoon.sitemap.component.documentation.caching Not Implemented
+ *
+ * @since 2.2
+ * @version $Id$
*/
public class ServletServiceSerializer extends AbstractSerializer
implements SitemapModelComponent {
@@ -111,5 +115,4 @@
throw new SAXException("Exception occured while copying response from the service to the output stream", e);
}
}
-
}
Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceTransformer.java?rev=605689&r1=605688&r2=605689&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceTransformer.java (original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceTransformer.java Wed Dec 19 12:48:43 2007
@@ -41,7 +41,11 @@
* @cocoon.sitemap.component.documentation
* The <code>ServletServiceTransformer</code> POSTs its input data to a called service and passes the XML data returned
* by the service down the pipeline.
- * @cocoon.sitemap.component.name servletService
+ * @cocoon.sitemap.component.name servletService
+ * @cocoon.sitemap.component.documentation.caching Not Implemented
+ *
+ * @since 2.2
+ * @version $Id$
*/
public class ServletServiceTransformer extends AbstractSAXTransformer
implements DisposableSitemapComponent {
@@ -51,6 +55,15 @@
private PostableSource servletSource;
+ public SAXParser getSaxParser() {
+ return saxParser;
+ }
+
+ public void setSaxParser(SAXParser saxParser) {
+ this.saxParser = saxParser;
+ }
+
+
public void setupTransforming() throws IOException, ProcessingException, SAXException {
super.setupTransforming();
@@ -78,29 +91,22 @@
public void endDocument() throws SAXException {
super.endDocument();
- try {
+
+ try {
String xml = endSerializedXMLRecording();
//FIXME: Not sure if UTF-8 should always be used, do we have defined this encoding somewhere in Cocoon?
IOUtils.copy(new StringReader(xml), servletSource.getOutputStream(), "UTF-8");
SourceUtil.parse(saxParser, servletSource, contentHandler);
- }
- catch (Exception e) {
+ } catch (Exception e) {
throw new SAXException("Exception occured while calling servlet service", e);
}
}
public void dispose() {
- if (servletSource != null)
+ if (servletSource != null) {
resolver.release(servletSource);
- super.dispose();
- }
-
- public SAXParser getSaxParser() {
- return saxParser;
- }
+ }
- public void setSaxParser(SAXParser saxParser) {
- this.saxParser = saxParser;
+ super.dispose();
}
-
}
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/generation/StatusGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/generation/StatusGenerator.java?rev=605689&r1=605688&r2=605689&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/generation/StatusGenerator.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/generation/StatusGenerator.java Wed Dec 19 12:48:43 2007
@@ -66,14 +66,9 @@
import java.util.TreeSet;
/**
- * @cocoon.sitemap.component.documentation
* Generates an XML representation of the current status of Cocoon.
*
- * @cocoon.sitemap.component.name status
- * @cocoon.sitemap.component.label content
- * @cocoon.sitemap.component.pooling.max 16
- *
- * Potted DTD:
+ * <p>Potted DTD:
*
* <code>
* <!ELEMENT statusinfo (group|value)*>
@@ -96,6 +91,13 @@
* <!ELEMENT line (#PCDATA)+>
* >
* </code>
+ *
+ * @cocoon.sitemap.component.documentation
+ * Generates an XML representation of the current status of Cocoon.
+ * @cocoon.sitemap.component.name status
+ * @cocoon.sitemap.component.label content
+ * @cocoon.sitemap.component.documentation.caching No
+ * @cocoon.sitemap.component.pooling.max 16
*
* @version $Id$
*/