Author: ffang Date: Thu Sep 15 10:48:43 2011 New Revision: 1171047 URL: http://svn.apache.org/viewvc?rev=1171047&view=rev Log: Merged revisions 1171042 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................ r1171042 | ffang | 2011-09-15 18:44:45 +0800 (四, 15 9 2011) | 9 lines 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.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.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.3.x-fixes/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java?rev=1171047&r1=1171046&r2=1171047&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java (original) +++ cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java Thu Sep 15 10:48:43 2011 @@ -80,6 +80,9 @@ public class JavaScriptContainer extends @SuppressWarnings("unchecked") public void execute() throws ToolException { + if (hasInfoOption()) { + return; + } buildToolContext(); validate(context);
