Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 70368 invoked from network); 24 May 2005 13:06:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 24 May 2005 13:06:30 -0000 Received: (qmail 1293 invoked by uid 500); 24 May 2005 13:06:29 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 1268 invoked by uid 500); 24 May 2005 13:06:28 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 1253 invoked by uid 99); 24 May 2005 13:06:28 -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; Tue, 24 May 2005 06:06:28 -0700 Received: (qmail 70337 invoked by uid 65534); 24 May 2005 13:06:26 -0000 Message-ID: <20050524130626.70335.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: svn commit: r178163 - /geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/HeavyweightTypeInfoBuilder.java Date: Tue, 24 May 2005 13:06:26 -0000 To: scm@geronimo.apache.org From: gdamour@apache.org X-Mailer: svnmailer-1.0.0-dev X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: gdamour Date: Tue May 24 06:06:26 2005 New Revision: 178163 URL: http://svn.apache.org/viewcvs?rev=3D178163&view=3Drev Log: Temporary comment the section of code adding implicit java to XML type mappings. Modified: geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/b= uilder/HeavyweightTypeInfoBuilder.java Modified: geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/= axis/builder/HeavyweightTypeInfoBuilder.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis-builder/src/= java/org/apache/geronimo/axis/builder/HeavyweightTypeInfoBuilder.java?rev= =3D178163&r1=3D178162&r2=3D178163&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/b= uilder/HeavyweightTypeInfoBuilder.java (original) +++ geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/b= uilder/HeavyweightTypeInfoBuilder.java Tue May 24 06:06:26 2005 @@ -147,46 +147,47 @@ =20 typeInfoList.add(internalTypeInfo.buildTypeInfo()); } - =20 - Map qNameToKey =3D new HashMap(); - for (Iterator iter =3D schemaTypeKeyToSchemaTypeMap.keySet().itera= tor(); iter.hasNext();) { - SchemaTypeKey key =3D (SchemaTypeKey) iter.next(); - qNameToKey.put(key.getqName(), key); - } - =20 - for (Iterator iter =3D operations.iterator(); iter.hasNext();) { - OperationDesc operationDesc =3D (OperationDesc) iter.next(); - ArrayList parameters =3D new ArrayList(operationDesc.getParame= ters()); - if (null !=3D operationDesc.getReturnParamDesc().getTypeQName(= )) { - parameters.add(operationDesc.getReturnParamDesc()); - } - for (Iterator iterator =3D parameters.iterator(); iterator.has= Next();) { - ParameterDesc parameterDesc =3D (ParameterDesc) iterator.n= ext(); - QName typeQName =3D parameterDesc.getTypeQName(); - if (mappedTypeQNames.contains(typeQName)) { - continue; - } else if (typeQName.getNamespaceURI().equals(XMLSchema_NS= )) { - continue; - } - =20 - SchemaTypeKey key =3D (SchemaTypeKey) qNameToKey.get(typeQ= Name); - if (null =3D=3D key) { - continue; -// throw new DeploymentException("Type Qname " + typeQN= ame + " defined by operation " +=20 -// operationDesc + " has not been found in sche= ma: " + schemaTypeKeyToSchemaTypeMap); - } - SchemaType schemaType =3D (SchemaType) schemaTypeKeyToSche= maTypeMap.get(key); - mappedTypeQNames.add(key.getqName()); - =20 - Class clazz =3D parameterDesc.getJavaType(); - TypeInfo.UpdatableTypeInfo internalTypeInfo =3D new TypeIn= fo.UpdatableTypeInfo(); - setTypeQName(internalTypeInfo, key); - defineSerializerPair(internalTypeInfo, schemaType, clazz); - internalTypeInfo.setFields(new FieldDesc[0]); =20 - typeInfoList.add(internalTypeInfo.buildTypeInfo()); - } - } + // TODO: temporary comment the addition of implicit java to xml ty= pe mappings. +// Map qNameToKey =3D new HashMap(); +// for (Iterator iter =3D schemaTypeKeyToSchemaTypeMap.keySet().ite= rator(); iter.hasNext();) { +// SchemaTypeKey key =3D (SchemaTypeKey) iter.next(); +// qNameToKey.put(key.getqName(), key); +// } +// =20 +// for (Iterator iter =3D operations.iterator(); iter.hasNext();) { +// OperationDesc operationDesc =3D (OperationDesc) iter.next(); +// ArrayList parameters =3D new ArrayList(operationDesc.getPara= meters()); +// if (null !=3D operationDesc.getReturnParamDesc().getTypeQNam= e()) { +// parameters.add(operationDesc.getReturnParamDesc()); +// } +// for (Iterator iterator =3D parameters.iterator(); iterator.h= asNext();) { +// ParameterDesc parameterDesc =3D (ParameterDesc) iterator= .next(); +// QName typeQName =3D parameterDesc.getTypeQName(); +// if (mappedTypeQNames.contains(typeQName)) { +// continue; +// } else if (typeQName.getNamespaceURI().equals(XMLSchema_= NS)) { +// continue; +// } +// =20 +// SchemaTypeKey key =3D (SchemaTypeKey) qNameToKey.get(typ= eQName); +// if (null =3D=3D key) { +// continue; +//// throw new DeploymentException("Type Qname " + type= QName + " defined by operation " +=20 +//// operationDesc + " has not been found in sc= hema: " + schemaTypeKeyToSchemaTypeMap); +// } +// SchemaType schemaType =3D (SchemaType) schemaTypeKeyToSc= hemaTypeMap.get(key); +// mappedTypeQNames.add(key.getqName()); +// =20 +// Class clazz =3D parameterDesc.getJavaType(); +// TypeInfo.UpdatableTypeInfo internalTypeInfo =3D new Type= Info.UpdatableTypeInfo(); +// setTypeQName(internalTypeInfo, key); +// defineSerializerPair(internalTypeInfo, schemaType, clazz= ); +// internalTypeInfo.setFields(new FieldDesc[0]); +// +// typeInfoList.add(internalTypeInfo.buildTypeInfo()); +// } +// } =20 return typeInfoList; }