Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 68173 invoked from network); 22 Dec 2006 14:04:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 22 Dec 2006 14:04:17 -0000 Received: (qmail 27664 invoked by uid 500); 22 Dec 2006 14:04:23 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 27549 invoked by uid 500); 22 Dec 2006 14:04:23 -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 27538 invoked by uid 500); 22 Dec 2006 14:04:23 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 27534 invoked by uid 99); 22 Dec 2006 14:04:23 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Dec 2006 06:04:23 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Dec 2006 06:04:02 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id E520B1A981A; Fri, 22 Dec 2006 06:03:11 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r489657 - in /webservices/axis2/branches/java/1_1/modules: adb-codegen/src/org/apache/axis2/schema/ kernel/src/org/apache/axis2/description/ kernel/src/org/apache/axis2/transport/http/ Date: Fri, 22 Dec 2006 14:03:11 -0000 To: axis2-cvs@ws.apache.org From: dims@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061222140311.E520B1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dims Date: Fri Dec 22 06:03:10 2006 New Revision: 489657 URL: http://svn.apache.org/viewvc?view=rev&rev=489657 Log: revised version of r489578 (deepal, please cross-check) Modified: webservices/axis2/branches/java/1_1/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisOperation.java webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java Modified: webservices/axis2/branches/java/1_1/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java?view=diff&rev=489657&r1=489656&r2=489657 ============================================================================== --- webservices/axis2/branches/java/1_1/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java (original) +++ webservices/axis2/branches/java/1_1/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java Fri Dec 22 06:03:10 2006 @@ -658,7 +658,7 @@ //set a name referenceSchemaType.setName(generatedTypeName.getLocalPart()); - writeComplexType((XmlSchemaComplexType)referenceSchemaType, + String javaclassName = writeComplexType((XmlSchemaComplexType) referenceSchemaType, (BeanWriterMetaInfoHolder)processedAnonymousComplexTypesMap.get(referencedElement) ); //remove the reference from the anon list since we named the type @@ -667,10 +667,8 @@ //processedAnonymousComplexTypesMap.remove(referencedElement); - //add this to the processed ref type map - String fullyQualifiedClassName = writer.makeFullyQualifiedClassName(generatedTypeName); - processedTypemap.put(generatedTypeName, fullyQualifiedClassName); - this.processedElementRefMap.put(referenceEltQName, fullyQualifiedClassName); + processedTypemap.put(generatedTypeName, javaclassName); + this.processedElementRefMap.put(referenceEltQName, javaclassName); } } // schema type name is present but not the schema type object @@ -930,10 +928,11 @@ * @param fullyQualifiedClassName the name returned by makeFullyQualifiedClassName() or null if it wasn't called * @throws SchemaCompilationException */ - private void writeComplexType(XmlSchemaComplexType complexType, BeanWriterMetaInfoHolder metaInfHolder) + private String writeComplexType(XmlSchemaComplexType complexType, BeanWriterMetaInfoHolder metaInfHolder) throws SchemaCompilationException { - writer.write(complexType, processedTypemap, metaInfHolder); + String javaClassName = writer.write(complexType, processedTypemap, metaInfHolder); processedTypeMetaInfoMap.put(complexType.getQName(),metaInfHolder); + return javaClassName; } /** Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisOperation.java URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisOperation.java?view=diff&rev=489657&r1=489656&r2=489657 ============================================================================== --- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisOperation.java (original) +++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisOperation.java Fri Dec 22 06:03:10 2006 @@ -536,22 +536,12 @@ faultMessages.add(faultMessage); } - public String getSoapAction() { - return soapAction; - } - public void setSoapAction(String soapAction) { this.soapAction = soapAction; } public String getInputAction() { - String result = this.soapAction; - if (result == null || "".equals(result)) { - if (wsamappingList != null && !wsamappingList.isEmpty()) { - result = wsamappingList.get(0).toString(); - } - } - return result; + return soapAction; } public String getOutputAction() { Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java?view=diff&rev=489657&r1=489656&r2=489657 ============================================================================== --- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java (original) +++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java Fri Dec 22 06:03:10 2006 @@ -381,7 +381,7 @@ axisOperation.setMessageReceiver( loadDefaultMessageReceiver(axisOperation.getMessageExchangePattern(), this)); } - if (axisOperation.getSoapAction() == null) { + if (axisOperation.getInputAction() == null) { axisOperation.setSoapAction("urn:" + axisOperation.getName().getLocalPart()); } addChild(axisOperation); @@ -406,7 +406,7 @@ mapActionToOperation(operationName, axisOperation); - String action = axisOperation.getSoapAction(); + String action = axisOperation.getInputAction(); if (action.length() > 0) { mapActionToOperation(action, axisOperation); } Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java?view=diff&rev=489657&r1=489656&r2=489657 ============================================================================== --- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java (original) +++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java Fri Dec 22 06:03:10 2006 @@ -298,7 +298,7 @@ soapActionString = messageContext.getWSAAction(); if (messageContext.getAxisOperation() != null && ((soapActionString == null) || (soapActionString.length() == 0))) { // last option is to get it from the axis operation - soapActionString = messageContext.getAxisOperation().getSoapAction(); + soapActionString = messageContext.getAxisOperation().getInputAction(); } } --------------------------------------------------------------------- To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org For additional commands, e-mail: axis-cvs-help@ws.apache.org