svn commit: r1171042 - in /cxf/branches/2.4.x-fixes: ./ tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java

[ffang]

Author: ffang
Date: Thu Sep 15 10:44:45 2011
New Revision: 1171042

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

........
  r1171035 | ffang | 2011-09-15 18:31:59 +0800 (四, 15  9 2011) | 1 line
  
  [CXF-3054]wsdl2js script print out WSDL URL can not be null when use -v or -h 
option
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    
cxf/branches/2.4.x-fixes/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java

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

Modified: 
cxf/branches/2.4.x-fixes/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java?rev=1171042&r1=1171041&r2=1171042&view=diff
==============================================================================
--- 
cxf/branches/2.4.x-fixes/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java
 (original)
+++ 
cxf/branches/2.4.x-fixes/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java
 Thu Sep 15 10:44:45 2011
@@ -80,6 +80,9 @@ public class JavaScriptContainer extends
 
     @SuppressWarnings("unchecked")
     public void execute() throws ToolException {
+        if (hasInfoOption()) {
+            return;
+        }
         buildToolContext();
         validate(context);