You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2015/02/03 13:35:33 UTC
cxf git commit: Updating WADLGenerator to optionally avoid converting
relative links to absolute ones in the external documents
Repository: cxf
Updated Branches:
refs/heads/master 2895b7b05 -> 71584641a
Updating WADLGenerator to optionally avoid converting relative links to absolute ones in the external documents
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/71584641
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/71584641
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/71584641
Branch: refs/heads/master
Commit: 71584641a21c7206f274aa5d6f227e18e4e77206
Parents: 2895b7b
Author: Sergey Beryozkin <sb...@talend.com>
Authored: Tue Feb 3 12:35:17 2015 +0000
Committer: Sergey Beryozkin <sb...@talend.com>
Committed: Tue Feb 3 12:35:17 2015 +0000
----------------------------------------------------------------------
.../java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/71584641/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 6e2cab2..491c0c5 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
@@ -156,6 +156,7 @@ public class WadlGenerator implements ContainerRequestFilter {
private boolean supportJaxbSubstitutions = true;
private boolean ignoreOverloadedMethods;
private boolean checkAbsolutePathSlash;
+ private boolean keepRelativeDocLinks;
private List<String> externalSchemasCache;
private List<URI> externalSchemaLinks;
@@ -1169,6 +1170,9 @@ public class WadlGenerator implements ContainerRequestFilter {
private void handleExistingDocRefs(List<Element> elements, String attrName, String parentDocLoc,
String parentRef, Message m, UriInfo ui) {
+ if (keepRelativeDocLinks) {
+ return;
+ }
int index = parentDocLoc.lastIndexOf('/');
parentDocLoc = index == -1 ? parentDocLoc : parentDocLoc.substring(0, index + 1);
@@ -2041,6 +2045,10 @@ public class WadlGenerator implements ContainerRequestFilter {
this.ignoreOverloadedMethods = ignore;
}
+ public void setKeepRelativeDocLinks(boolean keepRelativeDocLinks) {
+ this.keepRelativeDocLinks = keepRelativeDocLinks;
+ }
+
private static class SchemaConverter extends DelegatingXMLStreamWriter {
private static final String SCHEMA_LOCATION = "schemaLocation";
private Map<String, String> locsMap;