Author: asankaa Date: Mon Nov 24 12:18:36 2008 New Revision: 24752 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=24752
Log: fix the bug with expires (calendar object) Modified: branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/eventing/Subscription.java branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/eventing/builders/ResponseMessageBuilder.java branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/eventing/builders/SubscriptionMessageBuilder.java Modified: branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/eventing/Subscription.java URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/eventing/Subscription.java?rev=24752&r1=24751&r2=24752&view=diff ============================================================================== --- branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/eventing/Subscription.java (original) +++ branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/eventing/Subscription.java Mon Nov 24 12:18:36 2008 @@ -23,7 +23,6 @@ import org.apache.synapse.util.UUIDGenerator; import org.wso2.eventing.EventingConstants; -import java.util.Date; import java.util.Calendar; /** @@ -33,9 +32,10 @@ private EventFilter filter; private Endpoint endpoint; - private String deliveryMode; - private String id = null; - private Calendar expires = null; + private String deliveryMode; + private String id = null; + private Calendar expires = null; + private String addressUrl = null; public Subscription() { this.id = UUIDGenerator.getUUID(); @@ -86,4 +86,12 @@ public void setExpires(Calendar expires) { this.expires = expires; } + + public String getAddressUrl() { + return addressUrl; + } + + public void setAddressUrl(String addressUrl) { + this.addressUrl = addressUrl; + } } 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=24752&r1=24751&r2=24752&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 12:18:36 2008 @@ -84,7 +84,7 @@ */ public SOAPEnvelope genSubscriptionResponse(Subscription subscription) { SOAPEnvelope message = factory.getDefaultEnvelope(); - EndpointReference subscriptionManagerEPR = new EndpointReference("http://localhost:8280/soap/eventing";); //TODO: add subscription url to subscription object + EndpointReference subscriptionManagerEPR = new EndpointReference(subscription.getAddressUrl()); 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: branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/eventing/builders/SubscriptionMessageBuilder.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=24752&r1=24751&r2=24752&view=diff ============================================================================== --- branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/eventing/builders/SubscriptionMessageBuilder.java (original) +++ branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/eventing/builders/SubscriptionMessageBuilder.java Mon Nov 24 12:18:36 2008 @@ -111,7 +111,6 @@ * @return */ public static Subscription createSubscription(MessageContext mc) { - //TODO: add expiration time Subscription subscription = null; OMElement elem = mc.getEnvelope().getBody().getFirstChildWithName(SUBSCRIBE_QNAME); if (elem != null) { @@ -157,29 +156,13 @@ Calendar calendar = ConverterUtil.convertToDateTime(expiryElem.getText()); subscription.setExpires(calendar); } + subscription.setAddressUrl(mc.getTo().getAddress()); } else { handleException("Subscribe element is required as the payload of the subscription message"); } return subscription; } - private static Endpoint getEndpointFromWSAAddress(OMElement address) { - AddressEndpoint endpoint = new AddressEndpoint(); - EndpointDefinition def = new EndpointDefinition(); - def.setAddress(address.getText().trim()); - endpoint.setDefinition(def); - return endpoint; - } - - private static void handleException(String message) { - log.error(message); - throw new SynapseException(message); - } - - private static void handleException(String message, Exception e) { - log.error(message, e); - throw new SynapseException(message, e); - } /** * create request for unsubscribr request @@ -216,8 +199,9 @@ public static Subscription createUnSubscribeMessage(MessageContext mc) { Subscription subscription = new Subscription(); OMElement elem = mc.getEnvelope().getHeader().getFirstChildWithName(IDENTIFIER); - String id = (String) elem.getText(); + String id = elem.getText(); subscription.setId(id); + subscription.setAddressUrl(mc.getTo().getAddress()); return subscription; } @@ -257,8 +241,9 @@ public static Subscription createRenewSubscribeMessage(MessageContext mc) { Subscription subscription = new Subscription(); OMElement elem = mc.getEnvelope().getHeader().getFirstChildWithName(IDENTIFIER); - String id = (String) elem.getText(); + String id = elem.getText(); subscription.setId(id); + subscription.setAddressUrl(mc.getTo().getAddress()); OMElement renewElem = mc.getEnvelope().getBody().getFirstChildWithName(RENEW); if (renewElem != null) { OMElement expiryElem = renewElem.getFirstChildWithName(EXPIRES); @@ -303,9 +288,28 @@ */ public static Subscription createGetStatusMessage(MessageContext mc) { Subscription subscription = new Subscription(); + subscription.setAddressUrl(mc.getTo().getAddress()); OMElement elem = mc.getEnvelope().getHeader().getFirstChildWithName(IDENTIFIER); - String id = (String) elem.getText(); + String id = elem.getText(); subscription.setId(id); return subscription; } + + private static Endpoint getEndpointFromWSAAddress(OMElement address) { + AddressEndpoint endpoint = new AddressEndpoint(); + EndpointDefinition def = new EndpointDefinition(); + def.setAddress(address.getText().trim()); + endpoint.setDefinition(def); + return endpoint; + } + + private static void handleException(String message) { + log.error(message); + throw new SynapseException(message); + } + + private static void handleException(String message, Exception e) { + log.error(message, e); + throw new SynapseException(message, e); + } } _______________________________________________ Esb-java-dev mailing list [email protected] https://wso2.org/cgi-bin/mailman/listinfo/esb-java-dev
