Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 70e807dc6 -> 5356ca1d7
Adding WadlGenerator jaxbContextProperties, patch from Vjacheslav Borisov applied with minor updates, This closes #238 Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5356ca1d Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5356ca1d Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5356ca1d Branch: refs/heads/3.0.x-fixes Commit: 5356ca1d780773c1bb00b0c34036897b207fe92d Parents: 70e807d Author: Sergey Beryozkin <sberyoz...@gmail.com> Authored: Fri Feb 17 14:27:34 2017 +0000 Committer: Sergey Beryozkin <sberyoz...@gmail.com> Committed: Fri Feb 17 14:40:35 2017 +0000 ---------------------------------------------------------------------- .../apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/5356ca1d/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java ---------------------------------------------------------------------- diff --git a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java index 486d755..dc4a7c9 100644 --- a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java +++ b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java @@ -194,7 +194,8 @@ public class WadlGenerator implements ContainerRequestFilter { private Bus bus; private final List<DocumentationProvider> docProviders = new LinkedList<DocumentationProvider>(); private ResourceIdGenerator idGenerator; - + private Map<String, Object> jaxbContextProperties; + public WadlGenerator() { } @@ -299,7 +300,7 @@ public class WadlGenerator implements ContainerRequestFilter { JAXBContext jaxbContext = null; if (useJaxbContextForQnames && !allTypes.isEmpty()) { - jaxbContext = ResourceUtils.createJaxbContext(new HashSet<Class<?>>(allTypes), null, null); + jaxbContext = ResourceUtils.createJaxbContext(new HashSet<Class<?>>(allTypes), null, jaxbContextProperties); if (jaxbContext == null) { LOG.warning("JAXB Context is null: possibly due to one of input classes being not accepted"); } @@ -2218,6 +2219,17 @@ public class WadlGenerator implements ContainerRequestFilter { this.convertResourcesToDOM = convertResourcesToDOM; } +<<<<<<< HEAD +======= + public void setIncrementNamespacePrefix(boolean incrementNamespacePrefix) { + this.incrementNamespacePrefix = incrementNamespacePrefix; + } + public void setJaxbContextProperties(Map<String, Object> jaxbContextProperties) { + this.jaxbContextProperties = jaxbContextProperties; + } + + +>>>>>>> 99f6606... Adding WadlGenerator jaxbContextProperties, patch from Vjacheslav Borisov applied with minor updates, This closes #238 private static class SchemaConverter extends DelegatingXMLStreamWriter { private static final String SCHEMA_LOCATION = "schemaLocation"; private final Map<String, String> locsMap;
