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 de...@apache.org on 2005/10/04 14:47:45 UTC
svn commit: r293594 [2/2] - in /webservices/axis2/trunk/java/modules:
addressing/src/org/apache/axis2/handlers/addressing/
codegen/src/org/apache/axis2/wsdl/template/java/
core/src/org/apache/axis2/clientapi/ core/src/org/apache/axis2/context/
core/src...
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java?rev=293594&r1=293593&r2=293594&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java Tue Oct 4 05:45:03 2005
@@ -22,11 +22,7 @@
import org.apache.axis2.clientapi.MessageSender;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.description.OperationDescription;
-import org.apache.axis2.description.ParameterImpl;
-import org.apache.axis2.description.ServiceDescription;
-import org.apache.axis2.description.TransportInDescription;
-import org.apache.axis2.description.TransportOutDescription;
+import org.apache.axis2.description.*;
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.OMFactory;
@@ -82,7 +78,7 @@
service.addParameter(
new ParameterImpl(AbstractMessageReceiver.SERVICE_CLASS,
MessageContextEnabledEcho.class.getName()));
- OperationDescription operation = new OperationDescription(
+ OperationDescription operation = new InOnlyOperationDescription(
operationName);
operation.setMessageReceiver(new RawXMLINOnlyMessageReceiver());
service.addOperation(operation);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java?rev=293594&r1=293593&r2=293594&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java Tue Oct 4 05:45:03 2005
@@ -23,6 +23,7 @@
import org.apache.axis2.description.ModuleDescription;
import org.apache.axis2.description.OperationDescription;
import org.apache.axis2.description.ServiceDescription;
+import org.apache.axis2.description.OutInOperationDescription;
import org.apache.axis2.integration.UtilServer;
import org.apache.axis2.transport.http.SimpleHTTPServer;
import org.apache.axis2.util.Utils;
@@ -72,7 +73,7 @@
engineRegistry = new AxisConfigurationImpl();
service.engageModule(m1,engineRegistry);
- OperationDescription operation = new OperationDescription(
+ OperationDescription operation = new OutInOperationDescription(
operationName);
service.addOperation(operation);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/OneWayRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/OneWayRawXMLTest.java?rev=293594&r1=293593&r2=293594&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/OneWayRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/OneWayRawXMLTest.java Tue Oct 4 05:45:03 2005
@@ -26,6 +26,7 @@
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.OperationDescription;
import org.apache.axis2.description.ServiceDescription;
+import org.apache.axis2.description.OutInOperationDescription;
import org.apache.axis2.integration.TestingUtils;
import org.apache.axis2.integration.UtilServer;
import org.apache.axis2.om.OMAbstractFactory;
@@ -67,7 +68,7 @@
UtilServer.start();
ServiceDescription service = new ServiceDescription(serviceName);
- OperationDescription operation = new OperationDescription(
+ OperationDescription operation = new OutInOperationDescription(
operationName);
operation.setMessageReceiver(new MessageReceiver() {
public void receive(MessageContext messgeCtx) throws AxisFault {
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/MyInOutMEPClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/MyInOutMEPClient.java?rev=293594&r1=293593&r2=293594&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/MyInOutMEPClient.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/MyInOutMEPClient.java Tue Oct 4 05:45:03 2005
@@ -20,6 +20,7 @@
import org.apache.axis2.clientapi.Call;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.OperationDescription;
+import org.apache.axis2.description.OutInOperationDescription;
import org.apache.axis2.om.OMElement;
import org.apache.axis2.soap.SOAPEnvelope;
@@ -40,7 +41,7 @@
OperationDescription axisConfig =
serviceContext.getServiceConfig().getOperation(new QName(axisop));
if (axisConfig == null) {
- axisConfig = new OperationDescription(new QName(axisop));
+ axisConfig = new OutInOperationDescription(new QName(axisop));
axisConfig.setRemainingPhasesInFlow(operationTemplate.getRemainingPhasesInFlow());
axisConfig.setPhasesOutFlow(operationTemplate.getPhasesOutFlow());
axisConfig.setPhasesInFaultFlow(operationTemplate.getPhasesInFaultFlow());
@@ -65,7 +66,7 @@
OperationDescription axisConfig =
serviceContext.getServiceConfig().getOperation(new QName(axisop));
if (axisConfig == null) {
- axisConfig = new OperationDescription(new QName(axisop));
+ axisConfig = new OutInOperationDescription(new QName(axisop));
axisConfig.setRemainingPhasesInFlow(operationTemplate.getRemainingPhasesInFlow());
axisConfig.setPhasesOutFlow(operationTemplate.getPhasesOutFlow());
axisConfig.setPhasesInFaultFlow(operationTemplate.getPhasesInFaultFlow());
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailCharSetEncodingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailCharSetEncodingTest.java?rev=293594&r1=293593&r2=293594&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailCharSetEncodingTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailCharSetEncodingTest.java Tue Oct 4 05:45:03 2005
@@ -27,6 +27,7 @@
import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.description.OperationDescription;
import org.apache.axis2.description.ServiceDescription;
+import org.apache.axis2.description.OutInOperationDescription;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.Echo;
import org.apache.axis2.engine.MessageReceiver;
@@ -109,7 +110,7 @@
}
ServiceDescription clientService = new ServiceDescription(
serviceName);
- OperationDescription clientOperation = new OperationDescription(
+ OperationDescription clientOperation = new OutInOperationDescription(
operationName);
clientOperation.setMessageReceiver(new MessageReceiver() {
public void receive(MessageContext messgeCtx) throws AxisFault {
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailOneWayRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailOneWayRawXMLTest.java?rev=293594&r1=293593&r2=293594&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailOneWayRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailOneWayRawXMLTest.java Tue Oct 4 05:45:03 2005
@@ -28,6 +28,7 @@
import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.description.OperationDescription;
import org.apache.axis2.description.ServiceDescription;
+import org.apache.axis2.description.OutInOperationDescription;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
@@ -76,7 +77,7 @@
ml.start();
ServiceDescription service = new ServiceDescription(serviceName);
- OperationDescription operation = new OperationDescription(
+ OperationDescription operation = new OutInOperationDescription(
operationName);
operation.setMessageReceiver(new MessageReceiver() {
public void receive(MessageContext messgeCtx) throws AxisFault {
@@ -107,7 +108,7 @@
public void testOneWay() throws Exception {
ServiceDescription service = new ServiceDescription(serviceName);
- OperationDescription operation = new OperationDescription(
+ OperationDescription operation = new OutInOperationDescription(
operationName);
operation.setMessageReceiver(new MessageReceiver() {
public void receive(MessageContext messgeCtx) throws AxisFault {
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java?rev=293594&r1=293593&r2=293594&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java Tue Oct 4 05:45:03 2005
@@ -29,6 +29,7 @@
import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.description.OperationDescription;
import org.apache.axis2.description.ServiceDescription;
+import org.apache.axis2.description.OutInOperationDescription;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.Echo;
import org.apache.axis2.engine.MessageReceiver;
@@ -113,7 +114,7 @@
ConfigurationContext configContext = UtilsMailServer.createClientConfigurationContext();
ServiceDescription service = new ServiceDescription(serviceName);
- OperationDescription operation = new OperationDescription(
+ OperationDescription operation = new OutInOperationDescription(
operationName);
operation.setMessageReceiver(new MessageReceiver() {
public void receive(MessageContext messgeCtx) throws AxisFault {
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponceRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponceRawXMLTest.java?rev=293594&r1=293593&r2=293594&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponceRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponceRawXMLTest.java Tue Oct 4 05:45:03 2005
@@ -28,6 +28,7 @@
import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.description.OperationDescription;
import org.apache.axis2.description.ServiceDescription;
+import org.apache.axis2.description.OutInOperationDescription;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.Echo;
import org.apache.axis2.engine.MessageReceiver;
@@ -107,7 +108,7 @@
ConfigurationContext configContext = UtilsMailServer.createClientConfigurationContext();
ServiceDescription service = new ServiceDescription(serviceName);
- OperationDescription operation = new OperationDescription(
+ OperationDescription operation = new OutInOperationDescription(
operationName);
operation.setMessageReceiver(new MessageReceiver() {
public void receive(MessageContext messgeCtx) throws AxisFault {
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java?rev=293594&r1=293593&r2=293594&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java Tue Oct 4 05:45:03 2005
@@ -21,6 +21,7 @@
import org.apache.axis2.description.OperationDescription;
import org.apache.axis2.description.ParameterImpl;
import org.apache.axis2.description.ServiceDescription;
+import org.apache.axis2.description.OutInOperationDescription;
import org.apache.axis2.integration.UtilServer;
import org.apache.axis2.receivers.AbstractMessageReceiver;
import org.apache.axis2.receivers.RawXMLINOutMessageReceiver;
@@ -66,7 +67,7 @@
service.addParameter(new ParameterImpl(AbstractMessageReceiver.SERVICE_CLASS,
EchoService.class.getName()));
- OperationDescription axisOp = new OperationDescription(operationName);
+ OperationDescription axisOp = new OutInOperationDescription(operationName);
axisOp.setMessageReceiver(new RawXMLINOutMessageReceiver());
axisOp.setStyle(WSDLService.STYLE_DOC);
service.addOperation(axisOp);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwATest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwATest.java?rev=293594&r1=293593&r2=293594&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwATest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwATest.java Tue Oct 4 05:45:03 2005
@@ -22,6 +22,7 @@
import org.apache.axis2.description.OperationDescription;
import org.apache.axis2.description.ParameterImpl;
import org.apache.axis2.description.ServiceDescription;
+import org.apache.axis2.description.OutInOperationDescription;
import org.apache.axis2.integration.UtilServer;
import org.apache.axis2.om.OMText;
import org.apache.axis2.om.impl.llom.OMTextImpl;
@@ -70,7 +71,7 @@
service.addParameter(new ParameterImpl(
AbstractMessageReceiver.SERVICE_CLASS, EchoSwA.class
.getName()));
- OperationDescription axisOp = new OperationDescription(operationName);
+ OperationDescription axisOp = new OutInOperationDescription(operationName);
axisOp.setMessageReceiver(new RawXMLINOutMessageReceiver());
axisOp.setStyle(WSDLService.STYLE_DOC);
service.addOperation(axisOp);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java?rev=293594&r1=293593&r2=293594&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java Tue Oct 4 05:45:03 2005
@@ -29,6 +29,7 @@
import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.description.OperationDescription;
import org.apache.axis2.description.ServiceDescription;
+import org.apache.axis2.description.OutInOperationDescription;
import org.apache.axis2.engine.Echo;
import org.apache.axis2.integration.UtilServer;
import org.apache.axis2.integration.UtilsTCPServer;
@@ -207,7 +208,7 @@
ConfigurationContextFactory confac = new ConfigurationContextFactory();
ConfigurationContext configContext= confac.buildClientConfigurationContext(Constants.TESTING_REPOSITORY);
- OperationDescription opdesc = new OperationDescription(new QName("echoOMElement"));
+ OperationDescription opdesc = new OutInOperationDescription(new QName("echoOMElement"));
org.apache.axis2.clientapi.Call call = new org.apache.axis2.clientapi.Call(Constants.TESTING_REPOSITORY);
call.setTo(targetEPR);
Modified: webservices/axis2/trunk/java/modules/samples/src/sample/amazon/search/AsynchronousClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/amazon/search/AsynchronousClient.java?rev=293594&r1=293593&r2=293594&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/amazon/search/AsynchronousClient.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/amazon/search/AsynchronousClient.java Tue Oct 4 05:45:03 2005
@@ -22,6 +22,7 @@
import org.apache.axis2.clientapi.Call;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.OperationDescription;
+import org.apache.axis2.description.OutInOperationDescription;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLOutputFactory;
@@ -163,7 +164,7 @@
.createXMLStreamWriter
(System.out));
QName opName = new QName("urn:GoogleSearch", "doGoogleSearch");
- OperationDescription opdesc = new OperationDescription(opName);
+ OperationDescription opdesc = new OutInOperationDescription(opName);
call.invokeNonBlocking(opdesc,
requestContext,
new ClientCallbackHandler());
Modified: webservices/axis2/trunk/java/modules/samples/src/sample/google/search/AsynchronousClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/google/search/AsynchronousClient.java?rev=293594&r1=293593&r2=293594&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/google/search/AsynchronousClient.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/google/search/AsynchronousClient.java Tue Oct 4 05:45:03 2005
@@ -22,6 +22,7 @@
import org.apache.axis2.clientapi.Call;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.OperationDescription;
+import org.apache.axis2.description.OutInOperationDescription;
import sample.google.common.util.PropertyLoader;
import javax.xml.namespace.QName;
@@ -99,7 +100,7 @@
Constants.TRANSPORT_HTTP,
false);
QName opName = new QName("urn:GoogleSearch", "doGoogleSearch");
- OperationDescription opdesc = new OperationDescription(opName);
+ OperationDescription opdesc = new OutInOperationDescription(opName);
// OperationDescription opdesc = new OperationDescription(new QName("viewVersion"));
call.invokeNonBlocking(opdesc,
requestContext,
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllReceiver.java?rev=293594&r1=293593&r2=293594&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllReceiver.java Tue Oct 4 05:45:03 2005
@@ -68,7 +68,7 @@
//context - if it exists
if(!msgContext.isServerSide()) {//To make sure this is a response message
OperationContext opCtx = msgContext.getOperationContext();
- MessageContext outMsgCtx = opCtx.getMessageContext(WSDLConstants.MESSAGE_LABEL_IN);
+ MessageContext outMsgCtx = opCtx.getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
msgContext.setProperty(WSHandlerConstants.SEND_SIGV,outMsgCtx.getProperty(WSHandlerConstants.SEND_SIGV));
}
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllSender.java?rev=293594&r1=293593&r2=293594&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllSender.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllSender.java Tue Oct 4 05:45:03 2005
@@ -75,7 +75,7 @@
OperationContext opCtx = msgContext.getOperationContext();
MessageContext inMsgCtx;
if(opCtx != null &&
- (inMsgCtx = opCtx.getMessageContext(WSDLConstants.MESSAGE_LABEL_IN)) != null) {
+ (inMsgCtx = opCtx.getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE)) != null) {
msgContext.setProperty(WSHandlerConstants.RECV_RESULTS,
inMsgCtx.getProperty(WSHandlerConstants.RECV_RESULTS));
}