cziegeler 2004/01/07 02:13:30
Modified: . build.properties
src/java/org/apache/cocoon/components/cprocessor
TreeProcessor.java
Log:
Add debugging of the generated conf file
Set default log level to debug for now
Revision Changes Path
1.32 +1 -1 cocoon-2.2/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/cocoon-2.2/build.properties,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- build.properties 25 Dec 2003 16:01:19 -0000 1.31
+++ build.properties 7 Jan 2004 10:13:29 -0000 1.32
@@ -69,7 +69,7 @@
build.webapp.samples=${build.webapp}/samples
build.webapp.docs=${build.webapp}/docs
build.webapp.javadocs=${build.webapp}/api/java
-build.webapp.loglevel=INFO
+build.webapp.loglevel=DEBUG
build.war=${build}/${name}.war
# ------ Standalone-demo Build Properties
--------------------------------------
1.6 +17 -1
cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/TreeProcessor.java
Index: TreeProcessor.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/TreeProcessor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TreeProcessor.java 5 Jan 2004 11:00:29 -0000 1.5
+++ TreeProcessor.java 7 Jan 2004 10:13:29 -0000 1.6
@@ -77,17 +77,21 @@
import org.apache.cocoon.Constants;
import org.apache.cocoon.Processor;
import org.apache.cocoon.components.pipeline.ProcessingPipeline;
+import org.apache.cocoon.components.sax.XMLTeePipe;
import org.apache.cocoon.components.source.impl.DelayedRefreshSourceWrapper;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.EnvironmentHelper;
import org.apache.cocoon.environment.wrapper.EnvironmentWrapper;
import org.apache.cocoon.environment.wrapper.MutableEnvironmentFacade;
+import org.apache.cocoon.xml.ContentHandlerWrapper;
import org.apache.cocoon.xml.LocationAugmentationPipe;
import org.apache.cocoon.xml.XMLUtils;
+import org.apache.cocoon.xml.dom.DOMBuilder;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
import org.apache.excalibur.xml.sax.SAXParser;
import org.apache.excalibur.xml.xslt.XSLTProcessor;
+import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
/**
@@ -359,12 +363,24 @@
final TransformerHandler transformHandler =
xsltProcessor.getTransformerHandler(m_transform);
final NamespacedSAXConfigurationHandler configHandler = new
NamespacedSAXConfigurationHandler();
- transformHandler.setResult(new SAXResult(configHandler));
+ ContentHandler handler = configHandler;
+ // TODO - remove the logging of the generated configuration
before we go final
+ // if debug is turned on, output the whole generated
configuration
+ DOMBuilder domBuilder = null;
+ if ( this.getLogger().isDebugEnabled() ) {
+ domBuilder = new DOMBuilder();
+ handler = new XMLTeePipe(new ContentHandlerWrapper(handler),
domBuilder);
+ }
+ transformHandler.setResult(new SAXResult(handler));
final LocationAugmentationPipe pipe = new
LocationAugmentationPipe();
pipe.setConsumer(XMLUtils.getConsumer(transformHandler));
parser.parse(new InputSource(source.getInputStream()),pipe);
+ if ( domBuilder != null ) {
+ this.getLogger().debug("Configuration from sitemap: " +
this.m_source.getURI());
+
this.getLogger().debug(XMLUtils.serializeNodeToXML(domBuilder.getDocument()));
+ }
return configHandler.getConfiguration();
}
finally {
