Author: mriou
Date: Fri Mar 28 16:30:17 2008
New Revision: 642431
URL: http://svn.apache.org/viewvc?rev=642431&view=rev
Log:
Fix to also support header parts that are explicitly defined in the abstrat
part of a message.
Modified:
ode/branches/APACHE_ODE_1.1/Rakefile
ode/branches/APACHE_ODE_1.1/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java
ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java
ode/branches/APACHE_ODE_1.1/axis2/src/test/java/org/apache/ode/axis2/SoapMessageConverterTest.java
ode/branches/APACHE_ODE_1.1/axis2/src/test/resources/testRequest1.xml
Modified: ode/branches/APACHE_ODE_1.1/Rakefile
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/Rakefile?rev=642431&r1=642430&r2=642431&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/Rakefile (original)
+++ ode/branches/APACHE_ODE_1.1/Rakefile Fri Mar 28 16:30:17 2008
@@ -179,12 +179,11 @@
test.with projects("tools"), libs, AXIS2_TEST, AXIOM, JAVAX.servlet
test.setup task(:prepare_webapp) do |task|
- unless File.exist?(_("target/test-classes/webapp"))
- cp_r _("src/main/webapp"), _("target/test-classes")
- cp Dir[_("src/main/webapp/WEB-INF/classes/*")],
_("target/test-classes")
- cp Dir[project("axis2").path_to("src/main/wsdl/*")],
_("target/test-classes/webapp/WEB-INF")
- cp project("bpel-schemas").path_to("src/main/xsd/pmapi.xsd"),
_("target/test-classes/webapp/WEB-INF")
- end
+ cp_r _("src/main/webapp"), _("target/test-classes")
+ cp Dir[_("src/main/webapp/WEB-INF/classes/*")], _("target/test-classes")
+ cp Dir[project("axis2").path_to("src/main/wsdl/*")],
_("target/test-classes/webapp/WEB-INF")
+ cp project("bpel-schemas").path_to("src/main/xsd/pmapi.xsd"),
_("target/test-classes/webapp/WEB-INF")
+ rm_rf Dir[_("target/test-classes/webapp") + "/**/.svn"]
end
test.setup
unzip(_("target/test-classes/webapp/WEB-INF")=>project("dao-jpa-ojpa-derby").package(:zip))
end
Modified:
ode/branches/APACHE_ODE_1.1/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java?rev=642431&r1=642430&r2=642431&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.1/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java
(original)
+++
ode/branches/APACHE_ODE_1.1/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java
Fri Mar 28 16:30:17 2008
@@ -78,7 +78,7 @@
public void testListDeployedPackages() throws Exception {
OMElement root = _client.buildMessage("listDeployedPackages", new
String[] {}, new String[] {});
OMElement result = sendToDeployment(root);
- assertEquals(_package, result.getFirstElement().getText());
+ assertEquals(_package,
result.getFirstElement().getFirstElement().getText());
}
public void testListProcesses() throws Exception {
@@ -116,12 +116,12 @@
// Deploying a couple of "tagged" versions
String depPack = deploy("foo");
int ver = Integer.parseInt(depPack.substring(depPack.lastIndexOf("-")
+ 1, depPack.length()));
- assertEquals(lastVer + 4, ver);
+ assertTrue(lastVer + 4 <= ver);
deployed.add(depPack);
depPack = deploy("bar");
ver = Integer.parseInt(depPack.substring(depPack.lastIndexOf("-") + 1,
depPack.length()));
- assertEquals(lastVer + 5, ver);
+ assertTrue(lastVer + 5 <= ver);
deployed.add(depPack);
// Cleaning up
Modified:
ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java?rev=642431&r1=642430&r2=642431&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java
(original)
+++
ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java
Fri Mar 28 16:30:17 2008
@@ -70,8 +70,6 @@
/**
* SOAP/ODE Message converter. Uses WSDL binding information to convert the
protocol-neutral ODE representation into a SOAP
* representation and vice versa.
- *
- * @author Maciej Szefler ( m s z e f l e r (at) g m a i l . c o m )
*/
public class SoapMessageConverter {
@@ -209,18 +207,18 @@
}
public void createSoapHeaders(SOAPEnvelope soapEnv, List<SOAPHeader>
headerDefs, Message msgdef, Map<String,Element> headers) throws AxisFault {
- for (SOAPHeader sh : headerDefs) validateSoapHeader(sh, msgdef,
headers);
+ for (SOAPHeader sh : headerDefs) handleSoapHeaderDef(soapEnv, sh,
msgdef, headers);
org.apache.axiom.soap.SOAPHeader soaphdr = soapEnv.getHeader();
- if (soaphdr == null)
- soaphdr = _soapFactory.createSOAPHeader(soapEnv);
+ if (soaphdr == null) soaphdr = _soapFactory.createSOAPHeader(soapEnv);
- for (Element headerElmts : headers.values())
- soaphdr.addChild(OMUtils.toOM(headerElmts, _soapFactory));
+ for (Element headerElmt : headers.values())
+ if (soaphdr.getFirstChildWithName(new
QName(headerElmt.getNamespaceURI(), headerElmt.getLocalName())) == null)
+ soaphdr.addChild(OMUtils.toOM(headerElmt, _soapFactory));
}
@SuppressWarnings("unchecked")
- public void validateSoapHeader(SOAPHeader headerdef, Message msgdef,
Map<String,Element> headers) throws AxisFault {
+ private void handleSoapHeaderDef(SOAPEnvelope soapEnv, SOAPHeader
headerdef, Message msgdef, Map<String,Element> headers) throws AxisFault {
boolean payloadMessageHeader = headerdef.getMessage() == null ||
headerdef.getMessage().equals(msgdef.getQName());
if (headerdef.getPart() == null) return;
@@ -237,6 +235,17 @@
// because AXIS may be providing these headers.
if (srcPartEl == null && payloadMessageHeader)
throw new
OdeFault(__msgs.msgOdeMessageMissingRequiredPart(headerdef.getPart()));
+
+ if (srcPartEl == null) return;
+
+ org.apache.axiom.soap.SOAPHeader soaphdr = soapEnv.getHeader();
+ if (soaphdr == null) {
+ soaphdr = _soapFactory.createSOAPHeader(soapEnv);
+ }
+
+ OMElement omPart = OMUtils.toOM(srcPartEl, _soapFactory);
+ for (Iterator<OMNode> i = omPart.getChildren(); i.hasNext();)
+ soaphdr.addChild(i.next());
}
public SOAPFault createSoapFault(Element message, QName faultName,
Operation op) throws AxisFault {
@@ -314,8 +323,7 @@
SOAPBody soapBody = getSOAPBody(bo);
if (soapBody != null)
- extractSoapBodyParts(odeMessage, envelope.getBody(),
- soapBody, op.getOutput().getMessage(), op.getName() +
"Response");
+ extractSoapBodyParts(odeMessage, envelope.getBody(), soapBody,
op.getOutput().getMessage(), op.getName() + "Response");
if (envelope.getHeader() != null)
extractSoapHeaderParts(odeMessage, envelope.getHeader(),
getSOAPHeaders(bo), op.getOutput().getMessage());
@@ -387,20 +395,19 @@
List<SOAPHeader> headerDefs, Message
msg) throws AxisFault {
// Checking that the definitions we have are at least there
for (SOAPHeader headerDef : headerDefs)
- checkSoapHeaderPart(soapHeader, headerDef, msg);
+ handleSoapHeaderPartDef(message, soapHeader, headerDef, msg);
// Extracting whatever header elements we find in the message, binding
and abstract parts
// aren't reliable enough given what people do out there.
Iterator headersIter = soapHeader.getChildElements();
while (headersIter.hasNext()) {
OMElement header = (OMElement) headersIter.next();
- Element headerDOM = OMUtils.toDOM(header);
- headerDOM.normalize();
- message.setHeaderPart(findHeaderPartName(headerDefs,
header.getQName()), headerDOM);
+ String partName = findHeaderPartName(headerDefs,
header.getQName());
+ message.setHeaderPart(partName, OMUtils.toDOM(header));
}
}
- private void checkSoapHeaderPart(org.apache.axiom.soap.SOAPHeader header,
SOAPHeader headerdef,
+ private void handleSoapHeaderPartDef(org.apache.ode.bpel.iapi.Message
odeMessage, org.apache.axiom.soap.SOAPHeader header, SOAPHeader headerdef,
Message msgType) throws AxisFault {
// Is this header part of the "payload" messsage?
boolean payloadMessageHeader = headerdef.getMessage() == null ||
headerdef.getMessage().equals(msgType.getQName());
@@ -422,6 +429,13 @@
OMElement headerEl = header.getFirstChildWithName(p.getElementName());
if (requiredHeader && headerEl == null)
throw new
OdeFault(__msgs.msgSoapHeaderMissingRequiredElement(headerdef.getElementType()));
+
+ if (headerEl == null) return;
+
+ Element msgElmt = odeMessage.getMessage();
+ Element destPart = msgElmt.getOwnerDocument().createElementNS(null,
p.getName());
+ msgElmt.appendChild(destPart);
+
destPart.appendChild(msgElmt.getOwnerDocument().importNode(OMUtils.toDOM(headerEl),
true));
}
private String findHeaderPartName(List<SOAPHeader> headerDefs, QName
elmtName) {
Modified:
ode/branches/APACHE_ODE_1.1/axis2/src/test/java/org/apache/ode/axis2/SoapMessageConverterTest.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/axis2/src/test/java/org/apache/ode/axis2/SoapMessageConverterTest.java?rev=642431&r1=642430&r2=642431&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.1/axis2/src/test/java/org/apache/ode/axis2/SoapMessageConverterTest.java
(original)
+++
ode/branches/APACHE_ODE_1.1/axis2/src/test/java/org/apache/ode/axis2/SoapMessageConverterTest.java
Fri Mar 28 16:30:17 2008
@@ -131,7 +131,7 @@
MessageImpl odeMsg1 = new MessageImpl(new MessageDAOImpl(null));
odeMsg1.setMessage(req1.getDocumentElement());
odeMsg1.setHeaderPart("DocumentumRequestHeader",
DOMUtils.findChildByName(req1.getDocumentElement(),
- new QName("http://documentum.com/ws/2005/services";,
"DocumentumRequestHeader")));
+ new QName("http://documentum.com/ws/2005/services";,
"DocumentumSecurityToken")));
portmapper.createSoapRequest(msgCtx, odeMsg1, op1);
SOAPEnvelope env = msgCtx.getEnvelope();
@@ -145,8 +145,11 @@
assertNotNull(params);
assertNotNull(odeMsg2.getHeaderPart("DocumentumRequestHeader"));
Element hdrElmt =
DOMUtils.findChildByName(odeMsg2.getHeaderPart("DocumentumRequestHeader"), new
QName("http://documentum.com/ws/2005/services";,
- "DocumentumRequestHeader"));
+ "DocumentumSecurityToken"));
assertNotNull(hdrElmt);
+ Element hdrBdyElmt =
DOMUtils.findChildByName(odeMsg2.getPart("DocumentumRequestHeader"), new
QName("http://documentum.com/ws/2005/services";,
+ "DocumentumSecurityToken"));
+ assertNotNull(hdrBdyElmt);
}
/** Make sure hello world request parses correctly. */
Modified: ode/branches/APACHE_ODE_1.1/axis2/src/test/resources/testRequest1.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/axis2/src/test/resources/testRequest1.xml?rev=642431&r1=642430&r2=642431&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/axis2/src/test/resources/testRequest1.xml
(original)
+++ ode/branches/APACHE_ODE_1.1/axis2/src/test/resources/testRequest1.xml Fri
Mar 28 16:30:17 2008
@@ -24,8 +24,6 @@
</getObjectId>
</parameters>
- <DocumentumRequestHeader xmlns="http://documentum.com/ws/2005/services";>
- <DocumentumSecurityToken/>
- </DocumentumRequestHeader>
-
+ <DocumentumSecurityToken
xmlns="http://documentum.com/ws/2005/services";>SEKREET</DocumentumSecurityToken>
+
</message>
