cziegeler 02/01/03 06:56:56
Modified: src/java/org/apache/cocoon/components/source
XMLDBSource.java
src/java/org/apache/cocoon/components/xslt
XSLTProcessorImpl.java
src/java/org/apache/cocoon/generation ScriptGenerator.java
src/java/org/apache/cocoon/transformation
XIncludeTransformer.java
Log:
Fixed handling of ProcessingException
Revision Changes Path
1.2 +4 -9
xml-cocoon2/src/java/org/apache/cocoon/components/source/XMLDBSource.java
Index: XMLDBSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/XMLDBSource.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLDBSource.java 3 Jan 2002 12:31:14 -0000 1.1
+++ XMLDBSource.java 3 Jan 2002 14:56:55 -0000 1.2
@@ -50,7 +50,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Gianugo Rabellino</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Vadim Gritsenko</a>
- * @version $Id: XMLDBSource.java,v 1.1 2002/01/03 12:31:14 giacomo Exp $
+ * @version $Id: XMLDBSource.java,v 1.2 2002/01/03 14:56:55 cziegeler Exp $
*/
public class XMLDBSource extends AbstractSAXSource {
@@ -141,7 +141,8 @@
*
*/
- public void connect() throws Exception {
+ public void connect()
+ throws ProcessingException {
if (log.isDebugEnabled()) {
this.log.debug("Initializing XML:DB connection");
@@ -181,13 +182,7 @@
public void toSAX(ContentHandler handler) throws SAXException,
ProcessingException {
if (!connected) {
- try {
- this.connect();
- } catch (Exception e) {
- this.log.error("Unable to connect to the database", e);
- throw new ProcessingException("Unable to connect to the database: "
+
- e.getMessage());
- }
+ this.connect();
}
if (url.endsWith("/"))
this.collectionToSAX(handler);
1.2 +4 -0
xml-cocoon2/src/java/org/apache/cocoon/components/xslt/XSLTProcessorImpl.java
Index: XSLTProcessorImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/xslt/XSLTProcessorImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XSLTProcessorImpl.java 3 Jan 2002 12:31:15 -0000 1.1
+++ XSLTProcessorImpl.java 3 Jan 2002 14:56:56 -0000 1.2
@@ -177,6 +177,8 @@
// Create an XMLReader and set its ContentHandler.
XMLReader reader = XMLReaderFactory.createXMLReader();
+ reader.setFeature("http://xml.org/sax/features/namespace-prefixes";,
+ true);
if (filter != null) {
filter.setParent(reader);
@@ -225,6 +227,8 @@
handler.getTransformer()
.setErrorListener(new TraxErrorHandler(getLogger()));
return handler;
+ } catch (ProcessingException e) {
+ throw e;
} catch (Exception e) {
throw new ProcessingException("Error in creating Transform Handler", e);
}
1.2 +3 -1
xml-cocoon2/src/java/org/apache/cocoon/generation/ScriptGenerator.java
Index: ScriptGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/ScriptGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ScriptGenerator.java 3 Jan 2002 12:31:16 -0000 1.1
+++ ScriptGenerator.java 3 Jan 2002 14:56:56 -0000 1.2
@@ -45,7 +45,7 @@
* </pre>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason Foster</a>
- * @version CVS $Revision: 1.1 $ $Date: 2002/01/03 12:31:16 $
+ * @version CVS $Revision: 1.2 $ $Date: 2002/01/03 14:56:56 $
*/
public class ScriptGenerator extends ComposerGenerator implements Configurable,
Recyclable {
@@ -166,6 +166,8 @@
parser = (Parser)(this.manager.lookup(Parser.ROLE));
parser.setConsumer(this.xmlConsumer);
parser.parse(xmlInput);
+ } catch (ProcessingException e) {
+ throw e;
} catch (FileNotFoundException e) {
throw new ResourceNotFoundException(
"Could not load script " + this.inputSource.getSystemId(), e);
1.2 +6 -1
xml-cocoon2/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java
Index: XIncludeTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XIncludeTransformer.java 3 Jan 2002 12:31:20 -0000 1.1
+++ XIncludeTransformer.java 3 Jan 2002 14:56:56 -0000 1.2
@@ -41,7 +41,7 @@
* by the SAX event FSM yet.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Donald Ball</a>
- * @version CVS $Revision: 1.1 $ $Date: 2002/01/03 12:31:20 $ $Author: giacomo $
+ * @version CVS $Revision: 1.2 $ $Date: 2002/01/03 14:56:56 $ $Author: cziegeler $
*/
public class XIncludeTransformer extends AbstractTransformer implements Composable,
Recyclable, Disposable {
@@ -177,6 +177,8 @@
xmlbase_element_name_stack.push(last_xmlbase_element_name);
last_xmlbase_element_name = name;
+ } catch (ProcessingException e) {
+ throw e;
} catch (Exception e) {
throw new ProcessingException("Could not resolve '" + urlLoc + "'", e);
}
@@ -263,6 +265,9 @@
parser.parse(input);
}
} catch(SAXException e) {
+ getLogger().error("Error in processXIncludeElement", e);
+ throw e;
+ } catch(ProcessingException e) {
getLogger().error("Error in processXIncludeElement", e);
throw e;
} catch(MalformedURLException e) {
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
