vgritsenko 01/12/14 16:21:19
Modified: src/org/apache/cocoon/generation ServerPagesGenerator.java
src/org/apache/cocoon/transformation LDAPTransformer.java
SQLTransformer.java XIncludeTransformer.java
Log:
Fix bug #4062: ServerPagesGenerator now sets DocumentLocator
Revision Changes Path
1.20 +6 -1
xml-cocoon2/src/org/apache/cocoon/generation/ServerPagesGenerator.java
Index: ServerPagesGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/ServerPagesGenerator.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ServerPagesGenerator.java 2001/12/04 08:30:09 1.19
+++ ServerPagesGenerator.java 2001/12/15 00:21:19 1.20
@@ -58,7 +58,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
- * @version CVS $Revision: 1.19 $ $Date: 2001/12/04 08:30:09 $
+ * @version CVS $Revision: 1.20 $ $Date: 2001/12/15 00:21:19 $
*/
public class ServerPagesGenerator extends ServletGenerator
implements Recyclable, Disposable, Cacheable, Configurable
@@ -214,6 +214,11 @@
}
}
+ // Fixes BUG#4062: Set document locator which is used by XIncludeTransformer
+ org.xml.sax.helpers.LocatorImpl locator = new
org.xml.sax.helpers.LocatorImpl();
+ locator.setSystemId(this.inputSource.getSystemId());
+ this.contentHandler.setDocumentLocator(locator);
+
// log exception and ensure that generator is released.
try {
generator.generate();
1.9 +4 -2
xml-cocoon2/src/org/apache/cocoon/transformation/LDAPTransformer.java
Index: LDAPTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/LDAPTransformer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- LDAPTransformer.java 2001/10/25 20:22:45 1.8
+++ LDAPTransformer.java 2001/12/15 00:21:19 1.9
@@ -906,8 +906,10 @@
/** BEGIN SAX ContentHandler handlers **/
public void setDocumentLocator(Locator locator) {
- getLogger().info("PUBLIC ID"+locator.getPublicId());
- getLogger().info("SYSTEM ID"+locator.getSystemId());
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug( "PUBLIC ID: " + locator.getPublicId() );
+ getLogger().debug( "SYSTEM ID: " + locator.getSystemId() );
+ }
if (super.contentHandler != null)
super.contentHandler.setDocumentLocator(locator);
}
1.24 +5 -3
xml-cocoon2/src/org/apache/cocoon/transformation/SQLTransformer.java
Index: SQLTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/SQLTransformer.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- SQLTransformer.java 2001/11/28 11:45:39 1.23
+++ SQLTransformer.java 2001/12/15 00:21:19 1.24
@@ -35,7 +35,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
* (PWR Organisation & Entwicklung)
* @author <a href="mailto:[EMAIL PROTECTED]";>Sven Beauprez</a>
- * @version CVS $Revision: 1.23 $ $Date: 2001/11/28 11:45:39 $ $Author: cziegeler $
+ * @version CVS $Revision: 1.24 $ $Date: 2001/12/15 00:21:19 $ $Author: vgritsenko $
*/
public class SQLTransformer extends AbstractTransformer implements Composable,
Recyclable, Disposable, Configurable {
@@ -644,8 +644,10 @@
public void setDocumentLocator( Locator locator ) {
- getLogger().info( "PUBLIC ID: " + locator.getPublicId() );
- getLogger().info( "SYSTEM ID: " + locator.getSystemId() );
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug( "PUBLIC ID: " + locator.getPublicId() );
+ getLogger().debug( "SYSTEM ID: " + locator.getSystemId() );
+ }
if ( super.contentHandler != null )
super.contentHandler.setDocumentLocator( locator );
}
1.20 +8 -9
xml-cocoon2/src/org/apache/cocoon/transformation/XIncludeTransformer.java
Index: XIncludeTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/XIncludeTransformer.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- XIncludeTransformer.java 2001/10/19 11:44:55 1.19
+++ XIncludeTransformer.java 2001/12/15 00:21:19 1.20
@@ -41,7 +41,7 @@
* by the SAX event FSM yet.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Donald Ball</a>
- * @version CVS $Revision: 1.19 $ $Date: 2001/10/19 11:44:55 $ $Author: morrijr $
+ * @version CVS $Revision: 1.20 $ $Date: 2001/12/15 00:21:19 $ $Author: vgritsenko $
*/
public class XIncludeTransformer extends AbstractTransformer implements Composable,
Recyclable, Disposable {
@@ -99,7 +99,7 @@
try {
startXMLBaseAttribute(uri,name,value);
} catch (ProcessingException e) {
- getLogger().debug("XincludeTransformer", e);
+ getLogger().debug("Rethrowing exception", e);
throw new SAXException(e);
}
}
@@ -112,10 +112,10 @@
try {
processXIncludeElement(href, parse);
} catch (ProcessingException e) {
- getLogger().debug("XincludeTransformer", e);
+ getLogger().debug("Rethrowing exception", e);
throw new SAXException(e);
} catch (IOException e) {
- getLogger().debug("XincludeTransformer", e);
+ getLogger().debug("Rethrowing exception", e);
throw new SAXException(e);
}
return;
@@ -135,9 +135,8 @@
public void setDocumentLocator(Locator locator) {
try {
-
if (getLogger().isDebugEnabled()) {
- getLogger().debug("XIncludeTransformer: setDocumentLocator called "
+ locator.getSystemId());
+ getLogger().debug("setDocumentLocator called " +
locator.getSystemId());
}
base_xmlbase_uri = this.resolver.resolve(locator.getSystemId());
@@ -151,7 +150,7 @@
current_xmlbase_uri = base_xmlbase_uri;
}
- } catch (Exception e) {getLogger().debug("XincludeTransformer", e);}
+ } catch (Exception e) { getLogger().debug("Exception ignored", e); }
super.setDocumentLocator(locator);
}
@@ -163,7 +162,7 @@
}
if (getLogger().isDebugEnabled()) {
- getLogger().debug("XIncludeTransformer: XMLBase = " + urlLoc);
+ getLogger().debug("XMLBase = " + urlLoc);
}
if (current_xmlbase_uri != null) {
@@ -185,7 +184,7 @@
protected void endXMLBaseAttribute() {
if (getLogger().isDebugEnabled()) {
- getLogger().debug("XIncludeTransformer: XMLBase ended");
+ getLogger().debug("XMLBase ended");
}
if (xmlbase_stack.size() > 0) {
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
