Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 93215 invoked from network); 17 Jun 2007 12:01:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 17 Jun 2007 12:01:18 -0000 Received: (qmail 44260 invoked by uid 500); 17 Jun 2007 12:01:21 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 44143 invoked by uid 500); 17 Jun 2007 12:01:21 -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 44132 invoked by uid 500); 17 Jun 2007 12:01:21 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 44129 invoked by uid 99); 17 Jun 2007 12:01:21 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 17 Jun 2007 05:01:21 -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; Sun, 17 Jun 2007 05:01:16 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 4CE1C1A981A; Sun, 17 Jun 2007 05:00:56 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r548032 - in /webservices/axis2/trunk/java/modules: integration/test/org/apache/axis2/addressing/ integration/test/org/apache/axis2/engine/ integration/test/org/apache/axis2/integration/ kernel/src/org/apache/axis2/context/ kernel/src/org/a... Date: Sun, 17 Jun 2007 12:00:56 -0000 To: axis2-cvs@ws.apache.org From: hemapani@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070617120056.4CE1C1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hemapani Date: Sun Jun 17 05:00:55 2007 New Revision: 548032 URL: http://svn.apache.org/viewvc?view=rev&rev=548032 Log: fix the bug of generating non qulified operation names for WSDL based ServiceClient Proxy Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/addressing/MultiHopRedirectServiceTest.java webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/addressing/MultiHopRedirectServiceTest.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/addressing/MultiHopRedirectServiceTest.java?view=diff&rev=548032&r1=548031&r2=548032 ============================================================================== --- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/addressing/MultiHopRedirectServiceTest.java (original) +++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/addressing/MultiHopRedirectServiceTest.java Sun Jun 17 05:00:55 2007 @@ -158,11 +158,11 @@ ConfigurationContext configcontext = UtilServer.createClientConfigurationContext(); ServiceClient sender; - Options options = new Options(); options.setTo(targetEPR); options.setTransportInProtocol(Constants.TRANSPORT_HTTP); options.setUseSeparateListener(true); + options.setTimeOutInMilliSeconds(5000); sender = new ServiceClient(configcontext, service); sender.setOptions(options); sender.engageModule("addressing"); Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java?view=diff&rev=548032&r1=548031&r2=548032 ============================================================================== --- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java (original) +++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java Sun Jun 17 05:00:55 2007 @@ -67,7 +67,7 @@ //This is not smt we need to do but , my build is fail if I dont do that :) serviceClient.getOptions().setTo(new EndpointReference(epr)); System.out.println(serviceClient.getOptions().getTo().getAddress()); - OMElement response = serviceClient.sendReceive(new QName("", "echoOM"), payload); + OMElement response = serviceClient.sendReceive(new QName("http://engine.axis2.apache.org/xsd", "echoOM"), payload); assertNotNull(response); String textValue = response.getFirstElement().getFirstElement().getText(); assertEquals(textValue, "Isaac Asimov, The Foundation Trilogy"); Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java?view=diff&rev=548032&r1=548031&r2=548032 ============================================================================== --- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java (original) +++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java Sun Jun 17 05:00:55 2007 @@ -214,8 +214,8 @@ ConfigurationContext configContext = ConfigurationContextFactory .createConfigurationContextFromFileSystem( - "target/test-resources/integrationRepo", - "target/test-resources/integrationRepo/conf/axis2.xml"); + Constants.TESTING_PATH +"/integrationRepo", + Constants.TESTING_PATH + "/integrationRepo/conf/axis2.xml"); AxisModule axisModule = DeploymentEngine.buildModule(file, configContext.getAxisConfiguration()); configContext.getAxisConfiguration().addModule(axisModule); Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java?view=diff&rev=548032&r1=548031&r2=548032 ============================================================================== --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java (original) +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java Sun Jun 17 05:00:55 2007 @@ -50,7 +50,7 @@ *

Configuration Context hold Global level run-time information. This allows * same configurations to be used by two Axis2 instances and most Axis2 wide * configurations can changed by setting name value pairs of the configurationContext. - * This hold all OperationContexts, ServiceGroups, Sessions, and ListenerManager.

+ * This hold all OperationContexts, ServiceGroups, Sessions, and ListenerManager. */ public class ConfigurationContext extends AbstractContext { Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java?view=diff&rev=548032&r1=548031&r2=548032 ============================================================================== --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java (original) +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java Sun Jun 17 05:00:55 2007 @@ -1463,16 +1463,16 @@ return createClientSideAxisService(wsdlDefinition, wsdlServiceName, portName, options); } catch (IOException e) { log.error(e); - throw new AxisFault("IOException : " + e.getMessage()); + throw AxisFault.makeFault(e); } catch (ParserConfigurationException e) { log.error(e); - throw new AxisFault("ParserConfigurationException : " + e.getMessage()); + throw AxisFault.makeFault(e); } catch (SAXException e) { log.error(e); - throw new AxisFault("SAXException : " + e.getMessage()); + throw AxisFault.makeFault(e); } catch (WSDLException e) { log.error(e); - throw new AxisFault("WSDLException : " + e.getMessage()); + throw AxisFault.makeFault(e); } } Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java?view=diff&rev=548032&r1=548031&r2=548032 ============================================================================== --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java (original) +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java Sun Jun 17 05:00:55 2007 @@ -450,7 +450,7 @@ PortType portType = wsdl4jDefinition.getPortType(wsdl4jBinding.getPortType().getQName()); - + String targetNamespace = wsdl4jDefinition.getTargetNamespace(); for (Iterator iterator = wsdl4jBidingOperations.iterator(); iterator.hasNext();) { @@ -461,7 +461,7 @@ axisBindingOperation.setName(new QName("", wsdl4jBindingOperation.getName())); addDocumentation(axisBindingOperation, wsdl4jBindingOperation.getDocumentationElement()); - axisOperation = axisService.getOperation(new QName("", wsdl4jOperation.getName())); + axisOperation = axisService.getOperation(new QName(targetNamespace, wsdl4jOperation.getName())); axisBindingOperation.setAxisOperation(axisOperation); // process ExtensibilityElements of the wsdl4jBinding @@ -479,7 +479,6 @@ if (wsdl4jBindingInput != null && WSDLUtil.isInputPresentForMEP(axisOperation.getMessageExchangePattern())) { - AxisBindingMessage axisBindingInMessage = new AxisBindingMessage(); addDocumentation(axisBindingInMessage, wsdl4jBindingInput.getDocumentationElement()); copyExtensibleElements(wsdl4jBindingInput.getExtensibilityElements(), @@ -992,7 +991,7 @@ private AxisOperation populateOperations(Operation wsdl4jOperation, PortType wsdl4jPortType, Definition dif) throws AxisFault { - QName opName = new QName(wsdl4jOperation.getName()); + QName opName = new QName(dif.getTargetNamespace(),wsdl4jOperation.getName()); // Copy Name Attribute AxisOperation axisOperation = axisService.getOperation(opName); if (axisOperation == null) { --------------------------------------------------------------------- To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org For additional commands, e-mail: axis-cvs-help@ws.apache.org