bloritsch 01/02/12 06:17:49
Modified: src/org/apache/cocoon/components/parser Tag: xml-cocoon2
JaxpParser.java
src/org/apache/cocoon/generation Tag: xml-cocoon2
DirectoryGenerator.java FileGenerator.java
FragmentExtractorGenerator.java
ImageDirectoryGenerator.java
ServerPagesGenerator.java StatusGenerator.java
src/org/apache/cocoon/serialization Tag: xml-cocoon2
AbstractTextSerializer.java FOPSerializer.java
HTMLSerializer.java TextSerializer.java
XMLSerializer.java
src/org/apache/cocoon/transformation Tag: xml-cocoon2
FragmentExtractorTransformer.java
I18nTransformer.java LogTransformer.java
XIncludeTransformer.java
src/org/apache/cocoon/xml Tag: xml-cocoon2
AbstractXMLConsumer.java AbstractXMLProducer.java
src/org/apache/cocoon/xml/dom Tag: xml-cocoon2
DOMStreamer.java
Log:
Change to use AbstractLoggable
Revision Changes Path
No revision
No revision
1.1.2.3 +4 -4
xml-cocoon/src/org/apache/cocoon/components/parser/Attic/JaxpParser.java
Index: JaxpParser.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/parser/Attic/JaxpParser.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- JaxpParser.java 2001/02/08 11:59:37 1.1.2.2
+++ JaxpParser.java 2001/02/12 14:17:30 1.1.2.3
@@ -29,7 +29,7 @@
* If only we can get rid of the need for the Document...
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/02/08 11:59:37 $
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/02/12 14:17:30 $
*/
public class JaxpParser extends AbstractXMLProducer
implements Parser, ErrorHandler, ThreadSafe {
@@ -52,7 +52,7 @@
try {
parser = this.factory.newSAXParser();
} catch (Exception e) {
- log.error("Cannot produce a valid parser", e);
+ getLogger().error("Cannot produce a valid parser", e);
throw new SAXException("Could not get valid parser" +
e.getMessage());
}
@@ -76,7 +76,7 @@
try {
builder = this.docfactory.newDocumentBuilder();
} catch (ParserConfigurationException pce) {
- log.error("Could not create DocumentBuilder", pce);
+ getLogger().error("Could not create DocumentBuilder", pce);
return null;
}
return builder.newDocument();
@@ -99,7 +99,7 @@
try {
builder = this.docfactory.newDocumentBuilder();
} catch (ParserConfigurationException pce) {
- log.error("Could not build DocumentBuilder", pce);
+ getLogger().error("Could not build DocumentBuilder", pce);
return null;
}
No revision
No revision
1.1.2.17 +3 -3
xml-cocoon/src/org/apache/cocoon/generation/Attic/DirectoryGenerator.java
Index: DirectoryGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/DirectoryGenerator.java,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- DirectoryGenerator.java 2001/02/12 13:30:44 1.1.2.16
+++ DirectoryGenerator.java 2001/02/12 14:17:32 1.1.2.17
@@ -61,7 +61,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.16 $ $Date: 2001/02/12 13:30:44 $ */
+ * @version CVS $Revision: 1.1.2.17 $ $Date: 2001/02/12 14:17:32 $ */
public class DirectoryGenerator extends ComposerGenerator implements
Poolable {
@@ -141,7 +141,7 @@
try {
url =
((URLFactory)manager.lookup(Roles.URL_FACTORY)).getURL(input.getSystemId());
} catch (Exception e) {
- log.error("cannot obtain the URLFactory");
+ getLogger().error("cannot obtain the URLFactory");
throw new SAXException ("cannot obtain the URLFactory", e);
}
path = new File(url.getFile());
@@ -157,7 +157,7 @@
this.contentHandler.endPrefixMapping(PREFIX);
this.contentHandler.endDocument();
} catch (IOException ioe) {
- log.warn("Could not get resource", ioe);
+ getLogger().warn("Could not get resource", ioe);
throw new ResourceNotFoundException("Could not get directory",
ioe);
}
1.1.2.16 +8 -8
xml-cocoon/src/org/apache/cocoon/generation/Attic/FileGenerator.java
Index: FileGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/FileGenerator.java,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- FileGenerator.java 2001/02/11 19:13:19 1.1.2.15
+++ FileGenerator.java 2001/02/12 14:17:33 1.1.2.16
@@ -57,7 +57,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.1.2.15 $ $Date: 2001/02/11 19:13:19 $
+ * @version CVS $Revision: 1.1.2.16 $ $Date: 2001/02/12 14:17:33 $
*/
public class FileGenerator extends ComposerGenerator implements Poolable,
Configurable {
@@ -77,10 +77,10 @@
public void compose(ComponentManager manager) {
super.compose(manager);
try {
- log.debug("Looking up " + Roles.STORE);
+ getLogger().debug("Looking up " + Roles.STORE);
this.store = (Store) manager.lookup(Roles.STORE);
} catch (Exception e) {
- log.error("Could not find component", e);
+ getLogger().error("Could not find component", e);
}
}
@@ -145,7 +145,7 @@
XMLMulticaster multicaster = new
XMLMulticaster(compiler, null,
this.contentHandler, this.lexicalHandler);
- log.debug("Looking up " + Roles.PARSER);
+ getLogger().debug("Looking up " + Roles.PARSER);
Parser parser=(Parser)this.manager.lookup(Roles.PARSER);
parser.setContentHandler(multicaster);
@@ -158,7 +158,7 @@
cxmlAndTime[1] = new Long(System.currentTimeMillis());
store.hold(systemID, cxmlAndTime);
} else {
- log.debug("Looking up " + Roles.PARSER);
+ getLogger().debug("Looking up " + Roles.PARSER);
Parser parser=(Parser)this.manager.lookup(Roles.PARSER);
parser.setContentHandler(this.contentHandler);
@@ -174,13 +174,13 @@
interpreter.parse(bais);
}
} catch (IOException e) {
- log.error("FileGenerator.generate()", e);
+ getLogger().error("FileGenerator.generate()", e);
throw new ResourceNotFoundException("FileGenerator could not
find resource", e);
} catch (SAXException e) {
- log.error("FileGenerator.generate()", e);
+ getLogger().error("FileGenerator.generate()", e);
throw(e);
} catch (Exception e){
- log.error("Could not get parser", e);
+ getLogger().error("Could not get parser", e);
throw new ProcessingException(e.getMessage());
}
}
1.1.2.2 +2 -2
xml-cocoon/src/org/apache/cocoon/generation/Attic/FragmentExtractorGenerator.java
Index: FragmentExtractorGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/FragmentExtractorGenerator.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FragmentExtractorGenerator.java 2001/02/11 19:19:40 1.1.2.1
+++ FragmentExtractorGenerator.java 2001/02/12 14:17:33 1.1.2.2
@@ -28,7 +28,7 @@
* This is by no means complete yet, but it should prove useful, particularly
* for offline generation.
* @author <a href="mailto:[EMAIL PROTECTED]">Paul Russell</a>
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2001/02/11 19:19:40 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/02/12 14:17:33 $
*/
public class FragmentExtractorGenerator extends AbstractGenerator implements
Poolable {
@@ -58,7 +58,7 @@
public void generate() throws SAXException {
// Obtain the fragmentID (which is simply the filename portion of
the source)
- log.debug("FragmentExtractorGenerator retrieving document " + source
+ ".");
+ getLogger().debug("FragmentExtractorGenerator retrieving document "
+ source + ".");
Document doc = (Document) fragmentStore.get(source);
DOMStreamer streamer = new
DOMStreamer(this.contentHandler,this.lexicalHandler);
1.1.2.6 +3 -3
xml-cocoon/src/org/apache/cocoon/generation/Attic/ImageDirectoryGenerator.java
Index: ImageDirectoryGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/ImageDirectoryGenerator.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- ImageDirectoryGenerator.java 2000/12/08 20:39:37 1.1.2.5
+++ ImageDirectoryGenerator.java 2001/02/12 14:17:35 1.1.2.6
@@ -13,7 +13,7 @@
* files.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Donald A. Ball Jr.</a>
- * @version $Revision: 1.1.2.5 $ $Date: 2000/12/08 20:39:37 $
+ * @version $Revision: 1.1.2.6 $ $Date: 2001/02/12 14:17:35 $
*/
public class ImageDirectoryGenerator extends DirectoryGenerator implements
Poolable {
@@ -34,9 +34,9 @@
int dim[] = getSize(path);
attributes.addAttribute("",IMAGE_WIDTH_ATTR_NAME,IMAGE_WIDTH_ATTR_NAME,"CDATA",""+dim[0]);
attributes.addAttribute("",IMAGE_HEIGHT_ATTR_NAME,IMAGE_HEIGHT_ATTR_NAME,"CDATA",""+dim[1]);
- } catch (RuntimeException e)
{log.debug("ImageDirectoryGenerator.setNodeAttributes", e);}
+ } catch (RuntimeException e)
{getLogger().debug("ImageDirectoryGenerator.setNodeAttributes", e);}
catch (Exception e) {
- log.error("ImageDirectoryGenerator.setNodeAttributes", e);
+ getLogger().error("ImageDirectoryGenerator.setNodeAttributes",
e);
throw new SAXException(e);
}
}
1.1.2.15 +7 -7
xml-cocoon/src/org/apache/cocoon/generation/Attic/ServerPagesGenerator.java
Index: ServerPagesGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/ServerPagesGenerator.java,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- ServerPagesGenerator.java 2001/02/12 13:30:44 1.1.2.14
+++ ServerPagesGenerator.java 2001/02/12 14:17:35 1.1.2.15
@@ -39,7 +39,7 @@
* delegating actual SAX event generation.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/02/12 13:30:44 $
+ * @version CVS $Revision: 1.1.2.15 $ $Date: 2001/02/12 14:17:35 $
*/
public class ServerPagesGenerator
extends ServletGenerator
@@ -60,12 +60,12 @@
super.compose(manager);
if (programGenerator == null) {
- log.debug("Looking up " + Roles.PROGRAM_GENERATOR);
+ getLogger().debug("Looking up " + Roles.PROGRAM_GENERATOR);
try {
programGenerator = (ProgramGenerator)
this.manager.lookup(Roles.PROGRAM_GENERATOR);
} catch (Exception e) {
- log.error("Could not find ProgramGenerator", e);
+ getLogger().error("Could not find ProgramGenerator", e);
}
}
}
@@ -111,7 +111,7 @@
try {
url =
((URLFactory)manager.lookup(Roles.URL_FACTORY)).getURL(systemId);
} catch (Exception e) {
- log.error ("cannot obtain the URLFactory");
+ getLogger().error ("cannot obtain the URLFactory");
throw new SAXException("cannot obtain the URLFactory", e);
}
if (!url.getProtocol().equals("file")) {
@@ -137,12 +137,12 @@
generator = (Generator)
programGenerator.load(file, markupLanguage, programmingLanguage,
resolver);
} catch (Exception e) {
- log.warn("ServerPagesGenerator.generate()", e);
+ getLogger().warn("ServerPagesGenerator.generate()", e);
throw new ResourceNotFoundException(e.getMessage(), e);
}
if (generator instanceof Loggable) {
- ((Loggable)generator).setLogger(this.log);
+ ((Loggable)generator).setLogger(getLogger());
}
// Delegate XML production to loaded generator
@@ -150,7 +150,7 @@
try {
((Composer) generator).compose(this.manager);
} catch (Exception e) {
- log.error("Could not compose generator", e);
+ getLogger().error("Could not compose generator", e);
throw new ProcessingException("Could not compose generator");
}
}
1.1.2.8 +3 -3
xml-cocoon/src/org/apache/cocoon/generation/Attic/StatusGenerator.java
Index: StatusGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/StatusGenerator.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- StatusGenerator.java 2000/12/08 20:39:40 1.1.2.7
+++ StatusGenerator.java 2001/02/12 14:17:36 1.1.2.8
@@ -52,7 +52,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Paul Russell</a> (Luminas
Limited)
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.7 $ $Date: 2000/12/08 20:39:40 $
+ * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/02/12 14:17:36 $
*/
public class StatusGenerator extends ComposerGenerator implements Poolable {
@@ -99,10 +99,10 @@
try {
localHost = InetAddress.getLocalHost().getHostName();
} catch ( UnknownHostException e ) {
- log.debug("StatusGenerator:UnknownHost", e);
+ getLogger().debug("StatusGenerator:UnknownHost", e);
localHost = "";
} catch ( SecurityException e ) {
- log.debug("StatusGenerator:Security", e);
+ getLogger().debug("StatusGenerator:Security", e);
localHost = "";
}
No revision
No revision
1.1.2.6 +8 -8
xml-cocoon/src/org/apache/cocoon/serialization/Attic/AbstractTextSerializer.java
Index: AbstractTextSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/AbstractTextSerializer.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- AbstractTextSerializer.java 2001/01/10 13:42:21 1.1.2.5
+++ AbstractTextSerializer.java 2001/02/12 14:17:39 1.1.2.6
@@ -20,7 +20,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/01/10 13:42:21 $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/02/12 14:17:39 $
*/
public abstract class AbstractTextSerializer extends AbstractSerializer
implements Configurable {
@@ -52,7 +52,7 @@
try {
format.setEncoding(encoding.getValue());
} catch (ConfigurationException ce) {
- log.debug("No value for encoding--but expected", ce);
+ getLogger().debug("No value for encoding--but expected", ce);
}
}
@@ -60,7 +60,7 @@
try {
doctypePublic = dtPublic.getValue();
} catch (ConfigurationException ce) {
- log.debug("No Public Doctype--but expected", ce);
+ getLogger().debug("No Public Doctype--but expected", ce);
}
}
@@ -68,7 +68,7 @@
try {
format.setDoctype(doctypePublic, dtSystem.getValue());
} catch (ConfigurationException ce) {
- log.debug("No System Doctype--but expected", ce);
+ getLogger().debug("No System Doctype--but expected", ce);
}
}
@@ -77,7 +77,7 @@
try {
format.setIndent(indent.getValueAsInt());
} catch (ConfigurationException ce) {
- log.debug("No indent value or invalid value--but expected",
ce);
+ getLogger().debug("No indent value or invalid value--but
expected", ce);
}
}
@@ -85,7 +85,7 @@
try {
format.setPreserveSpace(preserveSpace.getValueAsBoolean());
} catch (ConfigurationException ce) {
- log.debug("No preserve-space value--but expected", ce);
+ getLogger().debug("No preserve-space value--but expected",
ce);
}
}
@@ -93,7 +93,7 @@
try {
format.setOmitXMLDeclaration(!declaration.getValueAsBoolean());
} catch (ConfigurationException ce) {
- log.debug("No declaration value or invalid value--but
expected", ce);
+ getLogger().debug("No declaration value or invalid
value--but expected", ce);
}
}
@@ -102,7 +102,7 @@
try {
format.setLineWidth(lineWidth.getValueAsInt());
} catch (ConfigurationException ce) {
- log.debug("No line-width value or invalid value--but
expected", ce);
+ getLogger().debug("No line-width value or invalid value--but
expected", ce);
}
}
}
1.1.2.11 +3 -3
xml-cocoon/src/org/apache/cocoon/serialization/Attic/FOPSerializer.java
Index: FOPSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/FOPSerializer.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FOPSerializer.java 2001/01/03 13:49:00 1.1.2.10
+++ FOPSerializer.java 2001/02/12 14:17:39 1.1.2.11
@@ -29,7 +29,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* (PWR Organisation & Entwicklung)
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/01/03 13:49:00 $
+ * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/02/12 14:17:39 $
*
*/
public class FOPSerializer extends AbstractSerializer implements
MessageListener, Poolable {
@@ -70,10 +70,10 @@
driver.format();
driver.render();
} catch (IOException e) {
- log.error("FOPSerializer.endDocument()", e);
+ getLogger().error("FOPSerializer.endDocument()", e);
throw new SAXException (e);
} catch (FOPException e) {
- log.error("FOPSerializer.endDocument()", e);
+ getLogger().error("FOPSerializer.endDocument()", e);
throw new SAXException (e);
} finally {
driver = null;
1.1.2.11 +2 -2
xml-cocoon/src/org/apache/cocoon/serialization/Attic/HTMLSerializer.java
Index: HTMLSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/HTMLSerializer.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- HTMLSerializer.java 2000/12/08 20:40:10 1.1.2.10
+++ HTMLSerializer.java 2001/02/12 14:17:39 1.1.2.11
@@ -20,7 +20,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.10 $ $Date: 2000/12/08 20:40:10 $
+ * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/02/12 14:17:39 $
*/
public class HTMLSerializer extends AbstractTextSerializer implements
Poolable {
@@ -36,7 +36,7 @@
super.setOutputStream(out);
this.setContentHandler(this.factory.makeSerializer(out,
this.format).asContentHandler());
} catch (Exception e) {
- log.error("HTMLSerializer.setOutputStream()", e);
+ getLogger().error("HTMLSerializer.setOutputStream()", e);
throw new RuntimeException(e.toString());
}
}
1.1.2.7 +2 -2
xml-cocoon/src/org/apache/cocoon/serialization/Attic/TextSerializer.java
Index: TextSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/TextSerializer.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- TextSerializer.java 2001/01/04 14:29:53 1.1.2.6
+++ TextSerializer.java 2001/02/12 14:17:40 1.1.2.7
@@ -20,7 +20,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/01/04 14:29:53 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/02/12 14:17:40 $
*/
public class TextSerializer extends AbstractTextSerializer implements
Poolable {
@@ -36,7 +36,7 @@
super.setOutputStream(out);
this.setContentHandler(this.factory.makeSerializer(out,
this.format).asContentHandler());
} catch (Exception e) {
- log.error("TextSerializer.setOutputStream()", e);
+ getLogger().error("TextSerializer.setOutputStream()", e);
throw new RuntimeException(e.toString());
}
}
1.1.2.11 +2 -2
xml-cocoon/src/org/apache/cocoon/serialization/Attic/XMLSerializer.java
Index: XMLSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/XMLSerializer.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- XMLSerializer.java 2001/01/04 14:29:53 1.1.2.10
+++ XMLSerializer.java 2001/02/12 14:17:40 1.1.2.11
@@ -20,7 +20,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/01/04 14:29:53 $
+ * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/02/12 14:17:40 $
*/
public class XMLSerializer extends AbstractTextSerializer implements
Poolable {
@@ -36,7 +36,7 @@
super.setOutputStream(out);
this.setContentHandler(this.factory.makeSerializer(out,
this.format).asContentHandler());
} catch (Exception e) {
- log.error("XMLSerializer.setOutputStream()", e);
+ getLogger().error("XMLSerializer.setOutputStream()", e);
throw new RuntimeException(e.toString());
}
}
No revision
No revision
1.1.2.2 +6 -6
xml-cocoon/src/org/apache/cocoon/transformation/Attic/FragmentExtractorTransformer.java
Index: FragmentExtractorTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/FragmentExtractorTransformer.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FragmentExtractorTransformer.java 2001/02/11 19:19:41 1.1.2.1
+++ FragmentExtractorTransformer.java 2001/02/12 14:17:43 1.1.2.2
@@ -32,7 +32,7 @@
* <a href="http://c2.com/cgi/wiki?YouArentGonnaNeedIt";>you aren't gonna
need it</a>,
* so I've just used very simple extraction based on a URI and local name.
* @author <a href="mailto:[EMAIL PROTECTED]">Paul Russell</a>
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2001/02/11 19:19:41 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/02/12 14:17:43 $
*/
public class FragmentExtractorTransformer extends AbstractTransformer
implements Composer {
private static String EXTRACT_URI="http://www.w3.org/2000/svg";;
@@ -61,7 +61,7 @@
documentFactory = (DOMFactory) manager.lookup(Roles.PARSER);
} catch ( ComponentManagerException cme ) {
documentFactory = null;
- log.error("ImageBankTransformer could not lookup parser.");
+ getLogger().error("ImageBankTransformer could not lookup
parser.");
}
}
@@ -147,7 +147,7 @@
if ( uri.equals(this.EXTRACT_URI) &&
loc.equals(this.EXTRACT_ELEMENT) ) {
extractLevel++;
imageID++;
- log.debug("ImageBankTransformer extractLevel now " +
extractLevel + ".");
+ getLogger().debug("ImageBankTransformer extractLevel now " +
extractLevel + ".");
// Start the DOM document
@@ -190,7 +190,7 @@
this.currentBuilder.endElement(uri,loc,raw);
if ( uri.equals(this.EXTRACT_URI) &&
loc.equals(this.EXTRACT_ELEMENT) ) {
extractLevel--;
- log.debug("ImageBankTransformer extractLevel now " +
extractLevel + ".");
+ getLogger().debug("ImageBankTransformer extractLevel now " +
extractLevel + ".");
if ( extractLevel == 0 ) {
// finish building the DOM. remove existing prefix
mappings.
@@ -205,7 +205,7 @@
Document doc = this.currentBuilder.getDocument();
String id = FragmentExtractorGenerator.store(doc);
- log.debug("FragmentExtractorTransformer
stored document " + id + ".");
+
getLogger().debug("FragmentExtractorTransformer stored document " + id + ".");
// Insert ref.
super.startPrefixMapping("fe",FE_URI);
@@ -386,6 +386,6 @@
}
public void processDocument(Document doc) {
- log.debug("ImageBankTransformer recieved document.");
+ getLogger().debug("ImageBankTransformer recieved document.");
}
}
1.1.2.6 +3 -5
xml-cocoon/src/org/apache/cocoon/transformation/Attic/I18nTransformer.java
Index: I18nTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/I18nTransformer.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- I18nTransformer.java 2001/02/12 13:30:46 1.1.2.5
+++ I18nTransformer.java 2001/02/12 14:17:44 1.1.2.6
@@ -36,8 +36,6 @@
import java.net.URL;
import java.net.MalformedURLException;
-
-
/**
* I18nTransformer. Cocoon2 port of Infozone groups I18nProcessor.
* <p>
@@ -150,7 +148,7 @@
tr = ((URLFactory)manager.lookup(Roles.URL_FACTORY))
.getURL(resolver.resolveEntity(null,
translations_file).getSystemId());
} catch (Exception e) {
- log.error("cannot obtain the URLFactory", e);
+ getLogger().error("cannot obtain the URLFactory", e);
throw new SAXException("cannot obtain the URLFactory", e);
}
initialiseDictionary(tr);
@@ -309,12 +307,12 @@
parser = (Parser)(manager.lookup(Roles.PARSER));
} catch (Exception e) {
- log.error("Could not find component", e);
+ getLogger().error("Could not find component", e);
return;
}
InputSource input;
if (object instanceof Loggable) {
- ((Loggable)object).setLogger(this.log);
+ ((Loggable)object).setLogger(getLogger());
}
if (object instanceof Reader) {
input = new InputSource((Reader)(object));
1.1.2.12 +4 -4
xml-cocoon/src/org/apache/cocoon/transformation/Attic/LogTransformer.java
Index: LogTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/LogTransformer.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- LogTransformer.java 2000/12/08 20:40:40 1.1.2.11
+++ LogTransformer.java 2001/02/12 14:17:44 1.1.2.12
@@ -45,7 +45,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* (PWR Organisation & Entwicklung)
- * @version CVS $Revision: 1.1.2.11 $ $Date: 2000/12/08 20:40:40 $
+ * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/02/12 14:17:44 $
*
*/
public class LogTransformer extends AbstractTransformer {
@@ -84,7 +84,7 @@
else
logfile = new FileWriter(java.io.FileDescriptor.out);
} catch (IOException e) {
- log.debug("LogTransformer", e);
+ getLogger().debug("LogTransformer", e);
isValid = false;
throw e;
}
@@ -303,7 +303,7 @@
logfile.write( logEntry.toString(), 0,
logEntry.length());
logfile.flush();
}
- catch(IOException ioe) { log.debug("LogTransformer.log",
ioe); }
+ catch(IOException ioe) {
getLogger().debug("LogTransformer.log", ioe); }
}
}
}
@@ -314,6 +314,6 @@
public void destroy() {
try {
logfile.close();
- } catch (Exception e) {log.debug("LogTransformer.destroy()", e);}
+ } catch (Exception e) {getLogger().debug("LogTransformer.destroy()",
e);}
}
}
1.1.2.17 +28 -29
xml-cocoon/src/org/apache/cocoon/transformation/Attic/XIncludeTransformer.java
Index: XIncludeTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/XIncludeTransformer.java,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- XIncludeTransformer.java 2001/02/12 13:30:46 1.1.2.16
+++ XIncludeTransformer.java 2001/02/12 14:17:45 1.1.2.17
@@ -28,6 +28,8 @@
import org.apache.avalon.Parameters;
import org.apache.avalon.ComponentManager;
import org.apache.avalon.Composer;
+import org.apache.avalon.Loggable;
+import org.apache.avalon.AbstractLoggable;
import org.apache.cocoon.Roles;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.parser.Parser;
@@ -35,10 +37,6 @@
import org.apache.cocoon.xml.dom.DOMBuilder;
import org.apache.cocoon.xml.dom.DOMStreamer;
import org.apache.xpath.XPathAPI;
-
-import org.apache.avalon.Loggable;
-import org.apache.log.Logger;
-
import javax.xml.transform.TransformerException;
/**
@@ -49,9 +47,9 @@
* by the SAX event FSM yet.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Donald Ball</a>
- * @version CVS $Revision: 1.1.2.16 $ $Date: 2001/02/12 13:30:46 $ $Author:
giacomo $
+ * @version CVS $Revision: 1.1.2.17 $ $Date: 2001/02/12 14:17:45 $ $Author:
bloritsch $
*/
-public class XIncludeTransformer extends AbstractTransformer implements
Composer, Loggable {
+public class XIncludeTransformer extends AbstractTransformer implements
Composer {
protected URLFactory urlFactory;
@@ -88,11 +86,11 @@
throws ProcessingException, SAXException, IOException {}
/*
try {
- log.debug("SOURCE: "+source);
+ getLogger().debug("SOURCE: "+source);
base_xmlbase_uri = urlFactory.getURL(source);
- log.debug("SOURCE URI: "+base_xmlbase_uri.toString());
+ getLogger().debug("SOURCE URI: "+base_xmlbase_uri.toString());
} catch (MalformedURLException e) {
- log.debug("XincludeTransformer", e);
+ getLogger().debug("XincludeTransformer", e);
throw new ProcessingException(e.getMessage());
}
}
@@ -103,7 +101,7 @@
try {
this.urlFactory =
(URLFactory)this.manager.lookup(Roles.URL_FACTORY);
} catch (Exception e) {
- log.error("cannot obtain URLFactory", e);
+ getLogger().error("cannot obtain URLFactory", e);
}
}
@@ -113,7 +111,7 @@
try {
startXMLBaseAttribute(uri,name,value);
} catch (MalformedURLException e) {
- log.debug("XincludeTransformer", e);
+ getLogger().debug("XincludeTransformer", e);
throw new SAXException(e);
}
}
@@ -123,10 +121,10 @@
try {
processXIncludeElement(href, parse);
} catch (MalformedURLException e) {
- log.debug("XincludeTransformer", e);
+ getLogger().debug("XincludeTransformer", e);
throw new SAXException(e);
} catch (IOException e) {
- log.debug("XincludeTransformer", e);
+ getLogger().debug("XincludeTransformer", e);
throw new SAXException(e);
}
return;
@@ -150,7 +148,7 @@
if (current_xmlbase_uri == null) {
current_xmlbase_uri = base_xmlbase_uri;
}
- } catch (MalformedURLException e) {log.debug("XincludeTransformer",
e);}
+ } catch (MalformedURLException e)
{getLogger().debug("XincludeTransformer", e);}
super.setDocumentLocator(locator);
}
@@ -178,7 +176,7 @@
}
protected void processXIncludeElement(String href, String parse) throws
SAXException,MalformedURLException,IOException {
- log.debug("Processing XInclude element: href="+href+",
parse="+parse);
+ getLogger().debug("Processing XInclude element: href="+href+",
parse="+parse);
URL url;
String suffix;
int index = href.indexOf('#');
@@ -189,13 +187,13 @@
url =
urlFactory.getURL(current_xmlbase_uri,href.substring(0,index));
suffix = href.substring(index+1);
}
- log.debug("URL: "+url+"\nSuffix: "+suffix);
+ getLogger().debug("URL: "+url+"\nSuffix: "+suffix);
Object object = url.getContent();
- log.debug("Object: "+object);
+ getLogger().debug("Object: "+object);
if (parse.equals("text")) {
- log.debug("Parse type is text");
+ getLogger().debug("Parse type is text");
if (object instanceof Loggable) {
- ((Loggable)object).setLogger(this.log);
+ ((Loggable)object).setLogger(getLogger());
}
if (object instanceof Reader) {
Reader reader = (Reader)object;
@@ -220,18 +218,18 @@
}
}
} else if (parse.equals("xml")) {
- log.debug("Parse type is XML");
+ getLogger().debug("Parse type is XML");
Parser parser = null;
try {
- log.debug("Looking up " + Roles.PARSER);
+ getLogger().debug("Looking up " + Roles.PARSER);
parser = (Parser)manager.lookup(Roles.PARSER);
} catch (Exception e) {
- log.error("Could not find component", e);
+ getLogger().error("Could not find component", e);
return;
}
InputSource input;
if (object instanceof Loggable) {
- ((Loggable)object).setLogger(this.log);
+ ((Loggable)object).setLogger(getLogger());
}
if (object instanceof Reader) {
input = new InputSource((Reader)object);
@@ -242,7 +240,7 @@
}
if (suffix.startsWith("xpointer(") && suffix.endsWith(")")) {
String xpath = suffix.substring(9,suffix.length()-1);
- log.debug("XPath is "+xpath);
+ getLogger().debug("XPath is "+xpath);
DOMBuilder builder = new DOMBuilder(parser);
parser.setContentHandler(builder);
parser.setLexicalHandler(builder);
@@ -256,11 +254,12 @@
streamer.stream(list.item(i));
}
} catch (TransformerException e){
- log.error("TransformerException", e);
+ getLogger().error("TransformerException", e);
return;
}
} else {
XIncludeContentHandler xinclude_handler = new
XIncludeContentHandler(super.contentHandler,super.lexicalHandler);
+ xinclude_handler.setLogger(getLogger());
parser.setContentHandler(xinclude_handler);
parser.setLexicalHandler(xinclude_handler);
parser.parse(input);
@@ -268,7 +267,7 @@
}
}
- class XIncludeContentHandler implements ContentHandler, LexicalHandler {
+ class XIncludeContentHandler extends AbstractLoggable implements
ContentHandler, LexicalHandler {
private ContentHandler content_handler;
LexicalHandler lexical_handler;
@@ -283,12 +282,12 @@
}
public void startDocument() {
- log.debug("Internal start document received");
+ getLogger().debug("Internal start document received");
/** We don't pass start document on to the "real" handler **/
}
public void endDocument() {
- log.debug("Internal end document received");
+ getLogger().debug("Internal end document received");
/** We don't pass end document on to the "real" handler **/
}
@@ -304,7 +303,7 @@
public void startElement(String namespace, String name, String raw,
Attributes attr) throws SAXException {
- log.debug("Internal element received: "+name);
+ getLogger().debug("Internal element received: "+name);
content_handler.startElement(namespace,name,raw,attr);
}
No revision
No revision
1.1.2.7 +3 -11
xml-cocoon/src/org/apache/cocoon/xml/Attic/AbstractXMLConsumer.java
Index: AbstractXMLConsumer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/xml/Attic/AbstractXMLConsumer.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- AbstractXMLConsumer.java 2001/01/22 21:56:54 1.1.2.6
+++ AbstractXMLConsumer.java 2001/02/12 14:17:47 1.1.2.7
@@ -14,7 +14,7 @@
import org.xml.sax.ext.LexicalHandler;
import org.apache.log.Logger;
-import org.apache.avalon.Loggable;
+import org.apache.avalon.AbstractLoggable;
/**
* This abstract class provides default implementation of the methods
specified
@@ -22,17 +22,9 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/01/22 21:56:54 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/02/12 14:17:47 $
*/
-public abstract class AbstractXMLConsumer implements XMLConsumer, Loggable {
-
- protected Logger log;
-
- public void setLogger(Logger logger) {
- if (this.log == null) {
- this.log = logger;
- }
- }
+public abstract class AbstractXMLConsumer extends AbstractLoggable
implements XMLConsumer {
/**
* Receive an object for locating the origin of SAX document events.
1.1.2.9 +3 -12
xml-cocoon/src/org/apache/cocoon/xml/Attic/AbstractXMLProducer.java
Index: AbstractXMLProducer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/xml/Attic/AbstractXMLProducer.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- AbstractXMLProducer.java 2001/02/12 13:30:47 1.1.2.8
+++ AbstractXMLProducer.java 2001/02/12 14:17:47 1.1.2.9
@@ -10,8 +10,7 @@
import org.xml.sax.ContentHandler;
import org.xml.sax.ext.LexicalHandler;
-import org.apache.avalon.Loggable;
-import org.apache.log.Logger;
+import org.apache.avalon.AbstractLoggable;
import org.apache.avalon.Recyclable;
/**
@@ -20,12 +19,10 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/02/12 13:30:47 $
+ * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/02/12 14:17:47 $
*/
-public abstract class AbstractXMLProducer implements XMLProducer, Loggable,
Recyclable {
+public abstract class AbstractXMLProducer extends AbstractLoggable
implements XMLProducer, Recyclable {
- protected Logger log;
-
/** The <code>ContentHandler</code> receiving SAX events. */
protected ContentHandler contentHandler;
@@ -41,12 +38,6 @@
public void setConsumer(XMLConsumer consumer) {
this.contentHandler = consumer;
this.lexicalHandler = consumer;
- }
-
- public void setLogger(Logger logger) {
- if (this.log == null) {
- this.log = logger;
- }
}
/**
No revision
No revision
1.1.2.5 +3 -3
xml-cocoon/src/org/apache/cocoon/xml/dom/Attic/DOMStreamer.java
Index: DOMStreamer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/xml/dom/Attic/DOMStreamer.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- DOMStreamer.java 2001/01/23 17:59:41 1.1.2.4
+++ DOMStreamer.java 2001/02/12 14:17:49 1.1.2.5
@@ -37,7 +37,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/01/23 17:59:41 $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/02/12 14:17:49 $
*/
public class DOMStreamer extends AbstractXMLProducer {
@@ -86,7 +86,7 @@
try {
processNode((Node)object);
} catch (ClassCastException e) {
- log.error("DOMStreamer", e);
+ getLogger().error("DOMStreamer", e);
throw new SAXException(e);
}
}
@@ -136,7 +136,7 @@
" class "+n.getClass().getName());
}
} catch (ClassCastException e) {
- log.error("Error casting node to appropriate type", e);
+ getLogger().error("Error casting node to appropriate type", e);
throw new SAXException("Error casting node to appropriate type");
}
}
