Author: deepal
Date: Mon Apr 17 03:31:47 2006
New Revision: 394652
URL: http://svn.apache.org/viewcvs?rev=394652&view=rev
Log:
-set servletConetxt into message context
- fixing default message receiver problem
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/FileSystemConfigurator.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java
URL:
http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java?rev=394652&r1=394651&r2=394652&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java
(original)
+++
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java
Mon Apr 17 03:31:47 2006
@@ -89,6 +89,7 @@
if (this.axisConfig.getService(this.axisService.getName()) == null) {
this.axisConfig.addService(this.axisService);
}
+ //TODO fix me
// create a service context for myself: create a new service group
// context and then get the service context for myself as I'll need
that
// later for stuff that I gotta do
@@ -114,7 +115,7 @@
initializeTransports(configContext);
try {
this.axisConfig = this.configContext.getAxisConfiguration();
- axisService =
AxisService.createClientSideAxisService(wsdl4jDefinition, wsdlServiceName,
portName, options);
+ this.axisService =
AxisService.createClientSideAxisService(wsdl4jDefinition, wsdlServiceName,
portName, options);
// add the service to the config context if it isn't in there
// already
if (this.axisConfig.getService(this.axisService.getName()) ==
null) {
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/FileSystemConfigurator.java
URL:
http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/FileSystemConfigurator.java?rev=394652&r1=394651&r2=394652&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/FileSystemConfigurator.java
(original)
+++
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/FileSystemConfigurator.java
Mon Apr 17 03:31:47 2006
@@ -73,29 +73,26 @@
// Deal with the config file. If a filename was specified as an
// arg to this constructor, just respect it.
if (axis2xml == null) {
- // If not, check for a system property setting
- axis2xml = System.getProperty(Constants.AXIS2_CONF);
-
- // If system property not set, use default filename
- if (axis2xml == null) {
- axis2xml = Constants.AXIS2_CONF;
- }
-
- // In either case, check that the file exists... if not
- // we'll use the default axis2.xml on the classpath.
- try {
- axis2xml = this.repoLocation + File.separator + axis2xml;
- File configFile = new File(axis2xml);
- if (!configFile.exists()) {
- axis2xml = null;
+ String propertyAxis2xml = System.getProperty(Constants.AXIS2_CONF);
+ if (propertyAxis2xml != null) {
+ try {
+ File axis2discriptor = new File(propertyAxis2xml);
+ if (axis2discriptor.exists()) {
+ this.axis2xml = axis2discriptor.getAbsolutePath();
+ } else {
+ this.axis2xml = null;
+ }
+ } catch (Exception e) {
+ this.axis2xml = null;
+ log.info("Error in file (axis2.xml) creation inside
FileSystemConfigurator");
}
- } catch (Exception e) {
- axis2xml = null;
- log.info("Error in file (axis2.xml) creation inside
FileSystemConfigurator");
+
+ } else {
+ this.axis2xml = null;
}
+ } else {
+ this.axis2xml = axis2xml;
}
-
- this.axis2xml = axis2xml;
}
/**
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=394652&r1=394651&r2=394652&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
Mon Apr 17 03:31:47 2006
@@ -21,13 +21,13 @@
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
-import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.axis2.deployment.util.PhasesInfo;
import org.apache.axis2.deployment.util.Utils;
import org.apache.axis2.description.*;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.i18n.Messages;
+import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.ws.java2wsdl.Java2WSDLConstants;
import javax.xml.namespace.QName;
@@ -111,6 +111,18 @@
}
}
+ //processing Default Message receivers
+ OMElement messageReceiver = service_element.getFirstChildWithName(
+ new QName(TAG_MESSAGE_RECEIVERS));
+ if (messageReceiver != null) {
+ HashMap mrs =
processMessageReceivers(service.getClassLoader(), messageReceiver);
+ Iterator keys = mrs.keySet().iterator();
+ while (keys.hasNext()) {
+ String key = (String) keys.next();
+ service.addMessageReceiver(key, (MessageReceiver)
mrs.get(key));
+ }
+ }
+
// Generating schema for the service if the imple class is JAVA
if (!service.isWsdlfound()) {
//trying to generate WSDL for the service using JAM and Java
refelection
@@ -160,18 +172,6 @@
Iterator moduleRefs = service_element.getChildrenWithName(new
QName(TAG_MODULE));
processModuleRefs(moduleRefs);
-
- //processing Default Message receivers
- OMElement messageReceiver = service_element.getFirstChildWithName(
- new QName(TAG_MESSAGE_RECEIVERS));
- if (messageReceiver != null) {
- HashMap mrs =
processMessageReceivers(service.getClassLoader(), messageReceiver);
- Iterator keys = mrs.keySet().iterator();
- while (keys.hasNext()) {
- String key = (String) keys.next();
- service.addMessageReceiver(key, (MessageReceiver)
mrs.get(key));
- }
- }
//processing transports
OMElement transports = service_element.getFirstChildWithName(new
QName(TAG_TRANSPORTS));
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java
URL:
http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java?rev=394652&r1=394651&r2=394652&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java
(original)
+++
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java
Mon Apr 17 03:31:47 2006
@@ -159,7 +159,7 @@
msgContext = createAndSetInitialParamsToMsgCtxt(sessionContext,
msgContext, res, req);
// adding ServletContext into msgContext;
- msgContext.setProperty(Constants.SERVLET_CONTEXT, sessionContext);
+ msgContext.setProperty(Constants.SERVLET_CONTEXT,
servletConfig.getServletContext());
out = res.getOutputStream();
HTTPTransportUtils.processHTTPPostRequest(msgContext,
req.getInputStream(), out,
req.getContentType(),
req.getHeader(HTTPConstants.HEADER_SOAP_ACTION),
