Author: jstrachan
Date: Fri May 4 00:36:31 2007
New Revision: 535124
URL: http://svn.apache.org/viewvc?view=rev&rev=535124
Log:
renamed the Uid -> Uuid (for universal unique id generator)
Added:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/UuidGenerator.java
(contents, props changed)
- copied, changed from r535123,
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/UIdGenerator.java
Removed:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/UIdGenerator.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java?view=diff&rev=535124&r1=535123&r2=535124
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
Fri May 4 00:36:31 2007
@@ -19,7 +19,7 @@
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
-import org.apache.camel.util.UIdGenerator;
+import org.apache.camel.util.UuidGenerator;
import java.util.HashMap;
import java.util.Map;
@@ -30,7 +30,7 @@
* @version $Revision$
*/
public class DefaultExchange implements Exchange {
- private static final UIdGenerator defaultIdGenerator = new UIdGenerator();
+ private static final UuidGenerator defaultIdGenerator = new
UuidGenerator();
protected final CamelContext context;
private Map<String, Object> headers;
private Message in;
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java?view=diff&rev=535124&r1=535123&r2=535124
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java
Fri May 4 00:36:31 2007
@@ -19,7 +19,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.Message;
-import org.apache.camel.util.UIdGenerator;
+import org.apache.camel.util.UuidGenerator;
/**
* A base class for implementation inheritence providing the core [EMAIL
PROTECTED] Message} body
@@ -31,7 +31,7 @@
* @version $Revision$
*/
public abstract class MessageSupport implements Message {
- private static final UIdGenerator defaultIdGenerator = new UIdGenerator();
+ private static final UuidGenerator defaultIdGenerator = new
UuidGenerator();
private Exchange exchange;
private Object body;
private String messageId = defaultIdGenerator.generateId();
Copied:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/UuidGenerator.java
(from r535123,
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/UIdGenerator.java)
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/UuidGenerator.java?view=diff&rev=535124&p1=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/UIdGenerator.java&r1=535123&p2=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/UuidGenerator.java&r2=535124
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/UIdGenerator.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/UuidGenerator.java
Fri May 4 00:36:31 2007
@@ -25,9 +25,9 @@
* Generator for Globally unique Strings.
*/
-public class UIdGenerator{
+public class UuidGenerator {
- private static final Logger log =
Logger.getLogger(UIdGenerator.class.getName());
+ private static final Logger log =
Logger.getLogger(UuidGenerator.class.getName());
private static final String UNIQUE_STUB;
private static int instanceCount;
private static String hostName;
@@ -78,13 +78,13 @@
*
*/
- public UIdGenerator(String prefix){
+ public UuidGenerator(String prefix){
synchronized(UNIQUE_STUB){
this.seed = prefix + UNIQUE_STUB +(instanceCount++) +"-";
}
}
- public UIdGenerator(){
+ public UuidGenerator(){
this("ID-" + hostName);
}
Propchange:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/UuidGenerator.java
------------------------------------------------------------------------------
svn:eol-style = native
