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/12/22 04:30:20 UTC
svn commit: r358470 - in /webservices/axis2/trunk/java/modules/core:
src/org/apache/axis2/ src/org/apache/axis2/deployment/
src/org/apache/axis2/description/ src/org/apache/axis2/engine/
src/org/apache/axis2/receivers/ test/org/apache/axis2/engine/
Author: deepal
Date: Wed Dec 21 19:29:56 2005
New Revision: 358470
URL: http://svn.apache.org/viewcvs?rev=358470&view=rev
Log:
added the ability of adding default message receivers as described by
http://marc.theaimsgroup.com/?l=axis-dev&m=113522124503998&w=2
started to implement session management
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/axis2.xml
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleConfigTest.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java?rev=358470&r1=358469&r2=358470&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java Wed Dec 21 19:29:56 2005
@@ -71,6 +71,9 @@
* Field APPLICATION_SCOPE
*/
public static final String APPLICATION_SCOPE = "application";
+ public static final String SOAP_SESSION_SCOPE = "SOAPSession";
+ public static final String TRANSPORT_SESSION_SCOPE = "TransportSession";
+ public static final String REQUEST_SCOPE = "Request";
public static final String AXIS2_HOME = "axis2home";
@@ -175,6 +178,8 @@
public static final String ADDRESSING_MESSAGE_ID = "WS-Addressing:MessageId";
public static final String ADDRESSING_FROM = "WS-Addressing:From";
public static final String ADDRESSING_FAULT_TO = "WS-Addressing:FaultTo";
+
+ //See
/**
* Addressing Constants
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java?rev=358470&r1=358469&r2=358470&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java Wed Dec 21 19:29:56 2005
@@ -20,11 +20,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.deployment.util.PhasesInfo;
import org.apache.axis2.deployment.util.Utils;
-import org.apache.axis2.description.HandlerDescription;
-import org.apache.axis2.description.ModuleConfiguration;
-import org.apache.axis2.description.ParameterInclude;
-import org.apache.axis2.description.TransportInDescription;
-import org.apache.axis2.description.TransportOutDescription;
+import org.apache.axis2.description.*;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.AxisObserver;
import org.apache.axis2.engine.MessageReceiver;
@@ -41,6 +37,7 @@
import javax.xml.stream.XMLStreamException;
import java.io.InputStream;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.Iterator;
public class AxisConfigBuilder extends DescriptionBuilder {
@@ -65,17 +62,15 @@
processParameters(itr, axisConfiguration, axisConfiguration);
// process MessageReciver
- Iterator msgRecives = config_element.getChildrenWithName(new QName(TAG_MESSAGE_RECEIVER));
-
- while (msgRecives.hasNext()) {
- OMElement msgRev = (OMElement) msgRecives.next();
- MessageReceiver msgrecivere =
- loadMessageReceiver(Thread.currentThread().getContextClassLoader(), msgRev);
- OMAttribute mepAtt = msgRev.getAttribute(new QName(TAG_MEP));
-
- axisConfiguration.addMessageReceiver(mepAtt.getAttributeValue(), msgrecivere);
+ OMElement messageReceiver = config_element.getFirstChildWithName(new QName(TAG_MESSAGE_RECEIVERS));
+ if (messageReceiver != null) {
+ HashMap mrs = processMessageReceivers(messageReceiver);
+ Iterator keys = mrs.keySet().iterator();
+ while (keys.hasNext()) {
+ String key = (String) keys.next();
+ axisConfig.addMessageReceiver(key, (MessageReceiver) mrs.get(key));
+ }
}
-
// Process Module refs
Iterator moduleitr =
config_element.getChildrenWithName(new QName(DeploymentConstants.TAG_MODULE));
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java?rev=358470&r1=358469&r2=358470&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java Wed Dec 21 19:29:56 2005
@@ -51,6 +51,7 @@
String TAG_ORDER = "order"; // to resolve the order tag
String TAG_OPERATION = "operation"; // operation start tag
String TAG_MESSAGE_RECEIVER = "messageReceiver";
+ String TAG_MESSAGE_RECEIVERS = "messageReceivers";
String TAG_MEP = "mep";
String TAG_FLOW_OUT_FAULT = "Outfaultflow"; // faultflow start tag
@@ -85,7 +86,6 @@
"org/apache/axis2/deployment/axis2.xml";
String SERVER_XML_FILE = "axis2.xml";
String DIRECTORY_SERVICES = "services";
- String DEFAULT_MESSAGE_RECEIVER = "org.apache.axis2.receivers.RawXMLINOutMessageReceiver";
String BOOLEAN_TRUE = "true";
String BOOLEAN_FALSE = "false";
char SEPARATOR_DOT = '.';
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java?rev=358470&r1=358469&r2=358470&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java Wed Dec 21 19:29:56 2005
@@ -19,13 +19,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
-import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.description.Flow;
-import org.apache.axis2.description.FlowImpl;
-import org.apache.axis2.description.HandlerDescription;
-import org.apache.axis2.description.Parameter;
-import org.apache.axis2.description.ParameterImpl;
-import org.apache.axis2.description.ParameterInclude;
+import org.apache.axis2.description.*;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.i18n.Messages;
@@ -36,6 +30,7 @@
import org.apache.axis2.om.impl.llom.builder.StAXOMBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.wsdl.WSDLConstants;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLInputFactory;
@@ -43,6 +38,7 @@
import javax.xml.stream.XMLStreamReader;
import java.io.InputStream;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.Iterator;
/**
@@ -82,37 +78,42 @@
return element;
}
- protected MessageReceiver loadDefaultMessageReceiver() throws DeploymentException {
- MessageReceiver receiver;
- String defaultMessageReceiver = DEFAULT_MESSAGE_RECEIVER;
-
- try {
-
- /**
- * Setting default Message Recive as Message Receiver
- */
- ClassLoader loader1 = Thread.currentThread().getContextClassLoader();
- Class messageReceiver = Class.forName(defaultMessageReceiver, true, loader1);
-
- receiver = ((MessageReceiver) messageReceiver.newInstance());
- } catch (ClassNotFoundException e) {
- throw new DeploymentException(
- Messages.getMessage(
- DeploymentErrorMsgs.ERROR_IN_LOADING_MESSAGE_RECEIVER, "ClassNotFoundException",
- defaultMessageReceiver));
- } catch (IllegalAccessException e) {
- throw new DeploymentException(
- Messages.getMessage(
- DeploymentErrorMsgs.ERROR_IN_LOADING_MESSAGE_RECEIVER, "IllegalAccessException",
- defaultMessageReceiver));
- } catch (InstantiationException e) {
- throw new DeploymentException(
- Messages.getMessage(
- DeploymentErrorMsgs.ERROR_IN_LOADING_MESSAGE_RECEIVER, "InstantiationException",
- defaultMessageReceiver));
+ /**
+ * to load default message receivers , in this case first try to search in Axiservice for the
+ * given mepURL , if it not found will search in AixsConfiguration for the given mepURL
+ *
+ * @param mepURL : can be null
+ * @param service : This can be null <code>AxisService</code>
+ */
+ protected MessageReceiver loadDefaultMessageReceiver(String mepURL, AxisService service) {
+ MessageReceiver messageReceiver;
+ if (mepURL == null) {
+ mepURL = WSDLConstants.MEP_URI_IN_OUT;
}
+ if (service != null) {
+ messageReceiver = service.getMessageReceiver(mepURL);
+ if (messageReceiver != null)
+ return messageReceiver;
+ }
+ return axisConfig.getMessageReceiver(mepURL);
+ }
- return receiver;
+ /**
+ * To process default message recivers specify either in axis2.xml or services.xml
+ *
+ * @param messageReceivers
+ */
+ protected HashMap processMessageReceivers(OMElement messageReceivers) throws DeploymentException {
+ HashMap mr_mep = new HashMap();
+ Iterator msgRecives = messageReceivers.getChildrenWithName(new QName(TAG_MESSAGE_RECEIVER));
+ while (msgRecives.hasNext()) {
+ OMElement msgRev = (OMElement) msgRecives.next();
+ MessageReceiver msgrecivere =
+ loadMessageReceiver(Thread.currentThread().getContextClassLoader(), msgRev);
+ OMAttribute mepAtt = msgRev.getAttribute(new QName(TAG_MEP));
+ mr_mep.put(mepAtt.getAttributeValue(), msgrecivere);
+ }
+ return mr_mep;
}
protected MessageReceiver loadMessageReceiver(ClassLoader loader, OMElement reciverElement)
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java?rev=358470&r1=358469&r2=358470&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java Wed Dec 21 19:29:56 2005
@@ -198,7 +198,7 @@
} else {
// setting default message receiver
- MessageReceiver msgReceiver = loadDefaultMessageReceiver();
+ MessageReceiver msgReceiver = loadDefaultMessageReceiver(mepURL, null);
op_descrip.setMessageReceiver(msgReceiver);
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java?rev=358470&r1=358469&r2=358470&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java Wed Dec 21 19:29:56 2005
@@ -31,6 +31,7 @@
import java.io.InputStream;
import java.io.StringWriter;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.Iterator;
/**
@@ -94,6 +95,18 @@
processModuleRefs(moduleRefs);
+ //processing Default Message receivers
+ OMElement messageReceiver = service_element.getFirstChildWithName(
+ new QName(TAG_MESSAGE_RECEIVERS));
+ if (messageReceiver != null) {
+ HashMap mrs = processMessageReceivers(messageReceiver);
+ Iterator keys = mrs.keySet().iterator();
+ while (keys.hasNext()) {
+ String key = (String) keys.next();
+ service.addMessageReceiver(key, (MessageReceiver) mrs.get(key));
+ }
+ }
+
// processing operations
Iterator operationsIterator =
service_element.getChildrenWithName(new QName(TAG_OPERATION));
@@ -105,7 +118,6 @@
for (int j = 0; j < wsamappings.size(); j++) {
Parameter parameter = (Parameter) wsamappings.get(j);
-
service.mapActionToOperation((String) parameter.getValue(), operationDesc);
}
@@ -113,7 +125,6 @@
}
Iterator moduleConfigs = service_element.getChildrenWithName(new QName(TAG_MODULE_CONFIG));
-
processServiceModuleConfig(moduleConfigs, service, service);
} catch (XMLStreamException e) {
throw new DeploymentException(e);
@@ -245,10 +256,8 @@
op_descrip.setMessageReceiver(messageReceiver);
} else {
-
// setting default message receiver
- MessageReceiver msgReceiver = loadDefaultMessageReceiver();
-
+ MessageReceiver msgReceiver = loadDefaultMessageReceiver(null, service);
op_descrip.setMessageReceiver(msgReceiver);
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/axis2.xml?rev=358470&r1=358469&r2=358470&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/axis2.xml Wed Dec 21 19:29:56 2005
@@ -33,9 +33,16 @@
<!-- ================================================= -->
<!-- Message Receivers -->
<!-- ================================================= -->
- <!-- This is the Deafult Message Receiver for the Request Response style Operations -->
- <messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
-
+ <!--This is the Deafult Message Receiver for the system , if you want to have MessageReceivers for -->
+ <!--all the other MEP implement it and add the correct entry to here , so that you can refer from-->
+ <!--any operation -->
+ <!--Note : You can ovride this for particular service by adding the same element with your requirement-->
+ <messageReceivers>
+ <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only"
+ class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
+ <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
+ class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+ </messageReceivers>
<!-- ================================================= -->
<!-- Transport Ins -->
<!-- ================================================= -->
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java?rev=358470&r1=358469&r2=358470&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java Wed Dec 21 19:29:56 2005
@@ -20,7 +20,9 @@
import com.ibm.wsdl.extensions.soap.SOAPAddressImpl;
import com.ibm.wsdl.extensions.soap.SOAPConstants;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
import org.apache.axis2.engine.AxisConfiguration;
+import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.om.OMElement;
import org.apache.axis2.wsdl.writer.WOMWriter;
import org.apache.axis2.wsdl.writer.WOMWriterFactory;
@@ -75,6 +77,12 @@
//wsdl is there for this service or not (in side META-INF)
private boolean wsdlfound = false;
+ //to store the scope of the service
+ private String scope;
+
+ //to store default message receivers
+ private HashMap messageReceivers;
+
/**
* Constructor AxisService
*/
@@ -82,6 +90,9 @@
this.paramterInclude = new ParameterIncludeImpl();
this.operationsAliasesMap = new HashMap();
moduleConfigmap = new HashMap();
+ //by dafault service scop is TranportSession
+ scope = Constants.TRANSPORT_SESSION_SCOPE;
+ messageReceivers = new HashMap();
}
/**
@@ -92,6 +103,14 @@
this.name = name;
}
+ public void addMessageReceiver(String mepURL, MessageReceiver messageReceiver) {
+ messageReceivers.put(mepURL, messageReceiver);
+ }
+
+ public MessageReceiver getMessageReceiver(String mepURL) {
+ return (MessageReceiver) messageReceivers.get(mepURL);
+ }
+
/**
* Adding module configuration , if there is moduleConfig tag in service
*
@@ -590,6 +609,7 @@
}
public void setSchema(XmlSchema schema) {
+ //todo : need to support multiple schemas
this.schema = schema;
}
@@ -599,5 +619,18 @@
public void setWsdlfound(boolean wsdlfound) {
this.wsdlfound = wsdlfound;
+ }
+
+ public String getScope() {
+ return scope;
+ }
+
+ public void setScope(String scope) {
+ if (Constants.APPLICATION_SCOPE.equals(scope) ||
+ Constants.TRANSPORT_SESSION_SCOPE.equals(scope) ||
+ Constants.SOAP_SESSION_SCOPE.equals(scope) ||
+ Constants.REQUEST_SCOPE.equals(scope)) {
+ this.scope = scope;
+ }
}
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java?rev=358470&r1=358469&r2=358470&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java Wed Dec 21 19:29:56 2005
@@ -23,25 +23,22 @@
import org.apache.axis2.deployment.util.PhasesInfo;
import org.apache.axis2.description.*;
import org.apache.axis2.om.OMElement;
+import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver;
+import org.apache.axis2.receivers.RawXMLINOutMessageReceiver;
import org.apache.axis2.util.HostConfiguration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import javax.xml.namespace.QName;
import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
/**
* Class AxisConfigurationImpl
*/
public class AxisConfiguration implements ParameterInclude {
- private Log log = LogFactory.getLog(getClass());
+ private Log log = LogFactory.getLog(getClass());
/**
* Field modules
*/
@@ -58,19 +55,18 @@
/**
* Field engagedModules
*/
- protected final List engagedModules;
+ private final List engagedModules;
private Hashtable faultyModules;
-
/**
* To store faulty services
*/
private Hashtable faultyServices;
// to store host configuration if any
- HostConfiguration hostConfiguration;
+ private HostConfiguration hostConfiguration;
private ArrayList inFaultPhases;
private ArrayList inPhasesUptoAndIncludingPostDispatch;
- protected HashMap messagReceivers;
+ private HashMap messageReceivers;
private ClassLoader moduleClassLoader;
private HashMap moduleConfigmap;
@@ -88,7 +84,7 @@
moduleConfigmap = new HashMap();
paramInclude = new ParameterIncludeImpl();
engagedModules = new ArrayList();
- messagReceivers = new HashMap();
+ messageReceivers = new HashMap();
outPhases = new ArrayList();
inFaultPhases = new ArrayList();
outFaultPhases = new ArrayList();
@@ -105,10 +101,21 @@
// todo we need to fix this , we know that we are doing wrong thing here
createDefaultChain();
+ //setting default message receivers
+ addDefaultMessageReceivers();
+ }
+
+ public void addMessageReceiver(String mepURL, MessageReceiver messageReceiver) {
+ messageReceivers.put(mepURL, messageReceiver);
}
- public void addMessageReceiver(String key, MessageReceiver messageReceiver) {
- messagReceivers.put(key, messageReceiver);
+ /**
+ * This is required if we are going to create AxisConfiguration programatically
+ * in that case , no dafault message recivers will there be in the system
+ */
+ private void addDefaultMessageReceivers() {
+ addMessageReceiver("http://www.w3.org/2004/08/wsdl/in-only", new RawXMLINOnlyMessageReceiver());
+ addMessageReceiver("http://www.w3.org/2004/08/wsdl/in-out", new RawXMLINOutMessageReceiver());
}
/**
@@ -362,8 +369,8 @@
return inPhasesUptoAndIncludingPostDispatch;
}
- public MessageReceiver getMessageReceiver(String key) {
- return (MessageReceiver) messagReceivers.get(key);
+ public MessageReceiver getMessageReceiver(String mepURL) {
+ return (MessageReceiver) messageReceivers.get(mepURL);
}
/**
@@ -426,7 +433,6 @@
*
* @param name
* @return Returns AxisService.
- * @throws AxisFault
*/
public AxisService getService(String name) {
return (AxisService) allservices.get(name);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java?rev=358470&r1=358469&r2=358470&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java Wed Dec 21 19:29:56 2005
@@ -18,7 +18,6 @@
package org.apache.axis2.receivers;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.Constants;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.engine.DependencyManager;
@@ -45,20 +44,9 @@
protected Log log = LogFactory.getLog(getClass());
/**
- * Field classLoader
- */
- private ClassLoader classLoader;
-
- /**
- * Field scope
- */
- private String scope;
-
- /**
* Constructor RawXMLProvider
*/
public RawXMLINOutMessageReceiver() {
- scope = Constants.APPLICATION_SCOPE;
}
public Method findOperation(AxisOperation op, Class ImplClass) {
@@ -97,12 +85,12 @@
String style =
msgContext.getOperationContext().getAxisOperation().getStyle();
Class[] parameters = method.getParameterTypes();
- Object[] args = null;
+ Object[] args;
if ((parameters == null) || (parameters.length == 0)) {
args = new Object[0];
} else if (parameters.length == 1) {
- OMElement omElement = null;
+ OMElement omElement;
if (WSDLService.STYLE_DOC.equals(style)) {
omElement = msgContext.getEnvelope().getBody().getFirstElement();
@@ -133,7 +121,7 @@
}
OMElement result = (OMElement) method.invoke(obj, args);
- OMElement bodyContent = null;
+ OMElement bodyContent;
if (WSDLService.STYLE_RPC.equals(style)) {
OMNamespace ns = getSOAPFactory().createOMNamespace("http://soapenc/", "res");
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleConfigTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleConfigTest.java?rev=358470&r1=358469&r2=358470&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleConfigTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleConfigTest.java Wed Dec 21 19:29:56 2005
@@ -69,7 +69,7 @@
service.setName("testService");
ar.addService(service);
InputStream in = new FileInputStream(repo + "/service1.xml");
- ServiceBuilder sbuilder = new ServiceBuilder(in, null, service);
+ ServiceBuilder sbuilder = new ServiceBuilder(in, new AxisConfiguration(), service);
sbuilder.populateService(sbuilder.buildOM());
ModuleConfiguration moduleConfiguration = service.getModuleConfig(new QName("Servie_module"));