[esb-java-dev] svn commit r24680 - in branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/eventing: . builders

[asankaa at wso2.com]

Author: asankaa
Date: Mon Nov 24 00:47:23 2008
New Revision: 24680
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=24680

Log:
Set related-to 


Modified:
   branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/eventing/EventSource.java
   branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/eventing/builders/ResponseMessageBuilder.java

Modified: branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/eventing/EventSource.java
URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/eventing/EventSource.java?rev=24680&r1=24679&r2=24680&view=diff
==============================================================================
--- branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/eventing/EventSource.java	(original)
+++ branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/eventing/EventSource.java	Mon Nov 24 00:47:23 2008
@@ -22,6 +22,7 @@
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.addressing.EndpointReference;
+import org.apache.axis2.addressing.RelatesTo;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.AxisOperation;
 import org.apache.axis2.description.AxisService;
@@ -114,9 +115,9 @@
                 org.apache.synapse.MessageContext rmc = new Axis2MessageContext(mc, synCfg, synEnv);
                 rmc.setEnvelope(soapEnvelope);
                 rmc.setTo(new EndpointReference(replyAddress));
-                rmc.setSoapAction(EventingConstants.WSE_SUbSCRIBE_RESPONSE); //TODO: none of these responces get set in the the header need to look at a deep drive
                 rmc.setWSAAction(EventingConstants.WSE_SUbSCRIBE_RESPONSE);
-                endpoint.send(MessageHelper.cloneMessageContext(rmc));
+                rmc.setSoapAction(EventingConstants.WSE_SUbSCRIBE_RESPONSE);
+                endpoint.send(rmc);
             } else {
                 //TODO: send the fault message  
             }
@@ -134,9 +135,11 @@
                 org.apache.synapse.MessageContext rmc = new Axis2MessageContext(mc, synCfg, synEnv);
                 rmc.setEnvelope(soapEnvelope);
                 rmc.setTo(new EndpointReference(replyAddress));
-                rmc.setSoapAction(EventingConstants.WSE_UNSUBSCRIBE_RESPONSE); //TODO: none of these responces get set in the the header need to look at a deep drive
                 rmc.setWSAAction(EventingConstants.WSE_UNSUBSCRIBE_RESPONSE);
-                endpoint.send(MessageHelper.cloneMessageContext(rmc));                
+                rmc.setSoapAction(EventingConstants.WSE_UNSUBSCRIBE_RESPONSE);
+                RelatesTo relatesTo = new RelatesTo(subscription.getId());
+                rmc.setRelatesTo(new RelatesTo[] { relatesTo });
+                endpoint.send(rmc);
             } else {
                 //TODO: send the fault message
             }

Modified: branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/eventing/builders/ResponseMessageBuilder.java
URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/eventing/builders/ResponseMessageBuilder.java?rev=24680&r1=24679&r2=24680&view=diff
==============================================================================
--- branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/eventing/builders/ResponseMessageBuilder.java	(original)
+++ branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/eventing/builders/ResponseMessageBuilder.java	Mon Nov 24 00:47:23 2008
@@ -137,25 +137,13 @@
      */
     public SOAPEnvelope genUnSubscribeResponse(Subscription subscription) {
         SOAPEnvelope message = factory.getDefaultEnvelope();
-        EndpointReference subscriptionManagerEPR = new EndpointReference("http://localhost:8280/soap/eventing"); //TODO: add subscription url to subscription object
-        subscriptionManagerEPR.addReferenceParameter(new QName(EventingConstants.WSE_EVENTING_NS,
-                EventingConstants.WSE_EN_IDENTIFIER, EventingConstants.WSE_EVENTING_PREFIX), subscription.getId());
-        OMNamespace eventingNamespace = factory.createOMNamespace(EventingConstants.WSE_EVENTING_NS,
-                EventingConstants.WSE_EVENTING_PREFIX);
-        OMElement subscribeResponseElement = factory.createOMElement(EventingConstants.WSE_EN_UNSUBSCRIBE, eventingNamespace);
-        try {
-            OMElement subscriptionManagerElement = EndpointReferenceHelper.toOM(
-                    subscribeResponseElement.getOMFactory(),
-                    subscriptionManagerEPR,
-                    new QName(EventingConstants.WSE_EVENTING_NS,
-                            EventingConstants.WSE_EN_SUBSCRIPTION_MANAGER,
-                            EventingConstants.WSE_EVENTING_PREFIX),
-                    AddressingConstants.Submission.WSA_NAMESPACE);
-            subscribeResponseElement.addChild(subscriptionManagerElement);
-            //message.getBody().addChild(subscribeResponseElement);            
-        } catch (AxisFault axisFault) {
-            handleException("unable to create subscription response", axisFault);
-        }
+        OMNamespace addressNamespace = factory.createOMNamespace("http://schemas.xmlsoap.org/ws/2004/08/addressing","wsa");
+        OMElement relateToElement = factory.createOMElement("RelatesTo", addressNamespace);
+        factory.createOMText(relateToElement,subscription.getId());
+
+        message.getHeader().addChild(relateToElement);
+        OMElement dummyBody = factory.createOMElement("UnSunscribeResponce",null);
+        message.getBody().addChild(dummyBody);
         return message;
     }
 }