svn commit: r947503 - in /axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit: client/ClientOptions.java tests/async/SwATestCase.java

[veithen]

Author: veithen
Date: Sun May 23 21:59:22 2010
New Revision: 947503

URL: http://svn.apache.org/viewvc?rev=947503&view=rev
Log:
Replaced some usages of UUIDGenerator by UIDGenerator.

Modified:
    
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/client/ClientOptions.java
    
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/SwATestCase.java

Modified: 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/client/ClientOptions.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/client/ClientOptions.java?rev=947503&r1=947502&r2=947503&view=diff
==============================================================================
--- 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/client/ClientOptions.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/client/ClientOptions.java
 Sun May 23 21:59:22 2010
@@ -21,7 +21,7 @@ package org.apache.axis2.transport.testk
 
 import javax.mail.internet.ContentType;
 
-import org.apache.axiom.om.util.UUIDGenerator;
+import org.apache.axiom.util.UIDGenerator;
 
 public class ClientOptions {
     private final ContentType transportContentType;
@@ -45,20 +45,14 @@ public class ClientOptions {
     
     public String getMimeBoundary() {
         if (mimeBoundary == null) {
-            mimeBoundary =
-                    "MIMEBoundary"
-                            + UUIDGenerator.getUUID().replace(':', '_');
-
+            mimeBoundary = UIDGenerator.generateMimeBoundary();
         }
         return mimeBoundary;
     }
 
     public String getRootContentId() {
         if (rootContentId == null) {
-            rootContentId =
-                    "0."
-                            + UUIDGenerator.getUUID()
-                            + "@apache.org";
+            rootContentId = UIDGenerator.generateContentId();
         }
         return rootContentId;
     }

Modified: 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/SwATestCase.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/SwATestCase.java?rev=947503&r1=947502&r2=947503&view=diff
==============================================================================
--- 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/SwATestCase.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/SwATestCase.java
 Sun May 23 21:59:22 2010
@@ -32,6 +32,7 @@ import org.apache.axiom.om.OMAbstractFac
 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.transport.testkit.channel.AsyncChannel;
 import org.apache.axis2.transport.testkit.client.AsyncTestClient;
 import org.apache.axis2.transport.testkit.endpoint.AsyncEndpoint;
@@ -54,7 +55,7 @@ public class SwATestCase extends AsyncMe
         super.setUp();
         attachmentContent = new byte[8192];
         random.nextBytes(attachmentContent);
-        contentID = UUIDGenerator.getUUID();
+        contentID = UIDGenerator.generateContentId();
     }
 
     @Override