You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2005/11/23 01:22:55 UTC
svn commit: r348314 - in /webservices/axis2/trunk/java/modules:
codegen/src/org/apache/axis2/rpc/client/ core/src/org/apache/axis2/client/
integration/test/org/apache/axis2/engine/util/
Author: dims
Date: Tue Nov 22 16:22:47 2005
New Revision: 348314
URL: http://svn.apache.org/viewcvs?rev=348314&view=rev
Log:
- make assumeServiceContext non-static
- introduce get/set for ServiceContext
- get rid of commented lines
- make axisOperationTemplate non-static
Modified:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/RPCCall.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Call.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/MyInOutMEPClient.java
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/RPCCall.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/RPCCall.java?rev=348314&r1=348313&r2=348314&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/RPCCall.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/RPCCall.java Tue Nov 22 16:22:47 2005
@@ -33,14 +33,12 @@
public class RPCCall extends Call {
- protected static AxisOperation axisOperationTemplate;
-
/**
* @throws org.apache.axis2.AxisFault
*/
public RPCCall() throws AxisFault {
- super(assumeServiceContext(null));
+ super();
}
/**
@@ -51,7 +49,7 @@
* @throws org.apache.axis2.AxisFault
*/
public RPCCall(String clientHome) throws AxisFault {
- super(assumeServiceContext(clientHome));
+ super(clientHome);
}
/**
@@ -75,10 +73,10 @@
*/
public OMElement invokeBlocking(QName opName, Object [] args) throws AxisFault {
AxisOperation opDesc =
- serviceContext.getAxisService().getOperation(opName);
+ getServiceContext().getAxisService().getOperation(opName);
opDesc = createOpDescAndFillInFlowInformation(opDesc, opName.getLocalPart(),
WSDLConstants.MEP_CONSTANT_IN_OUT);
- opDesc.setParent(serviceContext.getAxisService());
+ opDesc.setParent(getServiceContext().getAxisService());
MessageContext msgctx = prepareTheSOAPEnvelope(BeanSerializerUtil.getOMElement(opName, args));
this.lastResponseMsgCtx = super.invokeBlocking(opDesc, msgctx);
@@ -104,10 +102,10 @@
public Object[] invokeBlocking(QName opName, Object [] args, Object [] returnTypes) throws AxisFault {
AxisOperation opDesc =
- serviceContext.getAxisService().getOperation(opName);
+ getServiceContext().getAxisService().getOperation(opName);
opDesc = createOpDescAndFillInFlowInformation(opDesc, opName.getLocalPart(),
WSDLConstants.MEP_CONSTANT_IN_OUT);
- opDesc.setParent(serviceContext.getAxisService());
+ opDesc.setParent(getServiceContext().getAxisService());
MessageContext msgctx = prepareTheSOAPEnvelope(BeanSerializerUtil.getOMElement(opName, args));
this.lastResponseMsgCtx = super.invokeBlocking(opDesc, msgctx);
SOAPEnvelope resEnvelope = lastResponseMsgCtx.getEnvelope();
@@ -130,7 +128,7 @@
Callback callback)
throws AxisFault {
AxisOperation opDesc =
- serviceContext.getAxisService().getOperation(opName);
+ getServiceContext().getAxisService().getOperation(opName);
opDesc = createOpDescAndFillInFlowInformation(opDesc, opName.getLocalPart(), WSDLConstants.MEP_CONSTANT_IN_OUT);
MessageContext msgctx = prepareTheSOAPEnvelope(BeanSerializerUtil.getOMElement(opName, args));
//call the underline implementation
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Call.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Call.java?rev=348314&r1=348313&r2=348314&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Call.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Call.java Tue Nov 22 16:22:47 2005
@@ -39,7 +39,7 @@
*/
public class Call extends InOutMEPClient {
- protected static AxisOperation axisOperationTemplate;
+ protected AxisOperation axisOperationTemplate;
protected MessageContext lastResponseMsgCtx;
/**
@@ -47,7 +47,8 @@
*/
public Call() throws AxisFault {
- super(assumeServiceContext(null));
+ super(null);
+ setServiceContext(assumeServiceContext(null));
}
/**
@@ -57,7 +58,8 @@
* @throws AxisFault
*/
public Call(String clientHome) throws AxisFault {
- super(assumeServiceContext(clientHome));
+ super(null);
+ setServiceContext(assumeServiceContext(clientHome));
}
/**
@@ -198,7 +200,7 @@
* @return ServiceContext that has a ConfigurationContext set in and has assumed values.
* @throws org.apache.axis2.AxisFault
*/
- protected static ServiceContext assumeServiceContext(String clientHome)
+ protected ServiceContext assumeServiceContext(String clientHome)
throws AxisFault {
ConfigurationContext sysContext = null;
//we are trying to keep one configuration Context at the Client side. That make it easier to
@@ -215,7 +217,7 @@
if(axisService == null) {
//we will assume a Service and operations
axisService = new AxisService(assumedServiceName);
-// axisOperationTemplate = new AxisOperation(new QName("TemplateOperation"));
+
axisOperationTemplate = new OutInAxisOperation(new QName("TemplateOperation"));
PhasesInfo info =((AxisConfigurationImpl)sysContext.getAxisConfiguration()).getPhasesinfo();
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java?rev=348314&r1=348313&r2=348314&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java Tue Nov 22 16:22:47 2005
@@ -41,13 +41,13 @@
* This is the super class for all the MEPClients.
*/
public abstract class MEPClient {
- protected ServiceContext serviceContext;
+ ServiceContext serviceContext;
protected final String mep;
protected String soapVersionURI = SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI;
protected String soapAction = "";
protected String wsaAction;
- protected MessageInformationHeaders messageInformationHeaders;
+ protected MessageInformationHeaders messageInformationHeaders = new MessageInformationHeaders();
protected List soapHeaderList;
@@ -67,7 +67,6 @@
public MEPClient(ServiceContext service, String mep) {
this.serviceContext = service;
this.mep = mep;
- messageInformationHeaders = new MessageInformationHeaders();
}
/**
@@ -336,4 +335,11 @@
}
}
+ public void setServiceContext(ServiceContext serviceContext) {
+ this.serviceContext = serviceContext;
+ }
+
+ public ServiceContext getServiceContext() {
+ return serviceContext;
+ }
}
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=348314&r1=348313&r2=348314&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 Nov 22 16:22:47 2005
@@ -28,10 +28,6 @@
public class MyInOutMEPClient extends Call {
- public MyInOutMEPClient() throws AxisFault {
- super(assumeServiceContext(null));
- }
-
public MyInOutMEPClient(String clientHome) throws AxisFault {
super(clientHome);
}
@@ -39,20 +35,15 @@
public SOAPEnvelope invokeBlockingWithEnvelopeOut(String axisop,
OMElement toSend) throws AxisFault {
AxisOperation axisConfig =
- serviceContext.getAxisService().getOperation(new QName(axisop));
+ getServiceContext().getAxisService().getOperation(new QName(axisop));
if (axisConfig == null) {
axisConfig = new OutInAxisOperation(new QName(axisop));
axisConfig.setRemainingPhasesInFlow(axisOperationTemplate.getRemainingPhasesInFlow());
axisConfig.setPhasesOutFlow(axisOperationTemplate.getPhasesOutFlow());
axisConfig.setPhasesInFaultFlow(axisOperationTemplate.getPhasesInFaultFlow());
axisConfig.setPhasesOutFaultFlow(axisOperationTemplate.getPhasesOutFaultFlow());
- serviceContext.getAxisService().addOperation(axisConfig);
+ getServiceContext().getAxisService().addOperation(axisConfig);
}
-
-// if (axisConfig == null) {
-// axisConfig = new AxisOperation(new QName(axisop));
-// serviceContext.getAxisServiceName().addOperation(axisConfig);
-// }
MessageContext msgctx = prepareTheSOAPEnvelope(toSend);
MessageContext responseContext = super.invokeBlocking(axisConfig,
@@ -64,20 +55,15 @@
public SOAPEnvelope invokeBlockingWithEnvelopeOut(String axisop,
SOAPEnvelope reqEnvelope) throws AxisFault {
AxisOperation axisConfig =
- serviceContext.getAxisService().getOperation(new QName(axisop));
+ getServiceContext().getAxisService().getOperation(new QName(axisop));
if (axisConfig == null) {
axisConfig = new OutInAxisOperation(new QName(axisop));
axisConfig.setRemainingPhasesInFlow(axisOperationTemplate.getRemainingPhasesInFlow());
axisConfig.setPhasesOutFlow(axisOperationTemplate.getPhasesOutFlow());
axisConfig.setPhasesInFaultFlow(axisOperationTemplate.getPhasesInFaultFlow());
axisConfig.setPhasesOutFaultFlow(axisOperationTemplate.getPhasesOutFaultFlow());
- serviceContext.getAxisService().addOperation(axisConfig);
+ getServiceContext().getAxisService().addOperation(axisConfig);
}
-
-// if (axisConfig == null) {
-// axisConfig = new AxisOperation(new QName(axisop));
-// serviceContext.getAxisServiceName().addOperation(axisConfig);
-// }
MessageContext msgctx = getMessageContext(reqEnvelope);
MessageContext responseContext = super.invokeBlocking(axisConfig,
@@ -86,7 +72,7 @@
}
protected MessageContext getMessageContext(SOAPEnvelope envelope) throws AxisFault {
- MessageContext msgctx = new MessageContext(serviceContext.getConfigurationContext());
+ MessageContext msgctx = new MessageContext(getServiceContext().getConfigurationContext());
msgctx.setEnvelope(envelope);
return msgctx;
}