Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 15324 invoked from network); 14 Mar 2007 07:57:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 14 Mar 2007 07:57:33 -0000 Received: (qmail 17019 invoked by uid 500); 14 Mar 2007 07:57:41 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 16911 invoked by uid 500); 14 Mar 2007 07:57:40 -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 16900 invoked by uid 500); 14 Mar 2007 07:57:40 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 16897 invoked by uid 99); 14 Mar 2007 07:57:40 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Mar 2007 00:57:40 -0700 X-ASF-Spam-Status: No, hits=-99.5 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; Wed, 14 Mar 2007 00:57:31 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 5D6991A9838; Wed, 14 Mar 2007 00:57:11 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r518048 - in /webservices/axis2/trunk/java/modules: adb/src/org/apache/axis2/databinding/ADBBean.java codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java Date: Wed, 14 Mar 2007 07:57:11 -0000 To: axis2-cvs@ws.apache.org From: amilas@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070314075711.5D6991A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: amilas Date: Wed Mar 14 00:57:10 2007 New Revision: 518048 URL: http://svn.apache.org/viewvc?view=rev&rev=518048 Log: fixed bug in generating stub files. make interface binding dependent Modified: webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/ADBBean.java webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java Modified: webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/ADBBean.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/ADBBean.java?view=diff&rev=518048&r1=518047&r2=518048 ============================================================================== --- webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/ADBBean.java (original) +++ webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/ADBBean.java Wed Mar 14 00:57:10 2007 @@ -2,6 +2,7 @@ import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamReader; +import java.io.Serializable; /* * Copyright 2001-2004 The Apache Software Foundation. Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java?view=diff&rev=518048&r1=518047&r2=518048 ============================================================================== --- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java (original) +++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java Wed Mar 14 00:57:10 2007 @@ -383,15 +383,10 @@ for (Iterator axisServicesIter = this.axisServices.iterator(); axisServicesIter.hasNext();) { this.axisService = (AxisService) axisServicesIter.next(); - //we have to generate the code for each bininding //for the moment lets genrate the stub name with the service name and end point name - // write the inteface - // feed the binding information also - // note that we do not create this interface if the user switched on the wrap classes mode if (!codeGenConfiguration.isPackClasses()) { - writeInterface(false); // write the call back handlers writeCallBackHandlers(); } @@ -431,6 +426,14 @@ generateAndPopulateFaultNames(); updateFaultPackageForStub(); + // write the inteface + // feed the binding information also + // note that we do not create this interface if the user switched on the wrap classes mode + // this interface also depends on the binding + if (!codeGenConfiguration.isPackClasses()) { + writeInterface(false); + } + if (codeGenConfiguration.isPackClasses()) { // write the call back handlers writeCallBackHandlers(); @@ -650,7 +653,9 @@ addAttribute(doc, "name", makeJavaClassName(axisService.getBindingName()) + STUB_SUFFIX, rootElement); } else { - addAttribute(doc, "interfaceName", localPart , rootElement); + addAttribute(doc, "interfaceName", + makeJavaClassName(axisService.getName() + axisService.getEndpointName()) , + rootElement); addAttribute(doc, "name", stubName, rootElement); } @@ -1060,7 +1065,7 @@ localPart = makeJavaClassName(axisService.getEndpointName() + STUB_INTERFACE_SUFFIX_BACK); } else { - localPart = makeJavaClassName(axisService.getName()); + localPart = makeJavaClassName(axisService.getName() + axisService.getEndpointName()); } addAttribute(doc, "package", codeGenConfiguration.getPackageName(), rootElement); --------------------------------------------------------------------- To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org For additional commands, e-mail: axis-cvs-help@ws.apache.org