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/11/18 22:16:02 UTC
svn commit: r1543164 - in /cxf/branches/2.7.x-fixes:
api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java
Author: dkulp
Date: Mon Nov 18 21:16:02 2013
New Revision: 1543164
URL: http://svn.apache.org/r1543164
Log:
FIx some compile failures after merges
Modified:
cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
cxf/branches/2.7.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java
Modified: cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java?rev=1543164&r1=1543163&r2=1543164&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java (original)
+++ cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java Mon Nov 18 21:16:02 2013
@@ -62,6 +62,7 @@ public abstract class AbstractDataBindin
private Bus bus;
private Collection<DOMSource> schemas;
private Map<String, String> namespaceMap;
+ private Map<String, String> contextualNamespaceMap;
private boolean hackAroundEmptyNamespaceIssue;
protected Bus getBus() {
@@ -267,6 +268,14 @@ public abstract class AbstractDataBindin
this.namespaceMap = namespaceMap;
}
+ public Map<String, String> getContextualNamespaceMap() {
+ return contextualNamespaceMap;
+ }
+
+ public void setContextualNamespaceMap(Map<String, String> contextualNamespaceMap) {
+ this.contextualNamespaceMap = contextualNamespaceMap;
+ }
+
/**
* Provide explicit mappings to ReflectionServiceFactory. {@inheritDoc}
*/
Modified: cxf/branches/2.7.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java?rev=1543164&r1=1543163&r2=1543164&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java (original)
+++ cxf/branches/2.7.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java Mon Nov 18 21:16:02 2013
@@ -21,6 +21,9 @@ package org.apache.cxf.jaxb.io;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.OutputStream;
+import java.util.HashMap;
+import java.util.Map;
import javax.xml.bind.JAXBContext;
import javax.xml.namespace.QName;