svn commit: r928624 - in /incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine: HISEEngineImpl.java jaxws/HISEJaxWSService.java

[rr...@apache.org]

Author: rr
Date: Mon Mar 29 07:48:07 2010
New Revision: 928624

URL: http://svn.apache.org/viewvc?rev=928624&view=rev
Log:
HISE-31: HiseEngine.receive assumes message is wrapped (fix, by Maciej Prochniak)

Modified:
    incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/HISEEngineImpl.java
    incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/jaxws/HISEJaxWSService.java

Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/HISEEngineImpl.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/HISEEngineImpl.java?rev=928624&r1=928623&r2=928624&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/HISEEngineImpl.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/HISEEngineImpl.java Mon Mar 29 07:48:07 2010
@@ -132,9 +132,9 @@ public class HISEEngineImpl implements H
         TaskDefinition def = getTaskDefinition(taskName);
         Task t;
         if (def.isNotification()) {
-            t = Task.createNotification(this, getTaskDefinition(taskName), createdBy, DOMUtils.getFirstElement(body), requestHeader);
+            t = Task.createNotification(this, getTaskDefinition(taskName), createdBy, body, requestHeader);
         } else {
-            t = Task.create(this, getTaskDefinition(taskName), createdBy, DOMUtils.getFirstElement(body), requestHeader);
+            t = Task.create(this, getTaskDefinition(taskName), createdBy, body, requestHeader);
         }
         return t.getTaskEvaluator().evaluateApproveResponseHeader();
     }

Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/jaxws/HISEJaxWSService.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/jaxws/HISEJaxWSService.java?rev=928624&r1=928623&r2=928624&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/jaxws/HISEJaxWSService.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/jaxws/HISEJaxWSService.java Mon Mar 29 07:48:07 2010
@@ -19,36 +19,26 @@
 
 package org.apache.hise.engine.jaxws;
 
-import javax.annotation.Resource;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceException;
-import javax.xml.namespace.QName;
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.ws.Provider;
-import javax.xml.ws.Service;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.WebServiceProvider;
-import javax.xml.ws.handler.MessageContext;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hise.api.HISEEngine;
 import org.apache.hise.api.Handler;
-import org.apache.hise.engine.HISEEngineImpl;
-import org.springframework.orm.jpa.JpaCallback;
-import org.springframework.orm.jpa.JpaTemplate;
-import org.springframework.orm.jpa.JpaTransactionManager;
+import org.apache.hise.utils.DOMUtils;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionCallback;
 import org.springframework.transaction.support.TransactionTemplate;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
+import javax.annotation.Resource;
+import javax.xml.namespace.QName;
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.*;
+import javax.xml.ws.handler.MessageContext;
+
 @WebServiceProvider
 @ServiceMode(value = Service.Mode.MESSAGE)
 public class HISEJaxWSService implements Provider<SOAPMessage>, Handler {
@@ -108,7 +98,7 @@ public class HISEJaxWSService implements
                     QName portType = (QName) c.get("javax.xml.ws.wsdl.interface");
                     QName operation2 = (QName) c.get("javax.xml.ws.wsdl.operation");
 
-                    Element body = request.getSOAPBody();
+                    Element body = DOMUtils.getFirstElement(request.getSOAPBody());
                     __log.debug("invoking " + request + " operation:" + operation + " portType:" + portType + " operation2:" + operation2);
                     Node approveResponseHeader = hiseEngine.receive(HISEJaxWSService.this, portType, operation.getLocalPart(), body, request.getSOAPHeader());
                     SOAPMessage m = messageFactory.createMessage();