You are viewing a plain text version of this content. The canonical link for it is here.
Posted to muse-commits@ws.apache.org by ae...@apache.org on 2006/08/31 06:26:17 UTC
svn commit: r438782 - in
/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator:
Wsdl2Java.java util/AbstractCommandLineApp.java util/Messages.properties
Author: aeberbac
Date: Wed Aug 30 21:26:16 2006
New Revision: 438782
URL: http://svn.apache.org/viewvc?rev=438782&view=rev
Log:
fixed usage with no parameters or wrong parameters
Modified:
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/Wsdl2Java.java
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/util/AbstractCommandLineApp.java
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/util/Messages.properties
Modified: webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/Wsdl2Java.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/Wsdl2Java.java?rev=438782&r1=438781&r2=438782&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/Wsdl2Java.java (original)
+++ webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/Wsdl2Java.java Wed Aug 30 21:26:16 2006
@@ -94,7 +94,7 @@
*/
public Wsdl2Java(File wsdlFile, File descriptorFile, boolean overwrite) throws Exception {
Document descriptorDocument = getDescriptorDocument(descriptorFile);
-
+
Document[] wsdlDocuments = getWSDLDocuments(wsdlFile, descriptorFile, descriptorDocument);
_configuration = new ConfigurationData();
@@ -194,11 +194,18 @@
Synthesizer synthesizer = checkSynthesizerArg(arguments);
Projectizer projectizer = checkProjectizerArg(arguments);
+ Wsdl2Java app = null;
try {
- Wsdl2Java app = new Wsdl2Java(wsdl, descriptorFile, overwrite);
+ app = new Wsdl2Java(wsdl, descriptorFile, overwrite);
app.setAnalyzer(analyzer);
app.setSynthesizer(synthesizer);
app.setProjectizer(projectizer);
+ } catch (Exception e) {
+ handleErrorAndExit(e.getMessage());
+ return;
+ }
+
+ try {
app.run();
} catch (Exception e) {
handleErrorAndExit(_MESSAGES.get("CodeGenFailed"), e);
Modified: webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/util/AbstractCommandLineApp.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/util/AbstractCommandLineApp.java?rev=438782&r1=438781&r2=438782&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/util/AbstractCommandLineApp.java (original)
+++ webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/util/AbstractCommandLineApp.java Wed Aug 30 21:26:16 2006
@@ -71,6 +71,10 @@
return new Document[] { getWSDLDocument(wsdlFile) };
}
+ if(deploymentDescriptorFile == null && wsdlFile == null) {
+ throw new NullPointerException(_MESSAGES.get("NullWSDLBuiltinDescriptor"));
+ }
+
File[] wsdlFiles = DeploymentDescriptorHelper.getWsdls(deploymentDescriptorFile, deploymentDescriptorDocument);
Document[] wsdlDocuments = new Document[wsdlFiles.length];
Modified: webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/util/Messages.properties
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/util/Messages.properties?rev=438782&r1=438781&r2=438782&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/util/Messages.properties (original)
+++ webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/util/Messages.properties Wed Aug 30 21:26:16 2006
@@ -13,6 +13,7 @@
NullWSDL = The WSDL file specified cannot be null.
FailedLoadingWSDL = Got exception loading WSDL: XXX.
GotException = Caught an exception: XXX.
+NullWSDLBuiltinDescriptor = You cannot specify no WSDL file and no descriptor file. You must specify at least one of the two.
# WsdlMerge
NoURIFlag = No URI was specified using XXX. This URI is used as the target namespace URI for the generated WSDL document. Try running with XXX for more information.
---------------------------------------------------------------------
To unsubscribe, e-mail: muse-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-commits-help@ws.apache.org