svn commit: r731461 - in /synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/eventing: SynapseSubscription.java builders/ResponseMessageBuilder.java builders/SubscriptionMessageBuilder.java

[asanka]

Author: asanka
Date: Sun Jan  4 21:58:58 2009
New Revision: 731461

URL: http://svn.apache.org/viewvc?rev=731461&view=rev
Log:
Fixing subscription manager url sent in the subscription response 

Modified:
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/eventing/SynapseSubscription.java
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/eventing/builders/ResponseMessageBuilder.java
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/eventing/builders/SubscriptionMessageBuilder.java

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/eventing/SynapseSubscription.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/eventing/SynapseSubscription.java?rev=731461&r1=731460&r2=731461&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/eventing/SynapseSubscription.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/eventing/SynapseSubscription.java
 Sun Jan  4 21:58:58 2009
@@ -34,6 +34,7 @@
     private SynapseEventFilter filter;
     private Endpoint endpoint;
     private boolean staticEntry;
+    private String subManagerURI;
     public SynapseSubscription() {
         this.setId(UUIDGenerator.getUUID());
         this.setDeliveryMode(EventingConstants.WSE_DEFAULT_DELIVERY_MODE);
@@ -68,4 +69,12 @@
     public void setStaticEntry(boolean staticEntry) {
         this.staticEntry = staticEntry;
     }
+
+    public String getSubManagerURI() {
+        return subManagerURI;
+    }
+
+    public void setSubManagerURI(String subManagerURI) {
+        this.subManagerURI = subManagerURI;
+    }
 }

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/eventing/builders/ResponseMessageBuilder.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/eventing/builders/ResponseMessageBuilder.java?rev=731461&r1=731460&r2=731461&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/eventing/builders/ResponseMessageBuilder.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/eventing/builders/ResponseMessageBuilder.java
 Sun Jan  4 21:58:58 2009
@@ -84,7 +84,7 @@
      */
     public SOAPEnvelope genSubscriptionResponse(SynapseSubscription 
subscription) {
         SOAPEnvelope message = factory.getDefaultEnvelope();
-        EndpointReference subscriptionManagerEPR = new 
EndpointReference(subscription.getAddressUrl());
+        EndpointReference subscriptionManagerEPR = new 
EndpointReference(subscription.getSubManagerURI());
         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,

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/eventing/builders/SubscriptionMessageBuilder.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/eventing/builders/SubscriptionMessageBuilder.java?rev=731461&r1=731460&r2=731461&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/eventing/builders/SubscriptionMessageBuilder.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/eventing/builders/SubscriptionMessageBuilder.java
 Sun Jan  4 21:58:58 2009
@@ -131,6 +131,7 @@
                         subscription.setEndpoint(ep);
                         
subscription.setAddressUrl(notifyToElem.getFirstElement().getText());
                         
subscription.setEndpointUrl(notifyToElem.getFirstElement().getText());
+                        subscription.setSubManagerURI(mc.getTo().getAddress());
                     }
                 } else {
                     handleException("NotifyTo element not found in the 
subscription message");