vgritsenko 2003/10/29 06:27:07
Modified: src/blocks/xmldb/java/org/apache/cocoon/generation
XMLDBCollectionGenerator.java XMLDBGenerator.java
Log:
this.getLogger() -> getLogger()
Revision Changes Path
1.3 +9 -9
cocoon-2.1/src/blocks/xmldb/java/org/apache/cocoon/generation/XMLDBCollectionGenerator.java
Index: XMLDBCollectionGenerator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/xmldb/java/org/apache/cocoon/generation/XMLDBCollectionGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLDBCollectionGenerator.java 19 Mar 2003 15:42:16 -0000 1.2
+++ XMLDBCollectionGenerator.java 29 Oct 2003 14:27:07 -0000 1.3
@@ -95,7 +95,7 @@
* @deprecated Use the XML:DB pseudo protocol instead.
*/
public class XMLDBCollectionGenerator extends ComposerGenerator
- implements CacheableProcessingComponent, Configurable,Initializable {
+ implements CacheableProcessingComponent, Configurable, Initializable
{
protected static final String URI =
"http://apache.org/cocoon/xmldb/1.0";;
@@ -158,12 +158,12 @@
database = (Database)c.newInstance();
DatabaseManager.registerDatabase(database);
} catch (XMLDBException xde) {
- this.getLogger().error("Unable to connect to the XML:DB
database");
+ getLogger().error("Unable to connect to the XML:DB database");
throw new ProcessingException("Unable to connect to the XML DB"
+ xde.getMessage());
} catch (Exception e) {
- this.getLogger().error("There was a problem setting up the
connection");
- this.getLogger().error("Make sure that your driver is available");
+ getLogger().error("There was a problem setting up the
connection");
+ getLogger().error("Make sure that your driver is available");
throw new ProcessingException("Problem setting up the connection:
"
+ e.getMessage());
}
@@ -217,8 +217,8 @@
throw new ProcessingException("Unable to fetch content '"
+ source + "':" +
xde.getMessage());
} catch (NullPointerException npe) {
- this.getLogger().error("The XML:DB driver raised an exception");
- this.getLogger().error("probably the document was not found");
+ getLogger().error("The XML:DB driver raised an exception");
+ getLogger().error("probably the document was not found");
throw new ProcessingException("Null pointer exception while " +
"retrieving document : " +
npe.getMessage());
}
@@ -282,8 +282,8 @@
this.xmlConsumer.endPrefixMapping(PREFIX);
this.xmlConsumer.endDocument();
} catch (XMLDBException xde) {
- this.getLogger().warn("Collection listing failed" +
xde.getMessage());
- throw new SAXException("Collection listing failed" +
xde.getMessage());
+ getLogger().warn("Collection listing failed: " +
xde.getMessage());
+ throw new SAXException("Collection listing failed: " +
xde.getMessage());
}
}
}
1.3 +6 -6
cocoon-2.1/src/blocks/xmldb/java/org/apache/cocoon/generation/XMLDBGenerator.java
Index: XMLDBGenerator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/xmldb/java/org/apache/cocoon/generation/XMLDBGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLDBGenerator.java 19 Mar 2003 15:42:16 -0000 1.2
+++ XMLDBGenerator.java 29 Oct 2003 14:27:07 -0000 1.3
@@ -151,12 +151,12 @@
database = (Database)c.newInstance();
DatabaseManager.registerDatabase(database);
} catch (XMLDBException xde) {
- this.getLogger().error("Unable to connect to the XML:DB
database");
+ getLogger().error("Unable to connect to the XML:DB database");
throw new ProcessingException("Unable to connect to the XMLDB
database: "
+ xde.getMessage());
} catch (Exception e) {
- this.getLogger().error("There was a problem setting up the
connection");
- this.getLogger().error("Make sure that your driver is
available");
+ getLogger().error("There was a problem setting up the
connection");
+ getLogger().error("Make sure that your driver is available");
throw new ProcessingException("Problem setting up the
connection: "
+ e.getMessage());
}
@@ -212,8 +212,8 @@
throw new ProcessingException("Unable to fetch content: " +
xde.getMessage());
} catch (NullPointerException npe) {
- this.getLogger().error("The XML:DB driver raised an exception");
- this.getLogger().error("probably the document was not found");
+ getLogger().error("The XML:DB driver raised an exception");
+ getLogger().error("probably the document was not found");
throw new ProcessingException("Null pointer exception while " +
"retrieving document : " +
npe.getMessage());
}
