Leverage optimization from the Axiom 1.2.7

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@774053 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 12 insertions, 8 deletions

diff --git a/branches/sca-java-1.x/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBCustomBuilder.java b/branches/sca-java-1.x/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBCustomBuilder.java
index b7a395a623..bf6a96023d 100644
--- a/branches/sca-java-1.x/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBCustomBuilder.java
+++ b/branches/sca-java-1.x/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBCustomBuilder.java
@@ -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 @@ public class JAXBCustomBuilder
         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 @@ public class JAXBCustomBuilder
             throw new OMException(e);
         }
     }
-    */
 
     /**
      * The namespace identifier for the SOAP 1.1 envelope.
@@ -89,7 +93,7 @@ public class JAXBCustomBuilder
      */
     private boolean shouldUnmarshal(String namespace, String localPart) {
 
-        // Don't unmarshall SOAPFaults or anything else in the SOAP 
+        // Don't unmarshall SOAPFaults or anything else in the SOAP
         // namespace.
         // Don't unmarshall elements that are unqualified
         if (localPart == null || namespace == null