You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/08/06 15:10:52 UTC
svn commit: r1510952 - in /cxf/trunk:
api/src/main/java/org/apache/cxf/common/jaxb/
rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/
rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/pr...
Author: dkulp
Date: Tue Aug 6 13:10:52 2013
New Revision: 1510952
URL: http://svn.apache.org/r1510952
Log:
Rename method
Modified:
cxf/trunk/api/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java
cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java?rev=1510952&r1=1510951&r2=1510952&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java Tue Aug 6 13:10:52 2013
@@ -553,7 +553,7 @@ public final class JAXBUtils {
return jaxbXjcLoader;
}
- public static Object setNamespaceWrapper(final Map<String, String> nspref,
+ public static Object setNamespaceMapper(final Map<String, String> nspref,
Marshaller marshaller) throws PropertyException {
Object mapper = createNamespaceWrapper(marshaller.getClass(), nspref);
if (marshaller.getClass().getName().contains(".internal.")) {
Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java?rev=1510952&r1=1510951&r2=1510952&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java Tue Aug 6 13:10:52 2013
@@ -109,7 +109,7 @@ public class DataWriterImpl<T> extends J
final Map<String, String> nspref = databinding.getDeclaredNamespaceMappings();
if (nspref != null) {
- JAXBUtils.setNamespaceWrapper(nspref, marshaller);
+ JAXBUtils.setNamespaceMapper(nspref, marshaller);
}
if (databinding.getMarshallerProperties() != null) {
for (Map.Entry<String, Object> propEntry
Modified: cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java?rev=1510952&r1=1510951&r2=1510952&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java Tue Aug 6 13:10:52 2013
@@ -245,7 +245,7 @@ public class JAXBEncoderDecoderTest exte
opFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.TRUE);
XMLEventWriter writer = opFactory.createXMLEventWriter(stringWriter);
Marshaller m = context.createMarshaller();
- JAXBUtils.setNamespaceWrapper(mapper, m);
+ JAXBUtils.setNamespaceMapper(mapper, m);
JAXBEncoderDecoder.marshall(m, testObject, part, writer);
writer.flush();
writer.close();
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java?rev=1510952&r1=1510951&r2=1510952&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java Tue Aug 6 13:10:52 2013
@@ -140,7 +140,7 @@ public abstract class AbstractJAXBProvid
protected void setNamespaceMapper(Marshaller ms,
Map<String, String> map) throws Exception {
- Object nsMapper = JAXBUtils.setNamespaceWrapper(map, ms);
+ Object nsMapper = JAXBUtils.setNamespaceMapper(map, ms);
if (namespaceMapperPropertyName != null) {
setMarshallerProp(ms, nsMapper, namespaceMapperPropertyName, null);
}
Modified: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java?rev=1510952&r1=1510951&r2=1510952&view=diff
==============================================================================
--- cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java (original)
+++ cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java Tue Aug 6 13:10:52 2013
@@ -318,7 +318,7 @@ public class JAXBExtensionHelper impleme
Map.Entry<?, ?> entry = (Map.Entry<?, ?>)ent;
nspref.put((String)entry.getValue(), (String)entry.getKey());
}
- JAXBUtils.setNamespaceWrapper(nspref, u);
+ JAXBUtils.setNamespaceMapper(nspref, u);
u.marshal(mObj, writer);
writer.flush();
} catch (Exception ex) {