cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1163247 - in /cxf/branches/2.4.x-fixes: ./ maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
Date Tue, 30 Aug 2011 14:59:32 GMT
Author: sergeyb
Date: Tue Aug 30 14:59:32 2011
New Revision: 1163247

URL: http://svn.apache.org/viewvc?rev=1163247&view=rev
Log:
Merged revisions 1163245 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1163245 | sergeyb | 2011-08-30 15:57:11 +0100 (Tue, 30 Aug 2011) | 1 line
  
  Removing scanning-raled calls from WADL mojo till needed
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 30 14:59:32 2011
@@ -1 +1 @@
-/cxf/trunk:1163168
+/cxf/trunk:1163168,1163245

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.4.x-fixes/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java?rev=1163247&r1=1163246&r2=1163247&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
(original)
+++ cxf/branches/2.4.x-fixes/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
Tue Aug 30 14:59:32 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;



Mime
View raw message