Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D6D461078F for ; Thu, 27 Aug 2015 12:03:28 +0000 (UTC) Received: (qmail 41843 invoked by uid 500); 27 Aug 2015 12:03:28 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 41783 invoked by uid 500); 27 Aug 2015 12:03:28 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 41774 invoked by uid 99); 27 Aug 2015 12:03:28 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Aug 2015 12:03:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 974CDDFF6B; Thu, 27 Aug 2015 12:03:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: sergeyb@apache.org To: commits@cxf.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: =?utf-8?q?cxf_git_commit=3A_=5BCXF-6553=5D_Various_java2wadl-plugi?= =?utf-8?q?n_improvements=2C_patch_from_Francesco_Chicchiricc=C3=B2_applied?= Date: Thu, 27 Aug 2015 12:03:28 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/master 3dca45675 -> 3ea1c784f [CXF-6553] Various java2wadl-plugin improvements, patch from Francesco Chicchiriccò applied Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3ea1c784 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3ea1c784 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3ea1c784 Branch: refs/heads/master Commit: 3ea1c784f248e29dcda46b16b82ad0e923c4b6e1 Parents: 3dca456 Author: Sergey Beryozkin Authored: Thu Aug 27 13:03:12 2015 +0100 Committer: Sergey Beryozkin Committed: Thu Aug 27 13:03:12 2015 +0100 ---------------------------------------------------------------------- maven-plugins/java2wadl-plugin/pom.xml | 2 +- .../maven_plugin/javatowadl/Java2WADLMojo.java | 42 ++++++++++++++++++++ .../javatowadl/ParseJavaDocMojo.java | 2 +- 3 files changed, 44 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/3ea1c784/maven-plugins/java2wadl-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/maven-plugins/java2wadl-plugin/pom.xml b/maven-plugins/java2wadl-plugin/pom.xml index 9d5252b..31ca452 100644 --- a/maven-plugins/java2wadl-plugin/pom.xml +++ b/maven-plugins/java2wadl-plugin/pom.xml @@ -117,7 +117,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.9.1 + 2.10.3 org.apache.maven http://git-wip-us.apache.org/repos/asf/cxf/blob/3ea1c784/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 63d318c..fd612db 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 @@ -163,6 +163,41 @@ public class Java2WADLMojo extends AbstractMojo { * @parameter default-value="false" */ private boolean ignoreOverloadedMethods; + + /** + * @parameter default-value="false" + */ + private boolean useJaxbContextForQnames; + + /** + * @parameter default-value="false" + */ + private boolean ignoreMessageWriters; + + /** + * @parameter default-value="true" + */ + private boolean usePathParamsToCompareOperations; + + /** + * @parameter default-value="false" + */ + private boolean ignoreRequests; + + /** + * @parameter default-value="true" + */ + private boolean supportCollections; + + /** + * @parameter default-value="true" + */ + private boolean supportJaxbXmlType; + + /** + * @parameter default-value="true" + */ + private boolean supportJaxbSubstitutions; /** * @parameter @@ -221,6 +256,13 @@ public class Java2WADLMojo extends AbstractMojo { wg.setLinkAnyMediaTypeToXmlSchema(linkAnyMediaTypeToXmlSchema); wg.setCheckAbsolutePathSlash(checkAbsolutePathSlash); wg.setIgnoreOverloadedMethods(ignoreOverloadedMethods); + wg.setUseJaxbContextForQnames(useJaxbContextForQnames); + wg.setIgnoreMessageWriters(ignoreMessageWriters); + wg.setUsePathParamsToCompareOperations(usePathParamsToCompareOperations); + wg.setIgnoreRequests(ignoreRequests); + wg.setSupportCollections(supportCollections); + wg.setSupportJaxbXmlType(supportJaxbXmlType); + wg.setSupportJaxbSubstitutions(supportJaxbSubstitutions); if (applicationTitle != null) { wg.setApplicationTitle(applicationTitle); } http://git-wip-us.apache.org/repos/asf/cxf/blob/3ea1c784/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java ---------------------------------------------------------------------- diff --git a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java index 2662b7c..9963fe0 100644 --- a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java +++ b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java @@ -205,7 +205,7 @@ public class ParseJavaDocMojo extends AbstractMojo { f.set(mojo, dumpFileOutputDirectory); } - Method m = AbstractJavadocMojo.class.getMethod("executeReport", Locale.class); + Method m = AbstractJavadocMojo.class.getDeclaredMethod("executeReport", Locale.class); m.setAccessible(true); m.invoke(mojo, locale); } catch (Exception e) {