Return-Path: Delivered-To: apmail-ws-axis-cvs-archive@www.apache.org Received: (qmail 76216 invoked from network); 20 Jan 2005 14:59:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 20 Jan 2005 14:59:52 -0000 Received: (qmail 59046 invoked by uid 500); 20 Jan 2005 14:59:42 -0000 Delivered-To: apmail-ws-axis-cvs-archive@ws.apache.org Received: (qmail 58932 invoked by uid 500); 20 Jan 2005 14:59:41 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 58847 invoked by uid 99); 20 Jan 2005 14:59:41 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Thu, 20 Jan 2005 06:59:40 -0800 Received: (qmail 75933 invoked by uid 1203); 20 Jan 2005 14:59:39 -0000 Date: 20 Jan 2005 14:59:39 -0000 Message-ID: <20050120145939.75932.qmail@minotaur.apache.org> From: dims@apache.org To: ws-axis-cvs@apache.org Subject: cvs commit: ws-axis/java/src/org/apache/axis/wsdl Java2WSDL.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N dims 2005/01/20 06:59:39 Modified: java/src/org/apache/axis/wsdl Java2WSDL.java Log: Ensure Typemapping is set. Revision Changes Path 1.48 +7 -8 ws-axis/java/src/org/apache/axis/wsdl/Java2WSDL.java Index: Java2WSDL.java =================================================================== RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/Java2WSDL.java,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- Java2WSDL.java 20 Jan 2005 14:18:05 -0000 1.47 +++ Java2WSDL.java 20 Jan 2005 14:59:39 -0000 1.48 @@ -245,6 +245,9 @@ /** Field locationSet */ boolean locationSet = false; + /** Field typeMappingVersion */ + protected String typeMappingVersion = "1.2"; + /** * Instantiate a Java2WSDL emitter. */ @@ -407,13 +410,7 @@ case TYPEMAPPING_OPT: value = option.getArgument(); - - try { - emitter.setTypeMappingVersion(value); - } catch (Exception e) { - System.out.println(Messages.getMessage("j2wBadTypeMapping00")); - status = false; - } + typeMappingVersion = value; break; case SOAPACTION_OPT: @@ -513,7 +510,6 @@ return false; } - return true; // a-OK } @@ -560,6 +556,9 @@ if (!namespaceMap.isEmpty()) { emitter.setNamespaceMap(namespaceMap); } + + // Set the TypeMappingVersion + emitter.setTypeMappingVersion(typeMappingVersion); // Find the class using the name emitter.setCls(className);