Author: vanto
Date: Wed Dec 17 04:07:28 2008
New Revision: 727355
URL: http://svn.apache.org/viewvc?rev=727355&view=rev
Log:
minor fixed for ODE-465 in trunk.
Modified:
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEMessageReceiver.java
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/SessionOutHandler.java
ode/trunk/il-common/src/main/java/org/apache/ode/il/epr/WSAEndpoint.java
ode/trunk/il-common/src/main/java/org/apache/ode/il/epr/WSDL20Endpoint.java
Modified:
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEMessageReceiver.java
URL:
http://svn.apache.org/viewvc/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEMessageReceiver.java?rev=727355&r1=727354&r2=727355&view=diff
==============================================================================
---
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEMessageReceiver.java
(original)
+++
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEMessageReceiver.java
Wed Dec 17 04:07:28 2008
@@ -24,7 +24,7 @@
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.engine.AxisEngine;
import org.apache.axis2.receivers.AbstractMessageReceiver;
-import org.apache.axis2.util.Utils;
+import org.apache.axis2.util.MessageContextBuilder;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -45,7 +45,7 @@
__log.debug("Received request message for " +
msgContext.getAxisService().getName() + "."
+ msgContext.getAxisOperation().getName());
// Client is expecting a response, running in the same thread
- MessageContext outMsgContext =
Utils.createOutMessageContext(msgContext);
+ MessageContext outMsgContext =
MessageContextBuilder.createOutMessageContext(msgContext);
outMsgContext.getOperationContext().addMessageContext(outMsgContext);
invokeBusinessLogic(msgContext, outMsgContext);
if (__log.isDebugEnabled()) {
Modified:
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/SessionOutHandler.java
URL:
http://svn.apache.org/viewvc/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/SessionOutHandler.java?rev=727355&r1=727354&r2=727355&view=diff
==============================================================================
---
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/SessionOutHandler.java
(original)
+++
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/SessionOutHandler.java
Wed Dec 17 04:07:28 2008
@@ -57,7 +57,7 @@
if (otargetSession != null || ocallbackSession != null) {
SOAPHeader header = messageContext.getEnvelope().getHeader();
SOAPFactory factory = (SOAPFactory)
messageContext.getEnvelope().getOMFactory();
- OMNamespace intalioSessNS =
factory.createOMNamespace(Namespaces.ODE_SESSION_NS, "intalio");
+ OMNamespace odeSessNS =
factory.createOMNamespace(Namespaces.ODE_SESSION_NS, "odesession");
OMNamespace wsAddrNS =
factory.createOMNamespace(Namespaces.WS_ADDRESSING_NS, "addr");
if (header == null) {
header =
factory.createSOAPHeader(messageContext.getEnvelope());
@@ -92,7 +92,7 @@
}
if (targetEpr.getSessionId() != null) {
- OMElement session =
factory.createSOAPHeaderBlock("session", intalioSessNS);
+ OMElement session =
factory.createSOAPHeaderBlock("session", odeSessNS);
header.addChild(session);
session.setText(targetEpr.getSessionId());
}
@@ -101,13 +101,13 @@
if (ocallbackSession != null && ocallbackSession instanceof
MutableEndpoint) {
WSAEndpoint callbackEpr =
EndpointFactory.convertToWSA((MutableEndpoint) ocallbackSession);
- OMElement callback = factory.createSOAPHeaderBlock("callback",
intalioSessNS);
+ OMElement callback = factory.createSOAPHeaderBlock("callback",
odeSessNS);
header.addChild(callback);
OMElement address = factory.createOMElement("Address",
wsAddrNS);
callback.addChild(address);
address.setText(callbackEpr.getUrl());
if (callbackEpr.getSessionId() != null) {
- OMElement session = factory.createOMElement("session",
intalioSessNS);
+ OMElement session = factory.createOMElement("session",
odeSessNS);
session.setText(callbackEpr.getSessionId());
callback.addChild(session);
}
Modified:
ode/trunk/il-common/src/main/java/org/apache/ode/il/epr/WSAEndpoint.java
URL:
http://svn.apache.org/viewvc/ode/trunk/il-common/src/main/java/org/apache/ode/il/epr/WSAEndpoint.java?rev=727355&r1=727354&r2=727355&view=diff
==============================================================================
--- ode/trunk/il-common/src/main/java/org/apache/ode/il/epr/WSAEndpoint.java
(original)
+++ ode/trunk/il-common/src/main/java/org/apache/ode/il/epr/WSAEndpoint.java
Wed Dec 17 04:07:28 2008
@@ -51,10 +51,16 @@
public String getSessionId() {
NodeList idNodes =
_eprElmt.getElementsByTagNameNS(Namespaces.ODE_SESSION_NS, "session");
- if (idNodes.getLength() > 0)
+ if (idNodes.getLength() > 0) {
return idNodes.item(0).getTextContent();
- else
- return null;
+ } else {
+ // perhaps there is an intalio header?
+ idNodes =
_eprElmt.getElementsByTagNameNS(Namespaces.INTALIO_SESSION_NS, "session");
+ if (idNodes.getLength() > 0) {
+ return idNodes.item(0).getTextContent();
+ }
+ }
+ return null;
}
public void setSessionId(String sessionId) {
Modified:
ode/trunk/il-common/src/main/java/org/apache/ode/il/epr/WSDL20Endpoint.java
URL:
http://svn.apache.org/viewvc/ode/trunk/il-common/src/main/java/org/apache/ode/il/epr/WSDL20Endpoint.java?rev=727355&r1=727354&r2=727355&view=diff
==============================================================================
--- ode/trunk/il-common/src/main/java/org/apache/ode/il/epr/WSDL20Endpoint.java
(original)
+++ ode/trunk/il-common/src/main/java/org/apache/ode/il/epr/WSDL20Endpoint.java
Wed Dec 17 04:07:28 2008
@@ -40,10 +40,18 @@
}
public String getSessionId() {
- Element endpointElmt =
(Element)_serviceElmt.getElementsByTagNameNS(Namespaces.WSDL_20,
"endpoint").item(0);
- NodeList idNodes =
endpointElmt.getElementsByTagNameNS(Namespaces.ODE_SESSION_NS, "session");
- if (idNodes.getLength() > 0) return idNodes.item(0).getTextContent();
- else return null;
+ Element endpointElmt =
(Element)_serviceElmt.getElementsByTagNameNS(Namespaces.WSDL_20,
"endpoint").item(0);
+ NodeList idNodes =
endpointElmt.getElementsByTagNameNS(Namespaces.ODE_SESSION_NS, "session");
+ if (idNodes.getLength() > 0) {
+ return idNodes.item(0).getTextContent();
+ } else {
+ // perhaps there is an intalio header?
+ idNodes =
endpointElmt.getElementsByTagNameNS(Namespaces.INTALIO_SESSION_NS, "session");
+ if (idNodes.getLength() > 0) {
+ return idNodes.item(0).getTextContent();
+ }
+ }
+ return null;
}
public void setSessionId(String sessionId) {
@@ -105,7 +113,7 @@
HashMap<String,String> result = new HashMap<String,String>(1);
result.put(ADDRESS, getUrl());
String sid = getSessionId();
- if (sid != null) result.put(ADDRESS, sid);
+ if (sid != null) result.put(SESSION, sid);
return result;
}
