You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pubscribe-commits@ws.apache.org by ip...@apache.org on 2005/07/29 00:07:32 UTC
svn commit: r226264 - in /webservices/pubscribe/trunk: ./
src/java/org/apache/ws/eventing/ src/java/org/apache/ws/eventing/pubsub/
src/java/org/apache/ws/notification/base/impl/
src/java/org/apache/ws/notification/pubsub/ src/java/org/apache/ws/util/uu...
Author: ips
Date: Thu Jul 28 15:07:26 2005
New Revision: 226264
URL: http://svn.apache.org/viewcvs?rev=226264&view=rev
Log:
removed builtin UUID generator factory and replaced with the Jakarta Commons-ID lib; ReadMe.txt now included in dist
Removed:
webservices/pubscribe/trunk/src/java/org/apache/ws/util/uuid/UuidGenerator.java
webservices/pubscribe/trunk/src/java/org/apache/ws/util/uuid/UuidGeneratorFactory.java
webservices/pubscribe/trunk/src/java/org/apache/ws/util/uuid/impl/FastUuidGenerator.java
webservices/pubscribe/trunk/src/java/org/apache/ws/util/uuid/impl/JugUuidGenerator.java
Modified:
webservices/pubscribe/trunk/maven.xml
webservices/pubscribe/trunk/project.xml
webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/Subscription.java
webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/pubsub/Subscription.java
webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/impl/AbstractSubscription.java
webservices/pubscribe/trunk/src/java/org/apache/ws/notification/pubsub/Subscription.java
Modified: webservices/pubscribe/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/maven.xml?rev=226264&r1=226263&r2=226264&view=diff
==============================================================================
--- webservices/pubscribe/trunk/maven.xml (original)
+++ webservices/pubscribe/trunk/maven.xml Thu Jul 28 15:07:26 2005
@@ -163,8 +163,8 @@
<delete file="${maven.dist.bin.assembly.dir}/${maven.final.name}.jar" />
<copy todir="${maven.dist.bin.assembly.dir}">
- <fileset dir="${basedir}">
- <include name="README*" />
+ <fileset dir="${maven.src.dir}">
+ <include name="ReadMe.txt" />
</fileset>
</copy>
Modified: webservices/pubscribe/trunk/project.xml
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/project.xml?rev=226264&r1=226263&r2=226264&view=diff
==============================================================================
--- webservices/pubscribe/trunk/project.xml (original)
+++ webservices/pubscribe/trunk/project.xml Thu Jul 28 15:07:26 2005
@@ -251,6 +251,18 @@
</dependency>
<dependency>
+ <groupId>commons-id</groupId>
+ <artifactId>commons-id</artifactId>
+ <version>0.1-dev</version>
+ <url>http://jakarta.apache.org/commons/sandbox/id/</url>
+ <properties>
+ <license>ApacheLicense-2.0.txt</license>
+ <usage>Library for generating UUIDs</usage>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>1.0</version>
Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/Subscription.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/Subscription.java?rev=226264&r1=226263&r2=226264&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/Subscription.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/Subscription.java Thu Jul 28 15:07:26 2005
@@ -15,13 +15,11 @@
*/
package org.apache.ws.eventing;
+import org.apache.commons.id.IdentifierUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ws.pubsub.Filter;
import org.apache.ws.resource.lifetime.ScheduledResourceTerminationResource;
-import org.apache.ws.util.uuid.UuidGenerator;
-import org.apache.ws.util.uuid.UuidGeneratorFactory;
-import org.apache.ws.addressing.EndpointReference;
import java.util.Calendar;
/**
@@ -30,13 +28,12 @@
*/
public class Subscription extends AbstractSubscription implements ScheduledResourceTerminationResource{
private static final Log LOG = LogFactory.getLog( Subscription.class.getName() );
-
- private static final UuidGenerator UUID_GEN = UuidGeneratorFactory.createUUIdGenerator();
+
private String QueryID;
private Filter m_filter;
private java.net.URI m_delivery;
public Subscription(Filter filter, Calendar expires, java.net.URI delivery){
- m_id = UUID_GEN.generateUuid();
+ m_id = IdentifierUtils.UUID_VERSION_FOUR_GENERATOR.nextIdentifier().toString();
m_creationTime= Calendar.getInstance();
m_filter = filter;
setTerminationTime(expires);
Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/pubsub/Subscription.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/pubsub/Subscription.java?rev=226264&r1=226263&r2=226264&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/pubsub/Subscription.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/pubsub/Subscription.java Thu Jul 28 15:07:26 2005
@@ -16,11 +16,10 @@
package org.apache.ws.eventing.pubsub;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.commons.id.IdentifierUtils;
import org.apache.ws.addressing.EndpointReference;
import org.apache.ws.eventing.AbstractSubscription;
import org.apache.ws.pubsub.wsaSOAPConnection;
-import org.apache.ws.util.uuid.UuidGenerator;
-import org.apache.ws.util.uuid.UuidGeneratorFactory;
import org.xmlsoap.schemas.ws.x2004.x08.eventing.RenewDocument;
import org.xmlsoap.schemas.ws.x2004.x08.eventing.UnsubscribeDocument;
@@ -34,11 +33,9 @@
*/
public class Subscription extends AbstractSubscription{
private static final Log LOG = LogFactory.getLog( Subscriber.class.getName() );
- private static final UuidGenerator UUID_GEN = UuidGeneratorFactory.createUUIdGenerator();
-
public Subscription() {
- setID(UUID_GEN.generateUuid());
+ setID(IdentifierUtils.UUID_VERSION_FOUR_GENERATOR.nextIdentifier().toString());
this.m_creationTime = Calendar.getInstance();
LOG.info("new local Subscription : "+getID());
}
Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/impl/AbstractSubscription.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/impl/AbstractSubscription.java?rev=226264&r1=226263&r2=226264&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/impl/AbstractSubscription.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/impl/AbstractSubscription.java Thu Jul 28 15:07:26 2005
@@ -15,6 +15,10 @@
*=============================================================================*/
package org.apache.ws.notification.base.impl;
+import org.apache.commons.id.IdentifierUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ws.Soap1_1Constants;
import org.apache.ws.addressing.EndpointReference;
import org.apache.ws.notification.base.NotificationProducerResource;
import org.apache.ws.notification.base.Subscription;
@@ -28,25 +32,19 @@
import org.apache.ws.pubsub.Filter;
import org.apache.ws.pubsub.NotificationConsumer;
import org.apache.ws.pubsub.NotificationProducer;
+import org.apache.ws.resource.PersistentResource;
import org.apache.ws.resource.PropertiesResource;
import org.apache.ws.resource.Resource;
-import org.apache.ws.resource.ResourceHome;
import org.apache.ws.resource.ResourceException;
-import org.apache.ws.resource.PersistentResource;
+import org.apache.ws.resource.ResourceHome;
import org.apache.ws.resource.faults.FaultException;
import org.apache.ws.resource.lifetime.ResourceTerminationEvent;
import org.apache.ws.resource.lifetime.ResourceTerminationListener;
import org.apache.ws.resource.lifetime.impl.ResourceTerminationEventImpl;
import org.apache.ws.resource.properties.ResourcePropertySet;
import org.apache.ws.resource.properties.query.QueryExpression;
-import org.apache.ws.util.uuid.UuidGenerator;
-import org.apache.ws.util.uuid.UuidGeneratorFactory;
-import org.apache.ws.Soap1_1Constants;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import javax.naming.InitialContext;
-import javax.xml.rpc.JAXRPCException;
import java.net.URI;
import java.util.ArrayList;
import java.util.Calendar;
@@ -71,14 +69,11 @@
protected boolean m_useNotify = true;
protected Calendar m_terminationTime;
protected Calendar m_creationTime;
- protected String m_id = null;
-
+ protected String m_id;
protected EndpointReference m_epr;
transient protected ResourcePropertySet m_propSet;
- private static final UuidGenerator UUID_GEN =
- UuidGeneratorFactory.createUUIdGenerator();
private NotificationConsumer m_notificationConsumer;
private NotificationProducer m_notificationProducer;
@@ -102,7 +97,7 @@
Object producerId,
TopicExpression topicExpression )
{
- m_id = UUID_GEN.generateUuid();
+ m_id = IdentifierUtils.UUID_VERSION_FOUR_GENERATOR.nextIdentifier().toString();
m_consumerReference = consumerReference;
m_producerReference = producerReference;
m_producerHomeLocation = producerHomeLocation;
Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/pubsub/Subscription.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/pubsub/Subscription.java?rev=226264&r1=226263&r2=226264&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/pubsub/Subscription.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/pubsub/Subscription.java Thu Jul 28 15:07:26 2005
@@ -15,18 +15,12 @@
*=============================================================================*/
package org.apache.ws.notification.pubsub;
-import org.apache.ws.notification.base.impl.AbstractSubscription;
-import org.xmlsoap.schemas.ws.x2003.x03.addressing.EndpointReferenceType;
-import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.SubscribeResponseDocument;
-import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.SubscribeResponseDocument.SubscribeResponse;
+import org.apache.commons.id.IdentifierUtils;
import org.apache.ws.addressing.XmlBeansEndpointReference;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.apache.ws.util.uuid.UuidGenerator;
-import org.apache.ws.util.uuid.UuidGeneratorFactory;
+import org.apache.ws.notification.base.impl.AbstractSubscription;
import org.apache.ws.pubsub.SubscriptionEndConsumer;
+import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.SubscribeResponseDocument;
+import org.xmlsoap.schemas.ws.x2003.x03.addressing.EndpointReferenceType;
import java.util.Calendar;
/**
@@ -35,14 +29,11 @@
*/
public class Subscription extends AbstractSubscription{
private EndpointReferenceType sMan;
- private static final Log LOG = LogFactory.getLog( Subscriber.class.getName() );
-
- private static final UuidGenerator UUID_GEN = UuidGeneratorFactory.createUUIdGenerator();
-
+ //private static final Log LOG = LogFactory.getLog( Subscriber.class.getName() );
/** Creates a new instance of Subscription */
public Subscription() {
- m_id = UUID_GEN.generateUuid();
+ m_id = IdentifierUtils.UUID_VERSION_FOUR_GENERATOR.nextIdentifier().toString();
m_creationTime= Calendar.getInstance();
}