Author: veithen
Date: Fri Nov 12 21:00:02 2010
New Revision: 1034563
URL: http://svn.apache.org/viewvc?rev=1034563&view=rev
Log:
Replaced some invocations of the deprecated UUIDGenerator by calls to the new
UIDGenerator.
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/PolicyInclude.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/PolicySubject.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/SOAPMessageFormatter.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/PolicyUtil.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java?rev=1034563&r1=1034562&r2=1034563&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
Fri Nov 12 21:00:02 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.Constants;
import org.apache.axis2.clustering.ClusteringAgent;
@@ -268,7 +268,7 @@ public class ConfigurationContext extend
serviceGroupContext =
createServiceGroupContext(axisServiceGroup);
serviceContext =
serviceGroupContext.getServiceContext(axisService);
// set the serviceGroupContextID
- serviceGroupContextId = UUIDGenerator.getUUID();
+ serviceGroupContextId = UIDGenerator.generateURNString();
serviceGroupContext.setId(serviceGroupContextId);
messageContext.setServiceGroupContextId(serviceGroupContextId);
addServiceGroupContextIntoSoapSessionTable(serviceGroupContext);
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/PolicyInclude.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/PolicyInclude.java?rev=1034563&r1=1034562&r2=1034563&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/PolicyInclude.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/PolicyInclude.java
Fri Nov 12 21:00:02 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.util.AxisPolicyLocator;
import org.apache.axis2.util.PolicyUtil;
import org.apache.neethi.Policy;
@@ -118,7 +118,7 @@ public class PolicyInclude {
wrapperElements.clear();
if (policy.getName() == null && policy.getId() == null) {
- policy.setId(UUIDGenerator.getUUID());
+ policy.setId(UIDGenerator.generateUID());
}
Wrapper wrapper = new Wrapper(PolicyInclude.ANON_POLICY, policy);
@@ -353,7 +353,7 @@ public class PolicyInclude {
String key;
if ((key = policy.getName()) == null && (key = policy.getId()) ==
null) {
- policy.setId(UUIDGenerator.getUUID());
+ policy.setId(UIDGenerator.generateUID());
}
key = (policy.getName() != null) ? policy.getName() : policy.getId();
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/PolicySubject.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/PolicySubject.java?rev=1034563&r1=1034562&r2=1034563&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/PolicySubject.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/PolicySubject.java
Fri Nov 12 21:00:02 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.neethi.Policy;
import org.apache.neethi.PolicyComponent;
import org.apache.neethi.PolicyReference;
@@ -42,7 +42,7 @@ public class PolicySubject {
if (key == null) {
key = policy.getId();
if (key == null) {
- key = UUIDGenerator.getUUID();
+ key = UIDGenerator.generateUID();
policy.setId(key);
}
}
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/SOAPMessageFormatter.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/SOAPMessageFormatter.java?rev=1034563&r1=1034562&r2=1034563&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/SOAPMessageFormatter.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/SOAPMessageFormatter.java
Fri Nov 12 21:00:02 2010
@@ -22,7 +22,7 @@ package org.apache.axis2.transport.http;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.om.impl.MIMEOutputUtils;
-import org.apache.axiom.om.util.UUIDGenerator;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.context.MessageContext;
@@ -228,7 +228,7 @@ public class SOAPMessageFormatter implem
innerBoundary = (String) innerBoundaryProperty;
} else {
innerBoundary = "innerBoundary"
- + UUIDGenerator.getUUID().replace(':', '_');
+ + UIDGenerator.generateMimeBoundary();
}
Object partCIDProperty = msgCtxt
.getProperty(Constants.Configuration.MM7_PART_CID);
@@ -236,7 +236,7 @@ public class SOAPMessageFormatter implem
partCID = (String) partCIDProperty;
} else {
partCID = "innerCID"
- + UUIDGenerator.getUUID().replace(':', '_');
+ + UIDGenerator.generateContentId();
}
MIMEOutputUtils.writeMM7Message(bufferedSOAPBody, outputStream,
msgCtxt.getAttachmentMap(),
format, partCID,
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/PolicyUtil.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/PolicyUtil.java?rev=1034563&r1=1034562&r2=1034563&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/PolicyUtil.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/PolicyUtil.java
Fri Nov 12 21:00:02 2010
@@ -35,7 +35,7 @@ import javax.xml.transform.Transformer;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.util.UUIDGenerator;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.description.AxisDescription;
import org.apache.axis2.description.AxisMessage;
import org.apache.axis2.description.AxisOperation;
@@ -90,7 +90,7 @@ public class PolicyUtil {
if (key == null) {
key = policy.getId();
if (key == null) {
- key = UUIDGenerator.getUUID();
+ key = UIDGenerator.generateUID();
policy.setId(key);
}
policyReference.setURI("#" + key);
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java?rev=1034563&r1=1034562&r2=1034563&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java
Fri Nov 12 21:00:02 2010
@@ -20,10 +20,10 @@
package org.apache.axis2.util;
-import org.apache.axiom.om.util.UUIDGenerator;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFault;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.ServiceObjectSupplier;
@@ -193,7 +193,7 @@ public class Utils {
private static ServiceContext
fillServiceContextAndServiceGroupContext(AxisService axisService,
ConfigurationContext configurationContext)
throws AxisFault {
- String serviceGroupContextId = UUIDGenerator.getUUID();
+ String serviceGroupContextId = UIDGenerator.generateURNString();
ServiceGroupContext serviceGroupContext =
configurationContext.createServiceGroupContext(axisService.getAxisServiceGroup());
