You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by he...@apache.org on 2007/06/17 14:00:56 UTC
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...
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 @@
* <p>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.</p>
+ * 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