You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by kr...@apache.org on 2010/09/23 20:19:58 UTC
svn commit: r1000565 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/impl/
components/camel-gae/src/main/java/org/apache/camel/component/gae/context/
examples/camel-example-gae/
Author: krasserm
Date: Thu Sep 23 18:19:57 2010
New Revision: 1000565
URL: http://svn.apache.org/viewvc?rev=1000565&view=rev
Log:
Context-sensitive setting of default UuidGenerator. Closes CAMEL-3140.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/context/GaeDefaultCamelContext.java
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/context/GaeSpringCamelContext.java
camel/trunk/examples/camel-example-gae/pom.xml
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=1000565&r1=1000564&r2=1000565&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java Thu Sep 23 18:19:57 2010
@@ -180,7 +180,7 @@ public class DefaultCamelContext extends
private ShutdownRunningTask shutdownRunningTask = ShutdownRunningTask.CompleteCurrentTaskOnly;
private ExecutorServiceStrategy executorServiceStrategy = new DefaultExecutorServiceStrategy(this);
private Debugger debugger;
- private UuidGenerator uuidGenerator = new ActiveMQUuidGenerator();
+ private UuidGenerator uuidGenerator = createDefaultUuidGenerator();
private final StopWatch stopWatch = new StopWatch(false);
private Date startDate;
@@ -2161,4 +2161,13 @@ public class DefaultCamelContext extends
public static void setContextCounter(int value) {
DefaultCamelContextNameStrategy.setCounter(value);
}
+
+ private static UuidGenerator createDefaultUuidGenerator() {
+ if (System.getProperty("com.google.appengine.runtime.environment") != null) {
+ // either "Production" or "Development"
+ return new JavaUuidGenerator();
+ } else {
+ return new ActiveMQUuidGenerator();
+ }
+ }
}
Modified: camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/context/GaeDefaultCamelContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/context/GaeDefaultCamelContext.java?rev=1000565&r1=1000564&r2=1000565&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/context/GaeDefaultCamelContext.java (original)
+++ camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/context/GaeDefaultCamelContext.java Thu Sep 23 18:19:57 2010
@@ -16,9 +16,7 @@
*/
package org.apache.camel.component.gae.context;
-import org.apache.camel.impl.ActiveMQUuidGenerator;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.impl.JavaUuidGenerator;
public class GaeDefaultCamelContext extends DefaultCamelContext {
@@ -26,12 +24,6 @@ public class GaeDefaultCamelContext exte
protected void doStart() throws Exception {
// JMX not allowed on GAE
disableJMX();
-
- if (getUuidGenerator() instanceof ActiveMQUuidGenerator) {
- // use java uuid generator as ActiveMQ uses JDK API which is not allowed on GAE
- setUuidGenerator(new JavaUuidGenerator());
- }
-
super.doStart();
}
Modified: camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/context/GaeSpringCamelContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/context/GaeSpringCamelContext.java?rev=1000565&r1=1000564&r2=1000565&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/context/GaeSpringCamelContext.java (original)
+++ camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/context/GaeSpringCamelContext.java Thu Sep 23 18:19:57 2010
@@ -19,8 +19,6 @@ package org.apache.camel.component.gae.c
import java.util.List;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.ActiveMQUuidGenerator;
-import org.apache.camel.impl.JavaUuidGenerator;
import org.apache.camel.spring.SpringCamelContext;
public class GaeSpringCamelContext extends SpringCamelContext {
@@ -29,12 +27,6 @@ public class GaeSpringCamelContext exten
protected void doStart() throws Exception {
// JMX not allowed on GAE
disableJMX();
-
- if (getUuidGenerator() instanceof ActiveMQUuidGenerator) {
- // use java uuid generator as ActiveMQ uses JDK API which is not allowed on GAE
- setUuidGenerator(new JavaUuidGenerator());
- }
-
super.doStart();
}
Modified: camel/trunk/examples/camel-example-gae/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-gae/pom.xml?rev=1000565&r1=1000564&r2=1000565&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-gae/pom.xml (original)
+++ camel/trunk/examples/camel-example-gae/pom.xml Thu Sep 23 18:19:57 2010
@@ -25,17 +25,6 @@
<version>1.0.5</version>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>