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 2011/08/30 16:57:11 UTC
svn commit: r1163245 -
/cxf/trunk/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
Author: sergeyb
Date: Tue Aug 30 14:57:11 2011
New Revision: 1163245
URL: http://svn.apache.org/viewvc?rev=1163245&view=rev
Log:
Removing scanning-raled calls from WADL mojo till needed
Modified:
cxf/trunk/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
Modified: cxf/trunk/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java?rev=1163245&r1=1163244&r2=1163245&view=diff
==============================================================================
--- cxf/trunk/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java (original)
+++ cxf/trunk/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java Tue Aug 30 14:57:11 2011
@@ -132,21 +132,7 @@ public class WADL2JavaMojo extends Abstr
private List<WadlOption> createWsdlOptionsFromScansAndExplicitWsdlOptions()
throws MojoExecutionException {
List<WadlOption> effectiveOptions = new ArrayList<WadlOption>();
- List<WadlOption> temp;
- if (wadlRoot != null && wadlRoot.exists() && !disableDirectoryScan) {
- temp = OptionLoader.loadWsdlOptionsFromFiles(wadlRoot, includes, excludes, defaultOptions,
- sourceRoot);
- effectiveOptions.addAll(temp);
- }
- if (testWadlRoot != null && testWadlRoot.exists() && !disableDirectoryScan) {
- temp = OptionLoader.loadWsdlOptionsFromFiles(testWadlRoot, includes, excludes,
- defaultOptions, testSourceRoot);
- effectiveOptions.addAll(temp);
- }
- if (!disableDependencyScan) {
- temp = OptionLoader.loadWsdlOptionsFromDependencies(project, defaultOptions, sourceRoot);
- effectiveOptions.addAll(temp);
- }
+
mergeOptions(effectiveOptions);
downloadRemoteDocs(effectiveOptions);
return effectiveOptions;