Author: davsclaus
Date: Fri Sep 21 14:30:00 2012
New Revision: 1388525
URL: http://svn.apache.org/viewvc?rev=1388525&view=rev
Log:
CAMEL-5634: camel-jaxb/camel-soap supports namespace prefix mapper. So people
can control that. Avoid hard dependency on SUN implementation as this is
JAXB-impl specific.
Added:
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbNamespacePrefixMapper.java
(with props)
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/NamespacePrefixMapperFactory.java
(with props)
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/mapper/
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/mapper/SunJaxb21NamespacePrefixMapper.java
(with props)
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbMarshalNamespacePrefixMapperTest.java
(with props)
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java
camel/trunk/components/camel-jaxb/pom.xml
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
camel/trunk/components/camel-jaxb/src/test/resources/org/apache/camel/example/jaxb.index
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java?rev=1388525&r1=1388524&r2=1388525&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
Fri Sep 21 14:30:00 2012
@@ -51,6 +51,8 @@ public class JaxbDataFormat extends Data
private String partClass;
@XmlAttribute
private String partNamespace;
+ @XmlAttribute
+ private String namespacePrefixRef;
public JaxbDataFormat() {
super("jaxb");
@@ -125,6 +127,14 @@ public class JaxbDataFormat extends Data
this.partNamespace = partNamespace;
}
+ public String getNamespacePrefixRef() {
+ return namespacePrefixRef;
+ }
+
+ public void setNamespacePrefixRef(String namespacePrefixRef) {
+ this.namespacePrefixRef = namespacePrefixRef;
+ }
+
@Override
protected void configureDataFormat(DataFormat dataFormat) {
Boolean answer = ObjectHelper.toBoolean(getPrettyPrint());
@@ -160,6 +170,9 @@ public class JaxbDataFormat extends Data
if (encoding != null) {
setProperty(dataFormat, "encoding", encoding);
}
+ if (namespacePrefixRef != null) {
+ setProperty(dataFormat, "namespacePrefixRef", namespacePrefixRef);
+ }
setProperty(dataFormat, "contextPath", contextPath);
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java?rev=1388525&r1=1388524&r2=1388525&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java
Fri Sep 21 14:30:00 2012
@@ -38,6 +38,8 @@ public class SoapJaxbDataFormat extends
private Object elementNameStrategy;
@XmlAttribute
private String version;
+ @XmlAttribute
+ private String namespacePrefixRef;
public SoapJaxbDataFormat() {
super("soapjaxb");
@@ -114,6 +116,9 @@ public class SoapJaxbDataFormat extends
if (version != null) {
setProperty(dataFormat, "version", version);
}
+ if (namespacePrefixRef != null) {
+ setProperty(dataFormat, "namespacePrefixRef", namespacePrefixRef);
+ }
setProperty(dataFormat, "contextPath", contextPath);
}
Modified: camel/trunk/components/camel-jaxb/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/pom.xml?rev=1388525&r1=1388524&r2=1388525&view=diff
==============================================================================
--- camel/trunk/components/camel-jaxb/pom.xml (original)
+++ camel/trunk/components/camel-jaxb/pom.xml Fri Sep 21 14:30:00 2012
@@ -30,7 +30,10 @@
<description>Camel JAXB support</description>
<properties>
-
<camel.osgi.export.pkg>org.apache.camel.converter.jaxb.*</camel.osgi.export.pkg>
+ <camel.osgi.import.before.defaults>
+ com.sun.xml.bind.marshaller;resolution:=optional
+ </camel.osgi.import.before.defaults>
+
<camel.osgi.export.pkg>org.apache.camel.converter.jaxb.*</camel.osgi.export.pkg>
</properties>
<dependencies>
Modified:
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java?rev=1388525&r1=1388524&r2=1388525&view=diff
==============================================================================
---
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
(original)
+++
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
Fri Sep 21 14:30:00 2012
@@ -21,6 +21,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
+import java.util.Map;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
@@ -38,6 +39,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.TypeConverter;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.support.ServiceSupport;
+import org.apache.camel.util.CamelContextHelper;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
@@ -64,6 +66,9 @@ public class JaxbDataFormat extends Serv
private QName partNamespace;
private String partClass;
private Class<Object> partialClass;
+ private String namespacePrefixRef;
+ private Map<String, String> namespacePrefix;
+ private JaxbNamespacePrefixMapper namespacePrefixMapper;
private TypeConverter typeConverter;
@@ -96,6 +101,9 @@ public class JaxbDataFormat extends Serv
if (isFragment()) {
marshaller.setProperty(Marshaller.JAXB_FRAGMENT, Boolean.TRUE);
}
+ if (namespacePrefixMapper != null) {
+
marshaller.setProperty(namespacePrefixMapper.getRegistrationKey(),
namespacePrefixMapper);
+ }
marshal(exchange, graph, stream, marshaller);
@@ -237,6 +245,22 @@ public class JaxbDataFormat extends Serv
this.partClass = partClass;
}
+ public Map<String, String> getNamespacePrefix() {
+ return namespacePrefix;
+ }
+
+ public void setNamespacePrefix(Map<String, String> namespacePrefix) {
+ this.namespacePrefix = namespacePrefix;
+ }
+
+ public String getNamespacePrefixRef() {
+ return namespacePrefixRef;
+ }
+
+ public void setNamespacePrefixRef(String namespacePrefixRef) {
+ this.namespacePrefixRef = namespacePrefixRef;
+ }
+
public CamelContext getCamelContext() {
return camelContext;
}
@@ -246,6 +270,7 @@ public class JaxbDataFormat extends Serv
}
@Override
+ @SuppressWarnings("unchecked")
protected void doStart() throws Exception {
ObjectHelper.notNull(camelContext, "CamelContext");
@@ -256,6 +281,12 @@ public class JaxbDataFormat extends Serv
if (partClass != null) {
partialClass =
camelContext.getClassResolver().resolveMandatoryClass(partClass, Object.class);
}
+ if (namespacePrefixRef != null) {
+ namespacePrefix = CamelContextHelper.mandatoryLookup(camelContext,
namespacePrefixRef, Map.class);
+ }
+ if (namespacePrefix != null) {
+ namespacePrefixMapper =
NamespacePrefixMapperFactory.newNamespacePrefixMapper(camelContext,
namespacePrefix);
+ }
typeConverter = camelContext.getTypeConverter();
}
Added:
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbNamespacePrefixMapper.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbNamespacePrefixMapper.java?rev=1388525&view=auto
==============================================================================
---
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbNamespacePrefixMapper.java
(added)
+++
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbNamespacePrefixMapper.java
Fri Sep 21 14:30:00 2012
@@ -0,0 +1,45 @@
+/**
+ * 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.camel.converter.jaxb;
+
+import java.util.Map;
+
+/**
+ * A prefix mapper for namespaces to control namespaces during JAXB
marshalling.
+ */
+public interface JaxbNamespacePrefixMapper {
+
+ /**
+ * JAXB requires the mapper to be registered as a property on the {@link
javax.xml.bind.JAXBContext}.
+ */
+ String getRegistrationKey();
+
+ /**
+ * Sets the namespace prefix mapping.
+ * <p/>
+ * The key is the namespace, the value is the prefix to use.
+ *
+ * @param namespaces namespace mappings
+ */
+ void setNamespaces(Map<String, String> namespaces);
+
+ /**
+ * Used by JAXB to obtain the preferred prefix.
+ */
+ String getPreferredPrefix(String namespaceUri, String suggestion, boolean
requirePrefix);
+
+}
Propchange:
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbNamespacePrefixMapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbNamespacePrefixMapper.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/NamespacePrefixMapperFactory.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/NamespacePrefixMapperFactory.java?rev=1388525&view=auto
==============================================================================
---
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/NamespacePrefixMapperFactory.java
(added)
+++
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/NamespacePrefixMapperFactory.java
Fri Sep 21 14:30:00 2012
@@ -0,0 +1,45 @@
+/**
+ * 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.camel.converter.jaxb;
+
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+
+/**
+ * Factory for creating {@link JaxbNamespacePrefixMapper} which supports
various JAXB-RI implementations.
+ */
+public final class NamespacePrefixMapperFactory {
+
+ private static final String SUN_JAXB_21_MAPPER =
"org.apache.camel.converter.jaxb.mapper.SunNamespacePrefixMapper";
+
+ private NamespacePrefixMapperFactory() {
+ }
+
+ static JaxbNamespacePrefixMapper newNamespacePrefixMapper(CamelContext
camelContext, Map<String, String> namespaces) {
+
+ // try to load the Sun JAXB 2.1 based
+ Class<?> clazz =
camelContext.getClassResolver().resolveClass(SUN_JAXB_21_MAPPER);
+ if (clazz != null) {
+ JaxbNamespacePrefixMapper mapper = (JaxbNamespacePrefixMapper)
camelContext.getInjector().newInstance(clazz);
+ mapper.setNamespaces(namespaces);
+ return mapper;
+ }
+
+ throw new IllegalStateException("Cannot load
CamelNamespacePrefixMapper class");
+ }
+}
Propchange:
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/NamespacePrefixMapperFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/NamespacePrefixMapperFactory.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/mapper/SunJaxb21NamespacePrefixMapper.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/mapper/SunJaxb21NamespacePrefixMapper.java?rev=1388525&view=auto
==============================================================================
---
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/mapper/SunJaxb21NamespacePrefixMapper.java
(added)
+++
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/mapper/SunJaxb21NamespacePrefixMapper.java
Fri Sep 21 14:30:00 2012
@@ -0,0 +1,52 @@
+/**
+ * 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.camel.converter.jaxb.mapper;
+
+import java.util.Map;
+
+import com.sun.xml.bind.marshaller.NamespacePrefixMapper;
+import org.apache.camel.converter.jaxb.JaxbNamespacePrefixMapper;
+
+/**
+ * A namespace prefix mapper which uses JAXB-RI 2.1 or better from SUN.
+ */
+public class SunJaxb21NamespacePrefixMapper extends NamespacePrefixMapper
implements JaxbNamespacePrefixMapper {
+
+ private Map<String, String> namespaces;
+
+ @Override
+ public void setNamespaces(Map<String, String> namespaces) {
+ this.namespaces = namespaces;
+ }
+
+ @Override
+ public String getRegistrationKey() {
+ return "com.sun.xml.bind.namespacePrefixMapper";
+ }
+
+ @Override
+ public String getPreferredPrefix(String namespaceUri, String suggestion,
boolean requirePrefix) {
+ if (namespaces != null) {
+ String prefix = namespaces.get(namespaceUri);
+ if (prefix != null) {
+ return prefix;
+ }
+ }
+ return suggestion;
+ }
+
+}
Propchange:
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/mapper/SunJaxb21NamespacePrefixMapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/mapper/SunJaxb21NamespacePrefixMapper.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbMarshalNamespacePrefixMapperTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbMarshalNamespacePrefixMapperTest.java?rev=1388525&view=auto
==============================================================================
---
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbMarshalNamespacePrefixMapperTest.java
(added)
+++
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbMarshalNamespacePrefixMapperTest.java
Fri Sep 21 14:30:00 2012
@@ -0,0 +1,91 @@
+/**
+ * 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.camel.jaxb;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.example.Address;
+import org.apache.camel.example.Order;
+import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.model.dataformat.JaxbDataFormat;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class JaxbMarshalNamespacePrefixMapperTest extends CamelTestSupport {
+
+ @Override
+ protected JndiRegistry createRegistry() throws Exception {
+ Map<String, String> map = new HashMap<String, String>();
+ map.put("http://www.camel.apache.org/jaxb/example/order/1", "o");
+ map.put("http://www.camel.apache.org/jaxb/example/address/1", "a");
+
+ JndiRegistry jndi = super.createRegistry();
+ jndi.bind("myPrefix", map);
+ return jndi;
+ }
+
+ @Test
+ public void testNamespacePrefix() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(1);
+
+ Order order = new Order();
+ order.setId("1");
+ Address address = new Address();
+ address.setStreet("Main Street");
+ address.setStreetNumber("3a");
+ address.setZip("65843");
+ address.setCity("Sulzbach");
+ order.setAddress(address);
+
+ template.sendBody("direct:start", order);
+
+ assertMockEndpointsSatisfied();
+
+ String xml = mock.getExchanges().get(0).getIn().getBody(String.class);
+ log.info(xml);
+
+
assertTrue(xml.contains("xmlns:a=\"http://www.camel.apache.org/jaxb/example/address/1\""));
+
assertTrue(xml.contains("xmlns:o=\"http://www.camel.apache.org/jaxb/example/order/1\""));
+ assertTrue(xml.contains("<o:id>1</o:id>"));
+ assertTrue(xml.contains("<a:street>Main Street</a:street>"));
+ assertTrue(xml.contains("</o:order>"));
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ JaxbDataFormat df = new JaxbDataFormat();
+ df.setContextPath("org.apache.camel.example");
+ df.setNamespacePrefixRef("myPrefix");
+
+ from("direct:start")
+ .marshal(df)
+ .to("mock:result");
+
+ }
+ };
+ }
+}
Propchange:
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbMarshalNamespacePrefixMapperTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbMarshalNamespacePrefixMapperTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
camel/trunk/components/camel-jaxb/src/test/resources/org/apache/camel/example/jaxb.index
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/src/test/resources/org/apache/camel/example/jaxb.index?rev=1388525&r1=1388524&r2=1388525&view=diff
==============================================================================
---
camel/trunk/components/camel-jaxb/src/test/resources/org/apache/camel/example/jaxb.index
(original)
+++
camel/trunk/components/camel-jaxb/src/test/resources/org/apache/camel/example/jaxb.index
Fri Sep 21 14:30:00 2012
@@ -15,6 +15,7 @@
## limitations under the License.
## ------------------------------------------------------------------------
Address
+Order
PurchaseOrder
Partial
Foo