Author: rfeng
Date: Wed Oct 15 09:06:49 2008
New Revision: 704946
URL: http://svn.apache.org/viewvc?rev=704946&view=rev
Log:
Update to axiom 1.2.7 OMDataSourceExt
Modified:
tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBCustomBuilder.java
tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDSContext.java
tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDataSourceExt.java
tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/SourceDataSource.java
tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStringDataSource.java
Modified:
tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBCustomBuilder.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBCustomBuilder.java?rev=704946&r1=704945&r2=704946&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBCustomBuilder.java
(original)
+++
tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBCustomBuilder.java
Wed Oct 15 09:06:49 2008
@@ -19,15 +19,22 @@
package org.apache.tuscany.sca.databinding.jaxb.axiom.ext;
+import javax.xml.bind.JAXBException;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.axiom.om.OMContainer;
+import org.apache.axiom.om.OMDataSource;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMException;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.om.impl.builder.CustomBuilder;
/**
* JAXBCustomBuilder creates an OMSourcedElement backed by a JAXBDataSource
* for the specified namespace and localPart.
*/
-public class JAXBCustomBuilder
-//FIXME: [rfeng] Re-enable it after we move to AXIOM 1.2.7
-// implements CustomBuilder
-{
+public class JAXBCustomBuilder implements CustomBuilder {
private JAXBDSContext jdsContext;
@@ -40,8 +47,6 @@
this.jdsContext = context;
}
- // FIXME: [rfeng] Re-enable it after we move to AXIOM 1.2.7
- /*
public OMElement create(String namespace,
String localPart,
OMContainer parent,
@@ -71,7 +76,6 @@
throw new OMException(e);
}
}
- */
/**
* The namespace identifier for the SOAP 1.1 envelope.
Modified:
tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDSContext.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDSContext.java?rev=704946&r1=704945&r2=704946&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDSContext.java
(original)
+++
tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDSContext.java
Wed Oct 15 09:06:49 2008
@@ -117,9 +117,9 @@
* @param writer XMLStreamWriter
*/
private static void marshalElement(final Object b,
- final Marshaller m,
- final XMLStreamWriter writer,
- final boolean optimize) {
+ final Marshaller m,
+ final XMLStreamWriter writer,
+ final boolean optimize) {
AccessController.doPrivileged(new PrivilegedAction<Object>() {
public Object run() {
// Marshalling directly to the output stream is faster than
marshalling through the
Modified:
tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDataSourceExt.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDataSourceExt.java?rev=704946&r1=704945&r2=704946&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDataSourceExt.java
(original)
+++
tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDataSourceExt.java
Wed Oct 15 09:06:49 2008
@@ -33,19 +33,17 @@
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
+import org.apache.axiom.om.OMDataSourceExt;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMOutputFormat;
+import org.apache.axiom.om.ds.OMDataSourceExtBase;
import org.apache.axiom.om.impl.MTOMXMLStreamWriter;
import org.apache.axiom.om.util.StAXUtils;
/**
* OMDataSource backed by a jaxb object
*/
-public class JAXBDataSourceExt
-
-//FIXME: [rfeng] Re-enable it after we move to AXIOM 1.2.7
-// extends OMDataSourceExtBase
-{
+public class JAXBDataSourceExt extends OMDataSourceExtBase {
private static final Logger log =
Logger.getLogger(JAXBDataSourceExt.class.getName());
@@ -61,10 +59,9 @@
public void close() {
}
- // FIXME: [rfeng] Re-enable it after we move to AXIOM 1.2.7
- // public OMDataSourceExt copy() {
- // return new JAXBDataSourceExt(jaxb, context);
- // }
+ public OMDataSourceExt copy() {
+ return new JAXBDataSourceExt(jaxb, context);
+ }
public Object getObject() {
return jaxb;
Modified:
tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/SourceDataSource.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/SourceDataSource.java?rev=704946&r1=704945&r2=704946&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/SourceDataSource.java
(original)
+++
tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/SourceDataSource.java
Wed Oct 15 09:06:49 2008
@@ -34,16 +34,15 @@
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
+import org.apache.axiom.om.OMDataSourceExt;
import org.apache.axiom.om.OMException;
+import org.apache.axiom.om.ds.OMDataSourceExtBase;
import org.apache.axiom.om.util.StAXUtils;
/**
* OMDataSource backed by a source
*/
-public class SourceDataSource
-// FIXME: [rfeng] Re-enable it after we move to AXIOM 1.2.7
-// extends OMDataSourceExtBase
-{
+public class SourceDataSource extends OMDataSourceExtBase {
private Source data;
public SourceDataSource(Source data) {
@@ -54,10 +53,9 @@
public void close() {
}
- // FIXME: [rfeng] Re-enable it after we move to AXIOM 1.2.7
- // public OMDataSourceExt copy() {
- // return new SourceDataSource(data);
- // }
+ public OMDataSourceExt copy() {
+ return new SourceDataSource(data);
+ }
public Object getObject() {
return data;
Modified:
tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStringDataSource.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStringDataSource.java?rev=704946&r1=704945&r2=704946&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStringDataSource.java
(original)
+++
tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStringDataSource.java
Wed Oct 15 09:06:49 2008
@@ -27,18 +27,15 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
+import org.apache.axiom.om.OMDataSourceExt;
import org.apache.axiom.om.OMOutputFormat;
+import org.apache.axiom.om.ds.OMDataSourceExtBase;
import org.apache.axiom.om.util.StAXUtils;
/**
* OMDataSource backed by a string containing xml data
*/
-// FIXME: To be refectored into databinding-axiom
-public class XMLStringDataSource
-
-//FIXME: [rfeng] Re-enable it after we move to AXIOM 1.2.7
-// extends OMDataSourceExtBase
-{
+public class XMLStringDataSource extends OMDataSourceExtBase {
private String data;
public XMLStringDataSource(String data) {
@@ -49,10 +46,9 @@
public void close() {
}
- // FIXME: [rfeng] Re-enable it after we move to AXIOM 1.2.7
- // public OMDataSourceExt copy() {
- // return new XMLStringDataSource(data);
- // }
+ public OMDataSourceExt copy() {
+ return new XMLStringDataSource(data);
+ }
public Object getObject() {
return data;
