Author: davsclaus
Date: Wed Oct 6 13:59:17 2010
New Revision: 1005042
URL: http://svn.apache.org/viewvc?rev=1005042&view=rev
Log:
Fixed ActiveMQ uuid generator to use santizied ids to be friendly for url/file
etc. It fixes problem with camel web console also.
Removed:
camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaShutdownCompleteAllTasksTest.java
camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaShutdownCompleteCurrentTaskOnlyTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ActiveMQUuidGenerator.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/htmlunit/CreateEndpointTest.java
camel/trunk/components/camel-web/src/test/resources/log4j.properties
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ActiveMQUuidGenerator.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ActiveMQUuidGenerator.java?rev=1005042&r1=1005041&r2=1005042&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ActiveMQUuidGenerator.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ActiveMQUuidGenerator.java
Wed Oct 6 13:59:17 2010
@@ -73,6 +73,8 @@ public class ActiveMQUuidGenerator imple
public ActiveMQUuidGenerator(String prefix) {
synchronized (UNIQUE_STUB) {
this.seed = prefix + UNIQUE_STUB + (instanceCount++) + "-";
+ // let the ID be friendly for URL and file systems
+ this.seed = generateSanitizedId(this.seed);
this.length = seed.length() + ("" + Long.MAX_VALUE).length();
}
}
@@ -117,6 +119,7 @@ public class ActiveMQUuidGenerator imple
id = id.replace(':', '-');
id = id.replace('_', '-');
id = id.replace('.', '-');
+ id = id.replace('/', '-');
return id;
}
}
\ No newline at end of file
Modified:
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/htmlunit/CreateEndpointTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/htmlunit/CreateEndpointTest.java?rev=1005042&r1=1005041&r2=1005042&view=diff
==============================================================================
---
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/htmlunit/CreateEndpointTest.java
(original)
+++
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/htmlunit/CreateEndpointTest.java
Wed Oct 6 13:59:17 2010
@@ -32,6 +32,7 @@ import static org.openqa.selenium.By.xpa
import static org.openqa.selenium.lift.Finders.links;
import static org.openqa.selenium.lift.Matchers.atLeast;
import static org.openqa.selenium.lift.Matchers.text;
+
/**
* @version $Revision$
*/
Modified: camel/trunk/components/camel-web/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/resources/log4j.properties?rev=1005042&r1=1005041&r2=1005042&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/resources/log4j.properties
(original)
+++ camel/trunk/components/camel-web/src/test/resources/log4j.properties Wed
Oct 6 13:59:17 2010
@@ -18,7 +18,7 @@
#
# The logging properties used for eclipse testing, We want to see debug output
on the console.
#
-log4j.rootLogger=WARN, out
+log4j.rootLogger=INFO, file
log4j.logger.org.springframework=WARN
#log4j.logger.org.apache.camel=DEBUG
