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

[asankaa at wso2.com]

Author: asankaa
Date: Fri Nov 21 01:59:39 2008
New Revision: 24472
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=24472

Log:
Refactor the builders 


Added:
   branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/eventing/builders/SubscriptionMessageBuilder.java   (contents, props changed)
      - copied, changed from r24385, /branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/eventing/SubscriptionFactory.java
Removed:
   branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/eventing/SubscriptionFactory.java
Modified:
   branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/eventing/EventingMessageReceiver.java

Modified: branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/eventing/EventingMessageReceiver.java
URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/eventing/EventingMessageReceiver.java?rev=24472&r1=24471&r2=24472&view=diff
==============================================================================
--- branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/eventing/EventingMessageReceiver.java	(original)
+++ branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/eventing/EventingMessageReceiver.java	Fri Nov 21 01:59:39 2008
@@ -23,10 +23,10 @@
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.context.MessageContext;
 import org.apache.synapse.SynapseConstants;
-import org.apache.synapse.endpoints.Endpoint;
 import org.apache.synapse.endpoints.AddressEndpoint;
 import org.apache.synapse.endpoints.EndpointDefinition;
 import org.apache.synapse.eventing.builders.ResponseMessageBuilder;
+import org.apache.synapse.eventing.builders.SubscriptionMessageBuilder;
 import org.apache.synapse.config.SynapseConfiguration;
 import org.apache.synapse.core.SynapseEnvironment;
 import org.apache.synapse.core.axis2.Axis2MessageContext;
@@ -54,7 +54,7 @@
                 .getAxisConfiguration().getParameter(SynapseConstants.SYNAPSE_ENV).getValue();
         org.apache.synapse.MessageContext smc = new Axis2MessageContext(mc, synCfg, synEnv);
         if (EventingConstants.WSE_SUBSCRIBE.equals(mc.getWSAAction())) {
-            Subscription subscription = SubscriptionFactory.createSubscription(smc);
+            Subscription subscription = SubscriptionMessageBuilder.createSubscription(smc);
             eventSource.getSubscriptionManager().addSubscription(subscription);
             ResponseMessageBuilder messageBuilder = new ResponseMessageBuilder(mc);
             SOAPEnvelope soapEnvelope = messageBuilder.genSubscriptionResponse(subscription);

Deleted: branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/eventing/SubscriptionFactory.java
URL: http://wso2.org/svn/browse/wso2/None?pathrev=24471

Copied: branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/eventing/builders/SubscriptionMessageBuilder.java (from r24385, /branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/eventing/SubscriptionFactory.java)
URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/eventing/builders/SubscriptionMessageBuilder.java?rev=24472&r1=24385&r2=24472&view=diff
==============================================================================
--- /branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/eventing/SubscriptionFactory.java	(original)
+++ branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/eventing/builders/SubscriptionMessageBuilder.java	Fri Nov 21 01:59:39 2008
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.synapse.eventing;
+package org.apache.synapse.eventing.builders;
 
 import org.apache.axiom.om.OMAttribute;
 import org.apache.axiom.om.OMElement;
@@ -31,6 +31,7 @@
 import org.apache.synapse.endpoints.Endpoint;
 import org.apache.synapse.endpoints.EndpointDefinition;
 import org.apache.synapse.eventing.filters.XPathBasedEventFilter;
+import org.apache.synapse.eventing.Subscription;
 import org.apache.synapse.util.xpath.SynapseXPath;
 import org.jaxen.JaxenException;
 import org.wso2.eventing.EventingConstants;
@@ -39,9 +40,9 @@
 /**
  *
  */
-public class SubscriptionFactory {
+public class SubscriptionMessageBuilder {
 
-    private static final Log log = LogFactory.getLog(SubscriptionFactory.class);
+    private static final Log log = LogFactory.getLog(SubscriptionMessageBuilder.class);
 
     private static final QName SUBSCRIBE_QNAME  = new QName(EventingConstants.WSE_EVENTING_NS, "Subscribe");
     private static final QName DELIVERY_QNAME   = new QName(EventingConstants.WSE_EVENTING_NS, "Delivery");