Author: veithen
Date: Sat Jul 18 23:27:13 2009
New Revision: 795447
URL: http://svn.apache.org/viewvc?rev=795447&view=rev
Log:
Use IOException instead of XMLStreamException for errors related to DataHandler
loading.
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/ext/stax/datahandler/DataHandlerProvider.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMStAXWrapper.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/MimePartProvider.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPDecodingStreamReader.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodingStreamReader.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/xop/OMAttachmentAccessorMimePartProvider.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextNodeImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMTextImpl.java
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/ext/stax/datahandler/DataHandlerProvider.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/ext/stax/datahandler/DataHandlerProvider.java?rev=795447&r1=795446&r2=795447&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/ext/stax/datahandler/DataHandlerProvider.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/ext/stax/datahandler/DataHandlerProvider.java
Sat Jul 18 23:27:13 2009
@@ -19,8 +19,9 @@
package org.apache.axiom.ext.stax.datahandler;
+import java.io.IOException;
+
import javax.activation.DataHandler;
-import javax.xml.stream.XMLStreamException;
/**
* Interface used for deferred loading of binary content.
@@ -48,7 +49,7 @@
*
* @return the binary content
*
- * @throws XMLStreamException if an error occurs while loading the
{...@link DataHandler}
+ * @throws IOException if an error occurs while loading the {...@link
DataHandler}
*/
- DataHandler getDataHandler() throws XMLStreamException;
+ DataHandler getDataHandler() throws IOException;
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMStAXWrapper.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMStAXWrapper.java?rev=795447&r1=795446&r2=795447&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMStAXWrapper.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMStAXWrapper.java
Sat Jul 18 23:27:13 2009
@@ -19,6 +19,8 @@
package org.apache.axiom.om.impl;
+import java.io.IOException;
+
import javax.activation.DataHandler;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -129,7 +131,7 @@
if (xopEncoder.getContentIDs().contains(contentID)) {
try {
return xopEncoder.getDataHandler(contentID);
- } catch (XMLStreamException ex) {
+ } catch (IOException ex) {
throw new OMException(ex);
}
} else {
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/MimePartProvider.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/MimePartProvider.java?rev=795447&r1=795446&r2=795447&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/MimePartProvider.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/MimePartProvider.java
Sat Jul 18 23:27:13 2009
@@ -19,8 +19,9 @@
package org.apache.axiom.util.stax.xop;
+import java.io.IOException;
+
import javax.activation.DataHandler;
-import javax.xml.stream.XMLStreamException;
/**
* Interface used by {...@link XOPDecodingStreamReader} to load MIME parts
referenced by
@@ -44,8 +45,8 @@
* @param contentID the content ID
* @return the {...@link DataHandler} for the MIME part identified by the
content ID; may not
* be <code>null</code>
- * @throws XMLStreamException if the MIME part was not found or if an
error occurred while
+ * @throws IOException if the MIME part was not found or if an error
occurred while
* loading the part
*/
- DataHandler getMimePart(String contentID) throws XMLStreamException;
+ DataHandler getMimePart(String contentID) throws IOException;
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPDecodingStreamReader.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPDecodingStreamReader.java?rev=795447&r1=795446&r2=795447&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPDecodingStreamReader.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPDecodingStreamReader.java
Sat Jul 18 23:27:13 2009
@@ -77,7 +77,7 @@
return mimePartProvider.isLoaded(contentID);
}
- public DataHandler getDataHandler() throws XMLStreamException {
+ public DataHandler getDataHandler() throws IOException {
return mimePartProvider.getMimePart(contentID);
}
}
@@ -264,7 +264,12 @@
if (event == START_ELEMENT
&& parent.getLocalName().equals(XOPConstants.INCLUDE)
&&
parent.getNamespaceURI().equals(XOPConstants.NAMESPACE_URI)) {
- return toBase64(mimePartProvider.getMimePart(processXopInclude()));
+ String contentID = processXopInclude();
+ try {
+ return toBase64(mimePartProvider.getMimePart(contentID));
+ } catch (IOException ex) {
+ throw new XMLStreamException("Failed to load MIME part '" +
contentID + "'", ex);
+ }
} else {
String text = null;
StringBuffer buffer = null;
@@ -401,7 +406,11 @@
private String toBase64() throws XMLStreamException {
if (base64 == null) {
- base64 = toBase64(dh.getDataHandler());
+ try {
+ base64 = toBase64(dh.getDataHandler());
+ } catch (IOException ex) {
+ throw new XMLStreamException("Failed to load MIME part '" +
dh.getContentID() + "'", ex);
+ }
}
return base64;
}
@@ -531,7 +540,11 @@
}
public DataHandler getDataHandler() throws XMLStreamException{
- return dh.getDataHandler();
+ try {
+ return dh.getDataHandler();
+ } catch (IOException ex) {
+ throw new XMLStreamException("Failed to load MIME part '" +
dh.getContentID() + "'");
+ }
}
public DataHandlerProvider getDataHandlerProvider() {
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodingStreamReader.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodingStreamReader.java?rev=795447&r1=795446&r2=795447&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodingStreamReader.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodingStreamReader.java
Sat Jul 18 23:27:13 2009
@@ -19,6 +19,7 @@
package org.apache.axiom.util.stax.xop;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -170,10 +171,10 @@
* @throws XMLStreamException if the content ID is unknown or an error
occurred while loading
* the data handler
*/
- public DataHandler getDataHandler(String contentID) throws
XMLStreamException {
+ public DataHandler getDataHandler(String contentID) throws IOException {
Object dataHandlerObject = dataHandlerObjects.get(contentID);
if (dataHandlerObject == null) {
- throw new XMLStreamException("No DataHandler object found for
content ID '" +
+ throw new IOException("No DataHandler object found for content ID
'" +
contentID + "'");
} else if (dataHandlerObject instanceof DataHandler) {
return (DataHandler)dataHandlerObject;
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/xop/OMAttachmentAccessorMimePartProvider.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/xop/OMAttachmentAccessorMimePartProvider.java?rev=795447&r1=795446&r2=795447&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/xop/OMAttachmentAccessorMimePartProvider.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/xop/OMAttachmentAccessorMimePartProvider.java
Sat Jul 18 23:27:13 2009
@@ -19,6 +19,8 @@
package org.apache.axiom.util.stax.xop;
+import java.io.IOException;
+
import javax.activation.DataHandler;
import javax.xml.stream.XMLStreamException;
@@ -39,10 +41,10 @@
return false;
}
- public DataHandler getMimePart(String contentID) throws XMLStreamException
{
+ public DataHandler getMimePart(String contentID) throws IOException {
DataHandler dh = attachments.getDataHandler(contentID);
if (dh == null) {
- throw new XMLStreamException("No attachment found for content ID
'" + contentID + "'");
+ throw new IOException("No attachment found for content ID '" +
contentID + "'");
} else {
return dh;
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextNodeImpl.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextNodeImpl.java?rev=795447&r1=795446&r2=795447&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextNodeImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextNodeImpl.java
Sat Jul 18 23:27:13 2009
@@ -449,7 +449,7 @@
} else if (dataHandlerObject instanceof DataHandlerProvider) {
try {
dataHandlerObject =
((DataHandlerProvider)dataHandlerObject).getDataHandler();
- } catch (XMLStreamException ex) {
+ } catch (IOException ex) {
throw new OMException(ex);
}
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMTextImpl.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMTextImpl.java?rev=795447&r1=795446&r2=795447&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMTextImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMTextImpl.java
Sat Jul 18 23:27:13 2009
@@ -384,7 +384,7 @@
} else if (dataHandlerObject instanceof DataHandlerProvider) {
try {
dataHandlerObject =
((DataHandlerProvider)dataHandlerObject).getDataHandler();
- } catch (XMLStreamException ex) {
+ } catch (IOException ex) {
throw new OMException(ex);
}
}
