Author: veithen
Date: Wed May 26 20:57:16 2010
New Revision: 948589
URL: http://svn.apache.org/viewvc?rev=948589&view=rev
Log:
AXIS2-4527: Replaced invocations of UUIDGenerator.getUUID() by calls to more
specialized methods (for content IDs, uuid URNs, general purpose IDs, etc.). In
particular, for message IDs, use uuid URNs with a correct UUID conforming to
ISO/IEC 11578:1996.
Modified:
axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/OperationClient.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/Options.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/MessageContext.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/OperationContext.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ServiceContext.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ServiceGroupContext.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/InOnlyAxisOperation.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/InOutAxisOperation.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/OutOnlyAxisOperation.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/TwoChannelAxisOperation.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/context/OperationContextTest.java
Modified:
axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java?rev=948589&r1=948588&r2=948589&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
(original)
+++
axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
Wed May 26 20:57:16 2010
@@ -24,12 +24,12 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.util.AttributeHelper;
import org.apache.axiom.om.util.ElementHelper;
-import org.apache.axiom.om.util.UUIDGenerator;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.soap.SOAPHeaderBlock;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.AddressingFaultsHelper;
@@ -229,7 +229,7 @@ public class AddressingOutHandler extend
//Check whether we want to force a message id to be sent.
if (messageID == null && includeOptionalHeaders) {
- messageID = UUIDGenerator.getUUID();
+ messageID = UIDGenerator.generateURNString();
messageContextOptions.setMessageId(messageID);
}
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java?rev=948589&r1=948588&r2=948589&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java
Wed May 26 20:57:16 2010
@@ -28,7 +28,7 @@ import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axiom.om.util.StAXUtils;
-import org.apache.axiom.om.util.UUIDGenerator;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.externalize.ExternalizeConstants;
import org.apache.axis2.context.externalize.SafeObjectInputStream;
@@ -823,7 +823,7 @@ public class EndpointReference implement
*/
public String getLogCorrelationIDString() {
if (logCorrelationIDString == null) {
- logCorrelationIDString = myClassName + "@" +
UUIDGenerator.getUUID();
+ logCorrelationIDString = myClassName + "@" +
UIDGenerator.generateUID();
}
return logCorrelationIDString;
}
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/OperationClient.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/OperationClient.java?rev=948589&r1=948588&r2=948589&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/OperationClient.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/OperationClient.java
Wed May 26 20:57:16 2010
@@ -20,7 +20,7 @@
package org.apache.axis2.client;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.util.UUIDGenerator;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.async.AxisCallback;
@@ -245,7 +245,7 @@ public abstract class OperationClient {
// if there is no message id still, set a new one.
String messageId = options.getMessageId();
if (messageId == null || "".equals(messageId)) {
- messageId = UUIDGenerator.getUUID();
+ messageId = UIDGenerator.generateURNString();
}
mc.setMessageID(messageId);
}
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/Options.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/Options.java?rev=948589&r1=948588&r2=948589&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/Options.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/Options.java
Wed May 26 20:57:16 2010
@@ -20,8 +20,8 @@
package org.apache.axis2.client;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.util.UUIDGenerator;
import org.apache.axiom.soap.SOAP11Constants;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.AddressingConstants;
@@ -1602,7 +1602,7 @@ public class Options implements External
*/
public String getLogCorrelationIDString() {
if (logCorrelationIDString == null) {
- logCorrelationIDString = myClassName + "@" +
UUIDGenerator.getUUID();
+ logCorrelationIDString = myClassName + "@" +
UIDGenerator.generateUID();
}
return logCorrelationIDString;
}
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/MessageContext.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/MessageContext.java?rev=948589&r1=948588&r2=948589&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/MessageContext.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/MessageContext.java
Wed May 26 20:57:16 2010
@@ -22,10 +22,10 @@ package org.apache.axis2.context;
import org.apache.axiom.attachments.Attachments;
import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.om.util.DetachableInputStream;
-import org.apache.axiom.om.util.UUIDGenerator;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.Constants.Configuration;
@@ -548,7 +548,7 @@ public class MessageContext extends Abst
*/
public String getLogCorrelationID() {
if (logCorrelationID == null) {
- logCorrelationID = UUIDGenerator.getUUID();
+ logCorrelationID = UIDGenerator.generateUID();
}
return logCorrelationID;
}
@@ -1764,7 +1764,7 @@ public class MessageContext extends Abst
* @return the auto generated content ID of the MIME attachment
*/
public String addAttachment(DataHandler dataHandler) {
- String contentID = UUIDGenerator.getUUID();
+ String contentID = UIDGenerator.generateContentId();
addAttachment(contentID, dataHandler);
return contentID;
}
@@ -2527,7 +2527,7 @@ public class MessageContext extends Abst
String tmpID = getMessageID();
if (tmpID == null) {
// get an id to use when restoring this object
- tmpID = UUIDGenerator.getUUID();
+ tmpID = UIDGenerator.generateUID();
setMessageID(tmpID);
}
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/OperationContext.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/OperationContext.java?rev=948589&r1=948588&r2=948589&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/OperationContext.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/OperationContext.java
Wed May 26 20:57:16 2010
@@ -20,7 +20,7 @@
package org.apache.axis2.context;
-import org.apache.axiom.om.util.UUIDGenerator;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.externalize.ActivateUtils;
import org.apache.axis2.context.externalize.ExternalizeConstants;
@@ -1105,7 +1105,7 @@ public class OperationContext extends Ab
*/
public String getLogCorrelationIDString() {
if (logCorrelationIDString == null) {
- logCorrelationIDString = myClassName + "@" +
UUIDGenerator.getUUID();
+ logCorrelationIDString = myClassName + "@" +
UIDGenerator.generateUID();
}
return logCorrelationIDString;
}
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ServiceContext.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ServiceContext.java?rev=948589&r1=948588&r2=948589&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ServiceContext.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ServiceContext.java
Wed May 26 20:57:16 2010
@@ -20,7 +20,7 @@
package org.apache.axis2.context;
-import org.apache.axiom.om.util.UUIDGenerator;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.externalize.ActivateUtils;
@@ -590,7 +590,7 @@ public class ServiceContext extends Abst
*/
public String getLogCorrelationIDString() {
if (logCorrelationIDString == null) {
- logCorrelationIDString = myClassName + "@" +
UUIDGenerator.getUUID();
+ logCorrelationIDString = myClassName + "@" +
UIDGenerator.generateUID();
}
return logCorrelationIDString;
}
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ServiceGroupContext.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ServiceGroupContext.java?rev=948589&r1=948588&r2=948589&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ServiceGroupContext.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ServiceGroupContext.java
Wed May 26 20:57:16 2010
@@ -20,7 +20,7 @@
package org.apache.axis2.context;
-import org.apache.axiom.om.util.UUIDGenerator;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.externalize.ActivateUtils;
import org.apache.axis2.context.externalize.ExternalizeConstants;
@@ -295,7 +295,7 @@ public class ServiceGroupContext extends
if (id == null) {
// generate an ID to use when this object is restored
- id = UUIDGenerator.getUUID();
+ id = UIDGenerator.generateUID();
}
out.writeObject(id);
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisOperation.java?rev=948589&r1=948588&r2=948589&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
Wed May 26 20:57:16 2010
@@ -27,7 +27,7 @@ import java.util.Set;
import javax.xml.namespace.QName;
-import org.apache.axiom.om.util.UUIDGenerator;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.AxisFault;
import org.apache.axis2.client.OperationClient;
import org.apache.axis2.client.Options;
@@ -87,7 +87,7 @@ public abstract class AxisOperation exte
moduleConfigmap = new HashMap<String, ModuleConfiguration>();
faultMessages = new ArrayList<AxisMessage>();
//setup a temporary name
- QName tmpName = new QName(this.getClass().getName() + "_" +
UUIDGenerator.getUUID());
+ QName tmpName = new QName(this.getClass().getName() + "_" +
UIDGenerator.generateUID());
this.setName(tmpName);
}
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/InOnlyAxisOperation.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/InOnlyAxisOperation.java?rev=948589&r1=948588&r2=948589&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/InOnlyAxisOperation.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/InOnlyAxisOperation.java
Wed May 26 20:57:16 2010
@@ -19,7 +19,7 @@
package org.apache.axis2.description;
-import org.apache.axiom.om.util.UUIDGenerator;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.AxisFault;
import org.apache.axis2.client.OperationClient;
import org.apache.axis2.client.Options;
@@ -45,7 +45,7 @@ public class InOnlyAxisOperation extends
public InOnlyAxisOperation() {
super();
//setup a temporary name
- QName tmpName = new QName(this.getClass().getName() + "_" +
UUIDGenerator.getUUID());
+ QName tmpName = new QName(this.getClass().getName() + "_" +
UIDGenerator.generateUID());
this.setName(tmpName);
createMessage();
setMessageExchangePattern(WSDL2Constants.MEP_URI_IN_ONLY);
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/InOutAxisOperation.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/InOutAxisOperation.java?rev=948589&r1=948588&r2=948589&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/InOutAxisOperation.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/InOutAxisOperation.java
Wed May 26 20:57:16 2010
@@ -19,7 +19,7 @@
package org.apache.axis2.description;
-import org.apache.axiom.om.util.UUIDGenerator;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.AxisFault;
import org.apache.axis2.client.OperationClient;
import org.apache.axis2.client.Options;
@@ -36,7 +36,7 @@ public class InOutAxisOperation extends
public InOutAxisOperation() {
super();
//setup a temporary name
- QName tmpName = new QName(this.getClass().getName() + "_" +
UUIDGenerator.getUUID());
+ QName tmpName = new QName(this.getClass().getName() + "_" +
UIDGenerator.generateUID());
this.setName(tmpName);
}
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java?rev=948589&r1=948588&r2=948589&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
Wed May 26 20:57:16 2010
@@ -23,9 +23,9 @@ import java.util.HashMap;
import javax.xml.namespace.QName;
-import org.apache.axiom.om.util.UUIDGenerator;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.AddressingConstants;
@@ -56,7 +56,7 @@ public class OutInAxisOperation extends
public OutInAxisOperation() {
super();
//setup a temporary name
- QName tmpName = new QName(this.getClass().getName() + "_" +
UUIDGenerator.getUUID());
+ QName tmpName = new QName(this.getClass().getName() + "_" +
UIDGenerator.generateUID());
this.setName(tmpName);
setMessageExchangePattern(WSDL2Constants.MEP_URI_OUT_IN);
}
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/OutOnlyAxisOperation.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/OutOnlyAxisOperation.java?rev=948589&r1=948588&r2=948589&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/OutOnlyAxisOperation.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/OutOnlyAxisOperation.java
Wed May 26 20:57:16 2010
@@ -19,7 +19,7 @@
package org.apache.axis2.description;
-import org.apache.axiom.om.util.UUIDGenerator;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.AddressingConstants.Final;
@@ -53,7 +53,7 @@ public class OutOnlyAxisOperation extend
public OutOnlyAxisOperation() {
super();
//setup a temporary name
- QName tmpName = new QName(this.getClass().getName() + "_" +
UUIDGenerator.getUUID());
+ QName tmpName = new QName(this.getClass().getName() + "_" +
UIDGenerator.generateUID());
this.setName(tmpName);
createMessage();
setMessageExchangePattern(WSDL2Constants.MEP_URI_OUT_ONLY);
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java?rev=948589&r1=948588&r2=948589&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java
Wed May 26 20:57:16 2010
@@ -19,8 +19,8 @@
package org.apache.axis2.description;
-import org.apache.axiom.om.util.UUIDGenerator;
import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.AxisFault;
import org.apache.axis2.client.OperationClient;
import org.apache.axis2.client.Options;
@@ -38,7 +38,7 @@ public class RobustOutOnlyAxisOperation
public RobustOutOnlyAxisOperation() {
super();
//setup a temporary name
- QName tmpName = new QName(this.getClass().getName() + "_" +
UUIDGenerator.getUUID());
+ QName tmpName = new QName(this.getClass().getName() + "_" +
UIDGenerator.generateUID());
this.setName(tmpName);
setMessageExchangePattern(WSDL2Constants.MEP_URI_ROBUST_OUT_ONLY);
}
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/TwoChannelAxisOperation.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/TwoChannelAxisOperation.java?rev=948589&r1=948588&r2=948589&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/TwoChannelAxisOperation.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/TwoChannelAxisOperation.java
Wed May 26 20:57:16 2010
@@ -19,7 +19,7 @@
package org.apache.axis2.description;
-import org.apache.axiom.om.util.UUIDGenerator;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.OperationContext;
@@ -43,7 +43,7 @@ public abstract class TwoChannelAxisOper
public TwoChannelAxisOperation() {
super();
//setup a temporary name
- QName tmpName = new QName(this.getClass().getName() + "_" +
UUIDGenerator.getUUID());
+ QName tmpName = new QName(this.getClass().getName() + "_" +
UIDGenerator.generateUID());
this.setName(tmpName);
createMessages();
}
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java?rev=948589&r1=948588&r2=948589&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
Wed May 26 20:57:16 2010
@@ -22,7 +22,6 @@ package org.apache.axis2.util;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.util.UUIDGenerator;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPConstants;
@@ -38,6 +37,7 @@ import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.SOAPFaultNode;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.AddressingConstants;
@@ -149,7 +149,7 @@ public class MessageContextBuilder {
newmsgCtx.setReplyTo(new
EndpointReference(AddressingConstants.Final.WSA_NONE_URI));
}
- newmsgCtx.setMessageID(UUIDGenerator.getUUID());
+ newmsgCtx.setMessageID(UIDGenerator.generateURNString());
// add the service group id as a reference parameter
String serviceGroupContextId =
inMessageContext.getServiceGroupContextId();
@@ -165,7 +165,7 @@ public class MessageContextBuilder {
Object version =
newmsgCtx.getProperty(AddressingConstants.WS_ADDRESSING_VERSION);
if (AddressingConstants.Submission.WSA_NAMESPACE.equals(version) ||
(outboundToEPR != null &&
!outboundToEPR.hasAnonymousAddress())) {
- newmsgCtx.setMessageID(UUIDGenerator.getUUID());
+ newmsgCtx.setMessageID(UIDGenerator.generateURNString());
newmsgCtx.setReplyTo(new
EndpointReference(AddressingConstants.Final.WSA_NONE_URI));
}
}
@@ -322,7 +322,7 @@ public class MessageContextBuilder {
Object version =
faultContext.getProperty(AddressingConstants.WS_ADDRESSING_VERSION);
if (AddressingConstants.Submission.WSA_NAMESPACE.equals(version) ||
(outboundToEPR != null && !outboundToEPR.hasAnonymousAddress())) {
- faultContext.setMessageID(UUIDGenerator.getUUID());
+ faultContext.setMessageID(UIDGenerator.generateURNString());
faultContext.setReplyTo(new
EndpointReference(AddressingConstants.Final.WSA_NONE_URI));
}
Modified:
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/context/OperationContextTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/context/OperationContextTest.java?rev=948589&r1=948588&r2=948589&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/context/OperationContextTest.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/context/OperationContextTest.java
Wed May 26 20:57:16 2010
@@ -19,7 +19,7 @@
package org.apache.axis2.context;
-import org.apache.axiom.om.util.UUIDGenerator;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.AbstractTestCase;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.RelatesTo;
@@ -52,14 +52,14 @@ public class OperationContextTest extend
ServiceContext sessionContext = sgc.getServiceContext(axisService);
MessageContext messageContext1 = this.getBasicMessageContext();
- messageContext1.setMessageID(UUIDGenerator.getUUID());
+ messageContext1.setMessageID(UIDGenerator.generateURNString());
AxisOperation axisOperation = new InOutAxisOperation(new
QName("test"));
OperationContext operationContext1 = axisOperation
.findOperationContext(messageContext1, sessionContext);
axisOperation.registerOperationContext(messageContext1,
operationContext1);
MessageContext messageContext2 = this.getBasicMessageContext();
- messageContext2.setMessageID(UUIDGenerator.getUUID());
+ messageContext2.setMessageID(UIDGenerator.generateURNString());
messageContext2.getOptions().addRelatesTo(
new RelatesTo(messageContext1.getMessageID()));
messageContext2.setAxisOperation(axisOperation);
