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 2004/06/18 16:17:59 UTC
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/transformation SourceWritingTransformer.java
vgritsenko 2004/06/18 07:17:59
Modified: src/java/org/apache/cocoon/transformation
SourceWritingTransformer.java
Log:
Tone down debug a bit; use XMLUtils.serializeNode(Node node).
Revision Changes Path
1.13 +41 -49 cocoon-2.1/src/java/org/apache/cocoon/transformation/SourceWritingTransformer.java
Index: SourceWritingTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/SourceWritingTransformer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SourceWritingTransformer.java 17 Jun 2004 14:55:24 -0000 1.12
+++ SourceWritingTransformer.java 18 Jun 2004 14:17:59 -0000 1.13
@@ -1,12 +1,12 @@
/*
* 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.
@@ -48,10 +48,10 @@
/**
* @cocoon.sitemap.component.documentation
* This transformer allows you to output to a ModifiableSource.
- *
+ *
* @cocoon.sitemap.component.name write-source
* @cocoon.sitemap.component.logger sitemap.transformer.write-source
- *
+ *
* This transformer allows you to output to a ModifiableSource.
*
* <p>Definition:</p>
@@ -84,11 +84,11 @@
* <source:reinsert>[Optional] The XPath (relative to <source:replace/>) to backup the overwritten node to</source:reinsert> - eg: "foo/versions" or "/doc/versions/foo". NOTE: If specified and a node is replaced, all children of this replaced node will be reinserted at the given path.
* <source:fragment>The XML Fragment to be written</source:fragment> - eg: "<foo><bar id="dogcow"/></foo>" or "<foo/><bar><dogcow/><bar/>" etc.
* <source:insert>
- *
+ *
* <source:delete > - deletes an existing asset.
* <source:source>The System ID of the asset to be deleted</source:source> - eg: "docs/blah.xml" or "context://blah.xml" etc.
* <source:path>[Ignored] XPath to specify how your content is wrapped</source:path>
- * <source:fragment>[Ignored]The XML Fragment to be written</source:fragment>
+ * <source:fragment>[Ignored]The XML Fragment to be written</source:fragment>
* <source:delete>
* </pre>
*
@@ -222,7 +222,7 @@
* reinsert a replaced node at a given path in the new fragment.
*
* <b>
- * TODO: Use the serializer instead of the XMLUtils for inserting of fragments
+ * TODO: Use the serializer instead of the XMLUtils for inserting of fragments<br/>
* TODO: Add a <source:before/> tag.
* </b>
*
@@ -283,7 +283,7 @@
/** The XPath processor */
protected XPathProcessor xpathProcessor;
-
+
/**
* Constructor.
* Sets the namespace.
@@ -298,7 +298,7 @@
*/
public void configure(Configuration configuration)
throws ConfigurationException {
- super.configure( configuration );
+ super.configure(configuration);
this.configuredSerializerName = configuration.getChild(SERIALIZER_ATTRIBUTE).getValue(DEFAULT_SERIALIZER);
}
@@ -309,7 +309,9 @@
public void setup(SourceResolver resolver, Map objectModel, String src, Parameters par)
throws ProcessingException, SAXException, IOException {
super.setup(resolver, objectModel, src, par);
- this.configuredSerializerName = par.getParameter(SERIALIZER_ATTRIBUTE, this.configuredSerializerName);
+
+ this.configuredSerializerName = par.getParameter(SERIALIZER_ATTRIBUTE,
+ this.configuredSerializerName);
this.state = STATE_OUTSIDE;
}
@@ -329,11 +331,12 @@
public void startTransformingElement(String uri, String name, String raw, Attributes attr)
throws SAXException, IOException, ProcessingException {
if (getLogger().isDebugEnabled()) {
- getLogger().debug("BEGIN startTransformingElement uri=" + uri +
+ getLogger().debug("Start transforming element. uri=" + uri +
", name=" + name + ", raw=" + raw + ", attr=" + attr);
}
+
// Element: insert
- if (this.state == STATE_OUTSIDE
+ if (this.state == STATE_OUTSIDE
&& (name.equals(INSERT_ELEMENT) || name.equals(WRITE_ELEMENT))) {
this.state = (name.equals(INSERT_ELEMENT) ? STATE_INSERT : STATE_WRITE);
@@ -391,10 +394,6 @@
} else {
super.startTransformingElement(uri, name, raw, attr);
}
-
- if (getLogger().isDebugEnabled()) {
- getLogger().debug("END startTransformingElement");
- }
}
@@ -412,10 +411,10 @@
public void endTransformingElement(String uri, String name, String raw)
throws SAXException, IOException, ProcessingException {
if (getLogger().isDebugEnabled()) {
- getLogger().debug("BEGIN endTransformingElement uri=" + uri +
- ", name=" + name +
- ", raw=" + raw);
+ getLogger().debug("End transforming element. uri=" + uri +
+ ", name=" + name + ", raw=" + raw);
}
+
if ((name.equals(INSERT_ELEMENT) && this.state == STATE_INSERT)
|| (name.equals(WRITE_ELEMENT) && this.state == STATE_WRITE)) {
@@ -471,9 +470,9 @@
this.stack.pop();
}
} while ( !tag.equals("END"));
-
+
this.deleteSource(sourceName);
- this.state = STATE_OUTSIDE;
+ this.state = STATE_OUTSIDE;
// Element: file
} else if (name.equals(SOURCE_ELEMENT) && this.state == STATE_FILE) {
this.state = this.parent_state;
@@ -508,10 +507,6 @@
} else {
super.endTransformingElement(uri, name, raw);
}
-
- if (getLogger().isDebugEnabled()) {
- getLogger().debug("END endTransformingElement");
- }
}
/**
@@ -582,14 +577,15 @@
throws SAXException, IOException, ProcessingException {
// no sync req
if (getLogger().isDebugEnabled()) {
- getLogger().debug("BEGIN insertFragment systemID="+systemID+
- ", path="+path+
- ", replace="+replacePath+
- ", create="+create+
- ", overwrite="+overwrite+
- ", reinsert="+reinsertPath+
- ", fragment="+(fragment == null ? "null" : XMLUtils.serializeNode(fragment, XMLUtils.createPropertiesForXML(false))));
+ getLogger().debug("Insert fragment. systemID=" + systemID +
+ ", path=" + path +
+ ", replace=" + replacePath +
+ ", create=" + create +
+ ", overwrite=" + overwrite +
+ ", reinsert=" + reinsertPath +
+ ", fragment=" + (fragment == null? "null": XMLUtils.serializeNode(fragment)));
}
+
// test parameter
if (systemID == null) {
throw new ProcessingException("insertFragment: systemID is required.");
@@ -771,18 +767,15 @@
if (!failed) { action = (exists) ? ACTION_OVER : ACTION_NEW; }
this.reportResult(localSerializer, tagname, message, target, result, action);
-
- if (getLogger().isDebugEnabled()) {
- getLogger().debug("END insertFragment");
- }
}
- private void reportResult(String localSerializer,
- String tagname,
- String message,
- String target,
- String result,
- String action) throws SAXException {
+ private void reportResult(String localSerializer,
+ String tagname,
+ String message,
+ String target,
+ String result,
+ String action)
+ throws SAXException {
sendStartElementEvent(RESULT_ELEMENT);
sendStartElementEvent(EXECUTION_ELEMENT);
sendTextEvent(result);
@@ -806,10 +799,10 @@
}
sendEndElementEvent(RESULT_ELEMENT);
}
-
-
+
+
/* (non-Javadoc)
- * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
+ * @see org.apache.avalon.framework.service.Serviceable#service(ServiceManager)
*/
public void service(ServiceManager manager) throws ServiceException {
super.service(manager);
@@ -820,10 +813,9 @@
* @see org.apache.avalon.framework.activity.Disposable#dispose()
*/
public void dispose() {
- if ( this.manager != null ) {
+ if (this.manager != null) {
this.manager.release(this.xpathProcessor);
this.xpathProcessor = null;
}
}
-
}