Repository: cxf Updated Branches: refs/heads/master 24963006f -> 9f2352836
Updating java2wadl to support new wadl generator properties Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9f235283 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9f235283 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9f235283 Branch: refs/heads/master Commit: 9f2352836b589c92504eb3f6fe15e5bc9db86cd1 Parents: 2496300 Author: Sergey Beryozkin <sberyoz...@talend.com> Authored: Tue Nov 25 12:46:43 2014 +0000 Committer: Sergey Beryozkin <sberyoz...@talend.com> Committed: Tue Nov 25 12:46:43 2014 +0000 ---------------------------------------------------------------------- .../cxf/maven_plugin/javatowadl/Java2WADLMojo.java | 13 ++++++++++++- .../org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 4 ++++ 2 files changed, 16 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/9f235283/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java ---------------------------------------------------------------------- diff --git a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java index 58cc578..63d318c 100644 --- a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java +++ b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java @@ -160,6 +160,11 @@ public class Java2WADLMojo extends AbstractMojo { private boolean checkAbsolutePathSlash; /** + * @parameter default-value="false" + */ + private boolean ignoreOverloadedMethods; + + /** * @parameter */ private String applicationTitle; @@ -179,6 +184,11 @@ public class Java2WADLMojo extends AbstractMojo { */ private String outputFileExtension; + /** + * @parameter + */ + private String stylesheetReference; + private ClassLoader resourceClassLoader; public void execute() throws MojoExecutionException { @@ -210,13 +220,14 @@ public class Java2WADLMojo extends AbstractMojo { wg.setAddResourceAndMethodIds(addResourceAndMethodIds); wg.setLinkAnyMediaTypeToXmlSchema(linkAnyMediaTypeToXmlSchema); wg.setCheckAbsolutePathSlash(checkAbsolutePathSlash); - + wg.setIgnoreOverloadedMethods(ignoreOverloadedMethods); if (applicationTitle != null) { wg.setApplicationTitle(applicationTitle); } if (namespacePrefix != null) { wg.setNamespacePrefix(namespacePrefix); } + wg.setStylesheetReference(stylesheetReference); } private void generateWadl(List<Class<?>> resourceClasses, String wadl) throws MojoExecutionException { http://git-wip-us.apache.org/repos/asf/cxf/blob/9f235283/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 1b1b591..c5c3f8b 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 @@ -2035,6 +2035,10 @@ public class WadlGenerator implements ContainerRequestFilter { this.stylesheetReference = stylesheetReference; } + public void setIgnoreOverloadedMethods(boolean ignore) { + this.ignoreOverloadedMethods = ignore; + } + private static class SchemaConverter extends DelegatingXMLStreamWriter { private static final String SCHEMA_LOCATION = "schemaLocation"; private Map<String, String> locsMap;
