Return-Path: Delivered-To: apmail-ws-axis-cvs-archive@www.apache.org Received: (qmail 81258 invoked from network); 30 Jan 2006 09:06:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 30 Jan 2006 09:06:58 -0000 Received: (qmail 5397 invoked by uid 500); 30 Jan 2006 09:06:57 -0000 Delivered-To: apmail-ws-axis-cvs-archive@ws.apache.org Received: (qmail 5149 invoked by uid 500); 30 Jan 2006 09:06:56 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 5138 invoked by uid 500); 30 Jan 2006 09:06:56 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 5132 invoked by uid 99); 30 Jan 2006 09:06:56 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Jan 2006 01:06:56 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME,UPPERCASE_25_50 X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 30 Jan 2006 01:06:55 -0800 Received: (qmail 81110 invoked by uid 65534); 30 Jan 2006 09:06:35 -0000 Message-ID: <20060130090635.81098.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r373476 - /webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java Date: Mon, 30 Jan 2006 09:06:32 -0000 To: axis2-cvs@ws.apache.org From: ajith@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: ajith Date: Mon Jan 30 01:06:27 2006 New Revision: 373476 URL: http://svn.apache.org/viewcvs?rev=373476&view=rev Log: Changed the WSDL2Java generator to suit the new changes of the constant classes Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java?rev=373476&r1=373475&r2=373476&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java (original) +++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java Mon Jan 30 01:06:27 2006 @@ -67,66 +67,66 @@ { Map optionMap = new HashMap(); //WSDL file name - optionMap.put(CommandLineOptionConstants.WSDL_LOCATION_URI_OPTION, new CommandLineOption( - CommandLineOptionConstants.WSDL_LOCATION_URI_OPTION, getStringArray(WSDLURI))); + optionMap.put(CommandLineOptionConstants.WSDL2JavaConstants.WSDL_LOCATION_URI_OPTION, new CommandLineOption( + CommandLineOptionConstants.WSDL2JavaConstants.WSDL_LOCATION_URI_OPTION, getStringArray(WSDLURI))); //Async only if (isAyncOnly) { - optionMap.put(CommandLineOptionConstants.CODEGEN_ASYNC_ONLY_OPTION, new CommandLineOption( - CommandLineOptionConstants.CODEGEN_ASYNC_ONLY_OPTION, new String[0])); + optionMap.put(CommandLineOptionConstants.WSDL2JavaConstants.CODEGEN_ASYNC_ONLY_OPTION, new CommandLineOption( + CommandLineOptionConstants.WSDL2JavaConstants.CODEGEN_ASYNC_ONLY_OPTION, new String[0])); } //sync only if (isSyncOnly) { - optionMap.put(CommandLineOptionConstants.CODEGEN_SYNC_ONLY_OPTION, new CommandLineOption( - CommandLineOptionConstants.CODEGEN_SYNC_ONLY_OPTION, new String[0])); + optionMap.put(CommandLineOptionConstants.WSDL2JavaConstants.CODEGEN_SYNC_ONLY_OPTION, new CommandLineOption( + CommandLineOptionConstants.WSDL2JavaConstants.CODEGEN_SYNC_ONLY_OPTION, new String[0])); } //serverside if (isServerSide) { - optionMap.put(CommandLineOptionConstants.SERVER_SIDE_CODE_OPTION, new CommandLineOption( - CommandLineOptionConstants.SERVER_SIDE_CODE_OPTION, new String[0])); + optionMap.put(CommandLineOptionConstants.WSDL2JavaConstants.SERVER_SIDE_CODE_OPTION, new CommandLineOption( + CommandLineOptionConstants.WSDL2JavaConstants.SERVER_SIDE_CODE_OPTION, new String[0])); //server xml if (isServerXML) { - optionMap.put(CommandLineOptionConstants.GENERATE_SERVICE_DESCRIPTION_OPTION, new CommandLineOption( - CommandLineOptionConstants.GENERATE_SERVICE_DESCRIPTION_OPTION, new String[0])); + optionMap.put(CommandLineOptionConstants.WSDL2JavaConstants.GENERATE_SERVICE_DESCRIPTION_OPTION, new CommandLineOption( + CommandLineOptionConstants.WSDL2JavaConstants.GENERATE_SERVICE_DESCRIPTION_OPTION, new String[0])); } if (isGenerateAll){ - optionMap.put(CommandLineOptionConstants.GENERATE_ALL_OPTION, new CommandLineOption( - CommandLineOptionConstants.GENERATE_ALL_OPTION, new String[0])); + optionMap.put(CommandLineOptionConstants.WSDL2JavaConstants.GENERATE_ALL_OPTION, new CommandLineOption( + CommandLineOptionConstants.WSDL2JavaConstants.GENERATE_ALL_OPTION, new String[0])); } } //test case if (isTestCase) { - optionMap.put(CommandLineOptionConstants.GENERATE_TEST_CASE_OPTION, new CommandLineOption( - CommandLineOptionConstants.GENERATE_TEST_CASE_OPTION, new String[0])); + optionMap.put(CommandLineOptionConstants.WSDL2JavaConstants.GENERATE_TEST_CASE_OPTION, new CommandLineOption( + CommandLineOptionConstants.WSDL2JavaConstants.GENERATE_TEST_CASE_OPTION, new String[0])); } //package name - optionMap.put(CommandLineOptionConstants.PACKAGE_OPTION, new CommandLineOption( - CommandLineOptionConstants.PACKAGE_OPTION, getStringArray(packageName))); + optionMap.put(CommandLineOptionConstants.WSDL2JavaConstants.PACKAGE_OPTION, new CommandLineOption( + CommandLineOptionConstants.WSDL2JavaConstants.PACKAGE_OPTION, getStringArray(packageName))); //selected language - optionMap.put(CommandLineOptionConstants.STUB_LANGUAGE_OPTION, new CommandLineOption( - CommandLineOptionConstants.STUB_LANGUAGE_OPTION, getStringArray(mapLanguagesWithCombo(selectedLanguage)))); + optionMap.put(CommandLineOptionConstants.WSDL2JavaConstants.STUB_LANGUAGE_OPTION, new CommandLineOption( + CommandLineOptionConstants.WSDL2JavaConstants.STUB_LANGUAGE_OPTION, getStringArray(mapLanguagesWithCombo(selectedLanguage)))); //output location - optionMap.put(CommandLineOptionConstants.OUTPUT_LOCATION_OPTION, new CommandLineOption( - CommandLineOptionConstants.OUTPUT_LOCATION_OPTION, getStringArray(outputLocation))); + optionMap.put(CommandLineOptionConstants.WSDL2JavaConstants.OUTPUT_LOCATION_OPTION, new CommandLineOption( + CommandLineOptionConstants.WSDL2JavaConstants.OUTPUT_LOCATION_OPTION, getStringArray(outputLocation))); //databinding - optionMap.put(CommandLineOptionConstants.DATA_BINDING_TYPE_OPTION, new CommandLineOption( - CommandLineOptionConstants.DATA_BINDING_TYPE_OPTION, getStringArray(databindingName))); + optionMap.put(CommandLineOptionConstants.WSDL2JavaConstants.DATA_BINDING_TYPE_OPTION, new CommandLineOption( + CommandLineOptionConstants.WSDL2JavaConstants.DATA_BINDING_TYPE_OPTION, getStringArray(databindingName))); //port name if (portName!=null){ - optionMap.put(CommandLineOptionConstants.PORT_NAME_OPTION, new CommandLineOption( - CommandLineOptionConstants.PORT_NAME_OPTION, getStringArray(portName))); + optionMap.put(CommandLineOptionConstants.WSDL2JavaConstants.PORT_NAME_OPTION, new CommandLineOption( + CommandLineOptionConstants.WSDL2JavaConstants.PORT_NAME_OPTION, getStringArray(portName))); } //service name if (serviceName!= null){ - optionMap.put(CommandLineOptionConstants.SERVICE_NAME_OPTION, new CommandLineOption( - CommandLineOptionConstants.SERVICE_NAME_OPTION, getStringArray(serviceName))); + optionMap.put(CommandLineOptionConstants.WSDL2JavaConstants.SERVICE_NAME_OPTION, new CommandLineOption( + CommandLineOptionConstants.WSDL2JavaConstants.SERVICE_NAME_OPTION, getStringArray(serviceName))); } return optionMap; @@ -156,7 +156,6 @@ } catch (WSDLException e) { throw e; } catch (Exception e){ - e.printStackTrace(); throw new RuntimeException(e); }