Author: rfeng
Date: Tue May 12 20:44:30 2009
New Revision: 774074
URL: http://svn.apache.org/viewvc?rev=774074&view=rev
Log:
Remove unused classes
Added:
tuscany/branches/sca-java-1.x/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBCustomBuilder.java
Removed:
tuscany/branches/sca-java-1.x/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/
Modified:
tuscany/branches/sca-java-1.x/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBDataSource.java
tuscany/branches/sca-java-1.x/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java
Added:
tuscany/branches/sca-java-1.x/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBCustomBuilder.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBCustomBuilder.java?rev=774074&view=auto
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBCustomBuilder.java
(added)
+++
tuscany/branches/sca-java-1.x/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBCustomBuilder.java
Tue May 12 20:44:30 2009
@@ -0,0 +1,116 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tuscany.sca.databinding.jaxb.axiom;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
+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 implements CustomBuilder {
+ private Class<?> type;
+ private JAXBContext jaxbContext;
+ private Unmarshaller unmarshaller;
+
+ /**
+ * Create a JAXBCustomBuilder
+ * @param context JAXBDSContext
+ */
+ public JAXBCustomBuilder(JAXBContext context, Class<?> type, Unmarshaller
unmarshaller) {
+ super();
+ this.type = type;
+ this.jaxbContext = context;
+ this.unmarshaller = unmarshaller;
+ }
+
+ public OMElement create(String namespace,
+ String localPart,
+ OMContainer parent,
+ XMLStreamReader reader,
+ OMFactory factory) throws OMException {
+
+ // There are some situations where we want to use normal
+ // unmarshalling, so return null
+ if (!shouldUnmarshal(namespace, localPart)) {
+ return null;
+ }
+ try {
+ // Create an OMSourcedElement backed by an unmarshalled JAXB object
+ OMNamespace ns = factory.createOMNamespace(namespace,
reader.getPrefix());
+
+ Object jaxb = unmarshaller.unmarshal(reader, type);
+
+ OMDataSource ds = new JAXBDataSource(jaxb, jaxbContext);
+ OMElement omse = factory.createOMElement(ds, localPart, ns);
+
+ parent.addChild(omse);
+ return omse;
+ } catch (JAXBException e) {
+ throw new OMException(e);
+ }
+ }
+
+ /**
+ * The namespace identifier for the SOAP 1.1 envelope.
+ */
+ public static final String URI_NS_SOAP_1_1_ENVELOPE =
"http://schemas.xmlsoap.org/soap/envelope/";;
+ /**
+ * The namespace identifier for the SOAP 1.2 envelope.
+ */
+ public static final String URI_NS_SOAP_1_2_ENVELOPE =
"http://www.w3.org/2003/05/soap-envelope";;
+
+ /**
+ * @param namespace
+ * @param localPart
+ * @return true if this ns and local part is acceptable for unmarshalling
+ */
+ private boolean shouldUnmarshal(String namespace, String localPart) {
+
+ // Don't unmarshall SOAPFaults or anything else in the SOAP
+ // namespace.
+ // Don't unmarshall elements that are unqualified
+ if (localPart == null || namespace == null
+ || namespace.length() == 0
+ || URI_NS_SOAP_1_1_ENVELOPE.equals(namespace)
+ || URI_NS_SOAP_1_2_ENVELOPE.equals(namespace)) {
+ return false;
+ }
+
+ // Don't unmarshal if this looks like encrypted data
+ if (localPart.equals("EncryptedData")) {
+ return false;
+ }
+
+ return true;
+
+ }
+}
Modified:
tuscany/branches/sca-java-1.x/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBDataSource.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBDataSource.java?rev=774074&r1=774073&r2=774074&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBDataSource.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBDataSource.java
Tue May 12 20:44:30 2009
@@ -105,6 +105,8 @@
public Object run() throws Exception {
try {
Marshaller marshaller = getMarshaller();
+ // Marshalling directly to the output stream is faster
than marshalling through the
+ // XMLStreamWriter. Take advantage of this
optimization if there is an output stream.
OutputStream os = getOutputStream(xmlWriter);
if (os != null) {
marshaller.marshal(element, os);
Modified:
tuscany/branches/sca-java-1.x/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java?rev=774074&r1=774073&r2=774074&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java
Tue May 12 20:44:30 2009
@@ -6,15 +6,15 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
+ * under the License.
*/
package org.apache.tuscany.sca.databinding.jaxb.axiom;
@@ -45,7 +45,6 @@
return org.apache.axiom.om.OMElement.class.getName();
}
- @SuppressWarnings("unchecked")
public Object transform(final OMElement source, final
TransformationContext context) throws TransformationException {
try {
return AccessController.doPrivileged(new
PrivilegedExceptionAction<Object>() {
@@ -53,14 +52,13 @@
Unmarshaller unmarshaller = null;
XMLStreamReader reader = null;
Object result = null;
- // Marshalling directly to the output stream is faster
than marshalling through the
- // XMLStreamWriter.
- // Take advantage of this optimization if there is an
output stream.
+
JAXBContext jaxbContext =
JAXBContextHelper.createJAXBContext(context, false);
try {
+ Class<?> type =
JAXBContextHelper.getJavaType(context.getTargetDataType());
unmarshaller =
JAXBContextHelper.getUnmarshaller(jaxbContext);
reader = source.getXMLStreamReaderWithoutCaching();
- result = unmarshaller.unmarshal(reader,
JAXBContextHelper.getJavaType(context.getTargetDataType()));
+ result = unmarshaller.unmarshal(reader, type);
} finally {
if (reader != null) {
reader.close();
