svn commit: r1328745 - in /synapse/trunk/java/modules: core/src/main/java/org/apache/synapse/eventing/managers/DefaultInMemorySubscriptionManager.java transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/FileObjectDataSource.java

[veithen]

Author: veithen
Date: Sat Apr 21 22:50:22 2012
New Revision: 1328745

URL: http://svn.apache.org/viewvc?rev=1328745&view=rev
Log:
Eliminated a couple of references to deprecated classes so that we don't need 
to add a dependency to axiom-compat.

Modified:
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/eventing/managers/DefaultInMemorySubscriptionManager.java
    
synapse/trunk/java/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/FileObjectDataSource.java

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/eventing/managers/DefaultInMemorySubscriptionManager.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/eventing/managers/DefaultInMemorySubscriptionManager.java?rev=1328745&r1=1328744&r2=1328745&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/eventing/managers/DefaultInMemorySubscriptionManager.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/eventing/managers/DefaultInMemorySubscriptionManager.java
 Sat Apr 21 22:50:22 2012
@@ -21,6 +21,7 @@ package org.apache.synapse.eventing.mana
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.axiom.util.UIDGenerator;
 import org.apache.axis2.context.MessageContext;
 import org.apache.synapse.SynapseException;
 import org.apache.synapse.eventing.SynapseEventingConstants;
@@ -58,7 +59,7 @@ public class DefaultInMemorySubscription
 
     public String subscribe(Subscription subscription) throws EventException {
         if (subscription.getId() == null) {
-            
subscription.setId(org.apache.axiom.om.util.UUIDGenerator.getUUID());
+            subscription.setId(UIDGenerator.generateURNString());
         }
         store.put(subscription.getId(), subscription);
         return subscription.getId();

Modified: 
synapse/trunk/java/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/FileObjectDataSource.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/FileObjectDataSource.java?rev=1328745&r1=1328744&r2=1328745&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/FileObjectDataSource.java
 (original)
+++ 
synapse/trunk/java/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/FileObjectDataSource.java
 Sat Apr 21 22:50:22 2012
@@ -18,7 +18,7 @@
 */
 package org.apache.synapse.transport.vfs;
 
-import org.apache.axiom.attachments.SizeAwareDataSource;
+import org.apache.axiom.ext.activation.SizeAwareDataSource;
 import org.apache.commons.vfs2.FileObject;
 import org.apache.commons.vfs2.FileSystemException;