Author: hiranya
Date: Thu Oct 7 23:41:34 2010
New Revision: 1005664
URL: http://svn.apache.org/viewvc?rev=1005664&view=rev
Log:
Deprecating the Synapse UUIDGenerator and Using the Axiom UIDGenerator in its
place
Modified:
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointFactory.java
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2Sender.java
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/eventing/SynapseSubscription.java
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/util/MessageHelper.java
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/util/UUIDGenerator.java
synapse/branches/2.0/modules/core/src/test/java/org/apache/synapse/eventing/builders/MessageBuilderTest.java
synapse/branches/2.0/modules/core/src/test/java/org/apache/synapse/eventing/builders/ResponseMessageBuilderTest.java
synapse/branches/2.0/modules/samples/src/main/java/samples/userguide/StockQuoteClient.java
Modified:
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointFactory.java
URL:
http://svn.apache.org/viewvc/synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointFactory.java?rev=1005664&r1=1005663&r2=1005664&view=diff
==============================================================================
---
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointFactory.java
(original)
+++
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointFactory.java
Thu Oct 7 23:41:34 2010
@@ -22,6 +22,7 @@ package org.apache.synapse.config.xml.en
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNode;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.SynapseConstants;
@@ -35,8 +36,6 @@ import org.apache.synapse.endpoints.Endp
import org.apache.synapse.PropertyInclude;
import org.apache.synapse.mediators.MediatorProperty;
import org.apache.synapse.endpoints.AbstractEndpoint;
-import org.apache.synapse.util.UUIDGenerator;
-
import javax.xml.namespace.QName;
import java.util.*;
@@ -129,7 +128,7 @@ public abstract class EndpointFactory im
// if the endpoint doesn't have a name we will generate a unique name.
if (anonymousEndpoint && ep.getName() == null) {
- String uuid = UUIDGenerator.getUUID();
+ String uuid = UIDGenerator.generateUID();
uuid = uuid.replace(':', '_');
ep.setName(ENDPOINT_NAME_PREFIX + uuid);
if (ep instanceof AbstractEndpoint) {
Modified:
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2Sender.java
URL:
http://svn.apache.org/viewvc/synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2Sender.java?rev=1005664&r1=1005663&r2=1005664&view=diff
==============================================================================
---
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2Sender.java
(original)
+++
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2Sender.java
Thu Oct 7 23:41:34 2010
@@ -21,6 +21,7 @@ package org.apache.synapse.core.axis2;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.soap.SOAPFactory;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.AddressingConstants;
@@ -36,7 +37,6 @@ import org.apache.synapse.endpoints.Endp
import org.apache.synapse.transport.nhttp.NhttpConstants;
import org.apache.synapse.util.MessageHelper;
import org.apache.synapse.util.POXUtils;
-import org.apache.synapse.util.UUIDGenerator;
/**
* This class helps the Axis2SynapseEnvironment implement the send method
@@ -130,7 +130,7 @@ public class Axis2Sender {
messageContext.setMessageID(smc.getMessageID());
} else {
MessageHelper.removeAddressingHeaders(messageContext);
- messageContext.setMessageID(UUIDGenerator.getUUID());
+ messageContext.setMessageID(UIDGenerator.generateURNString());
}
// determine weather we need to preserve the processed headers
Modified:
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
URL:
http://svn.apache.org/viewvc/synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java?rev=1005664&r1=1005663&r2=1005664&view=diff
==============================================================================
---
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
(original)
+++
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
Thu Oct 7 23:41:34 2010
@@ -21,6 +21,7 @@ package org.apache.synapse.core.axis2;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.util.blob.OverflowBlob;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.OperationContext;
import org.apache.axis2.context.ServiceContext;
@@ -37,7 +38,6 @@ import org.apache.synapse.endpoints.disp
import org.apache.synapse.mediators.MediatorFaultHandler;
import org.apache.synapse.mediators.MediatorWorker;
import org.apache.synapse.mediators.base.SequenceMediator;
-import org.apache.synapse.util.UUIDGenerator;
import org.apache.synapse.util.concurrent.SynapseThreadPool;
import java.util.concurrent.ExecutorService;
@@ -245,7 +245,7 @@ public class Axis2SynapseEnvironment imp
axis2MC.setServiceContext(svcCtx);
axis2MC.setOperationContext(opCtx);
MessageContext mc = new Axis2MessageContext(axis2MC, synapseConfig,
this);
- mc.setMessageID(UUIDGenerator.getUUID());
+ mc.setMessageID(UIDGenerator.generateURNString());
try {
mc.setEnvelope(OMAbstractFactory.getSOAP12Factory().createSOAPEnvelope());
mc.getEnvelope().addChild(OMAbstractFactory.getSOAP12Factory().createSOAPBody());
Modified:
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/eventing/SynapseSubscription.java
URL:
http://svn.apache.org/viewvc/synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/eventing/SynapseSubscription.java?rev=1005664&r1=1005663&r2=1005664&view=diff
==============================================================================
---
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/eventing/SynapseSubscription.java
(original)
+++
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/eventing/SynapseSubscription.java
Thu Oct 7 23:41:34 2010
@@ -19,8 +19,7 @@
package org.apache.synapse.eventing;
-import org.apache.synapse.endpoints.Endpoint;
-import org.apache.synapse.util.UUIDGenerator;
+import org.apache.axiom.util.UIDGenerator;
import org.wso2.eventing.EventingConstants;
import org.wso2.eventing.Subscription;
import org.wso2.eventing.SubscriptionData;
@@ -34,7 +33,7 @@ public class SynapseSubscription extends
public SynapseSubscription() {
- this.setId(UUIDGenerator.getUUID());
+ this.setId(UIDGenerator.generateURNString());
this.setDeliveryMode(EventingConstants.WSE_DEFAULT_DELIVERY_MODE);
SubscriptionData subscriptionData = new SubscriptionData();
subscriptionData.setProperty(SynapseEventingConstants.STATIC_ENTRY,
"false");
@@ -42,7 +41,7 @@ public class SynapseSubscription extends
}
public SynapseSubscription(String deliveryMode) {
- this.setId(UUIDGenerator.getUUID());
+ this.setId(UIDGenerator.generateURNString());
this.setDeliveryMode(deliveryMode);
}
}
Modified:
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java
URL:
http://svn.apache.org/viewvc/synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java?rev=1005664&r1=1005663&r2=1005664&view=diff
==============================================================================
---
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java
(original)
+++
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java
Thu Oct 7 23:41:34 2010
@@ -20,6 +20,7 @@
package org.apache.synapse.mediators.builtin;
import org.apache.axiom.om.OMElement;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.sandesha2.client.SandeshaClientConstants;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseLog;
@@ -27,7 +28,6 @@ import org.apache.synapse.config.Entry;
import org.apache.synapse.config.xml.XMLConfigConstants;
import org.apache.synapse.core.axis2.Axis2MessageContext;
import org.apache.synapse.mediators.AbstractMediator;
-import org.apache.synapse.util.UUIDGenerator;
import org.apache.synapse.util.xpath.SynapseXPath;
import org.jaxen.JaxenException;
@@ -94,7 +94,7 @@ public class RMSequenceMediator extends
String offeredSeqID = null;
if (!sequenceMap.containsKey(correlationValue)) {
- offeredSeqID = UUIDGenerator.getUUID();
+ offeredSeqID = UIDGenerator.generateURNString();
orgMessageCtx.getOptions().setProperty(
SandeshaClientConstants.OFFERED_SEQUENCE_ID,
offeredSeqID);
}
@@ -124,7 +124,7 @@ public class RMSequenceMediator extends
private String retrieveSequenceID(String correlationValue) {
String sequenceID;
if (!sequenceMap.containsKey(correlationValue)) {
- sequenceID = UUIDGenerator.getUUID();
+ sequenceID = UIDGenerator.generateURNString();
if (log.isDebugEnabled()) {
log.debug("setting sequenceID " + sequenceID + " for
correlation " + correlationValue);
}
Modified:
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/util/MessageHelper.java
URL:
http://svn.apache.org/viewvc/synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/util/MessageHelper.java?rev=1005664&r1=1005663&r2=1005664&view=diff
==============================================================================
---
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/util/MessageHelper.java
(original)
+++
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/util/MessageHelper.java
Thu Oct 7 23:41:34 2010
@@ -6,6 +6,7 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.soap.*;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.AddressingConstants;
@@ -173,7 +174,7 @@ public class MessageHelper {
// do not copy options from the original
newMC.setConfigurationContext(ori.getConfigurationContext());
- newMC.setMessageID(UUIDGenerator.getUUID());
+ newMC.setMessageID(UIDGenerator.generateURNString());
newMC.setTo(ori.getTo());
newMC.setSoapAction(ori.getSoapAction());
Modified:
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/util/UUIDGenerator.java
URL:
http://svn.apache.org/viewvc/synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/util/UUIDGenerator.java?rev=1005664&r1=1005663&r2=1005664&view=diff
==============================================================================
---
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/util/UUIDGenerator.java
(original)
+++
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/util/UUIDGenerator.java
Thu Oct 7 23:41:34 2010
@@ -27,7 +27,13 @@ import java.util.Random;
/**
* This is a thread-safe version of the Axiom UUIDGenerator
* to be used until it is fixed in the next Axiom release
+ *
+ * @deprecated Axiom now contains a better and safer
+ * UUIDGenerator. Hence use one of the specialized methods
+ * in the {...@link org.apache.axiom.util.UIDGenerator} class
+ * instead of this.
*/
+...@deprecated
public class UUIDGenerator {
/** This class will give UUIDs for axis2. */
Modified:
synapse/branches/2.0/modules/core/src/test/java/org/apache/synapse/eventing/builders/MessageBuilderTest.java
URL:
http://svn.apache.org/viewvc/synapse/branches/2.0/modules/core/src/test/java/org/apache/synapse/eventing/builders/MessageBuilderTest.java?rev=1005664&r1=1005663&r2=1005664&view=diff
==============================================================================
---
synapse/branches/2.0/modules/core/src/test/java/org/apache/synapse/eventing/builders/MessageBuilderTest.java
(original)
+++
synapse/branches/2.0/modules/core/src/test/java/org/apache/synapse/eventing/builders/MessageBuilderTest.java
Thu Oct 7 23:41:34 2010
@@ -22,13 +22,10 @@ package org.apache.synapse.eventing.buil
import junit.framework.TestCase;
import org.apache.synapse.mediators.TestUtils;
import org.apache.synapse.eventing.SynapseSubscription;
-import org.apache.synapse.util.UUIDGenerator;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.databinding.utils.ConverterUtil;
-import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.SOAPHeaderBlock;
-import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.util.UIDGenerator;
import org.wso2.eventing.EventingConstants;
import javax.xml.namespace.QName;
@@ -195,7 +192,7 @@ public class MessageBuilderTest extends
}
private String addIdentifierHeader(MessageContext msgCtx) {
- String id = UUIDGenerator.getUUID();
+ String id = UIDGenerator.generateURNString();
QName qname = new QName(EventingConstants.WSE_EVENTING_NS,
EventingConstants.WSE_EN_IDENTIFIER, "wse");
TestUtils.addSOAPHeaderBlock(msgCtx, qname, id);
Modified:
synapse/branches/2.0/modules/core/src/test/java/org/apache/synapse/eventing/builders/ResponseMessageBuilderTest.java
URL:
http://svn.apache.org/viewvc/synapse/branches/2.0/modules/core/src/test/java/org/apache/synapse/eventing/builders/ResponseMessageBuilderTest.java?rev=1005664&r1=1005663&r2=1005664&view=diff
==============================================================================
---
synapse/branches/2.0/modules/core/src/test/java/org/apache/synapse/eventing/builders/ResponseMessageBuilderTest.java
(original)
+++
synapse/branches/2.0/modules/core/src/test/java/org/apache/synapse/eventing/builders/ResponseMessageBuilderTest.java
Thu Oct 7 23:41:34 2010
@@ -20,7 +20,6 @@
package org.apache.synapse.eventing.builders;
import org.apache.synapse.eventing.SynapseSubscription;
-import org.apache.synapse.util.UUIDGenerator;
import org.apache.synapse.mediators.TestUtils;
import org.apache.synapse.config.xml.AbstractTestCase;
import org.apache.axis2.context.MessageContext;
@@ -28,6 +27,7 @@ import org.apache.axis2.databinding.util
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.util.AXIOMUtil;
+import org.apache.axiom.util.UIDGenerator;
import java.util.Date;
import java.util.Calendar;
@@ -35,7 +35,7 @@ import java.util.Calendar;
public class ResponseMessageBuilderTest extends AbstractTestCase {
public void testSubscriptionResponse() {
- String id = UUIDGenerator.getUUID();
+ String id = UIDGenerator.generateURNString();
String addressUrl = "http://synapse.test.com/eventing/sunscriptions";;
SynapseSubscription sub = new SynapseSubscription();
@@ -67,7 +67,7 @@ public class ResponseMessageBuilderTest
}
public void testUnsubscriptionResponse() {
- String id = UUIDGenerator.getUUID();
+ String id = UIDGenerator.generateURNString();
String addressUrl = "http://synapse.test.com/eventing/sunscriptions";;
SynapseSubscription sub = new SynapseSubscription();
@@ -92,7 +92,7 @@ public class ResponseMessageBuilderTest
}
public void testRenewResponse() {
- String id = UUIDGenerator.getUUID();
+ String id = UIDGenerator.generateURNString();
String addressUrl = "http://synapse.test.com/eventing/sunscriptions";;
Date date = new Date(System.currentTimeMillis() + 3600000);
Calendar cal = Calendar.getInstance();
@@ -123,7 +123,7 @@ public class ResponseMessageBuilderTest
}
public void testGetStatusResponse() {
- String id = UUIDGenerator.getUUID();
+ String id = UIDGenerator.generateURNString();
String addressUrl = "http://synapse.test.com/eventing/sunscriptions";;
Date date = new Date(System.currentTimeMillis() + 3600000);
Calendar cal = Calendar.getInstance();
Modified:
synapse/branches/2.0/modules/samples/src/main/java/samples/userguide/StockQuoteClient.java
URL:
http://svn.apache.org/viewvc/synapse/branches/2.0/modules/samples/src/main/java/samples/userguide/StockQuoteClient.java?rev=1005664&r1=1005663&r2=1005664&view=diff
==============================================================================
---
synapse/branches/2.0/modules/samples/src/main/java/samples/userguide/StockQuoteClient.java
(original)
+++
synapse/branches/2.0/modules/samples/src/main/java/samples/userguide/StockQuoteClient.java
Thu Oct 7 23:41:34 2010
@@ -22,6 +22,7 @@ package samples.userguide;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axiom.soap.SOAP12Constants;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
@@ -36,7 +37,6 @@ import org.apache.rampart.RampartMessage
import org.apache.sandesha2.client.SandeshaClientConstants;
import org.apache.sandesha2.client.SandeshaClient;
import org.apache.sandesha2.Sandesha2Constants;
-import org.apache.synapse.util.UUIDGenerator;
import samples.common.StockQuoteHandler;
import java.io.File;
@@ -217,7 +217,7 @@ public class StockQuoteClient {
options.setProperty(SandeshaClientConstants.RM_SPEC_VERSION,
Sandesha2Constants.SPEC_VERSIONS.v1_1);
}
options.setProperty(SandeshaClientConstants.LAST_MESSAGE,
Constants.VALUE_TRUE);
- options.setProperty(SandeshaClientConstants.OFFERED_SEQUENCE_ID,
UUIDGenerator.getUUID());
+ options.setProperty(SandeshaClientConstants.OFFERED_SEQUENCE_ID,
UIDGenerator.generateURNString());
}
if ("soap12".equals(soapVer)) {
