You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2009/06/15 14:04:55 UTC
svn commit: r784743 - in
/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test:
CamelTestSupport.java junit4/CamelTestSupport.java
Author: ningjiang
Date: Mon Jun 15 12:04:55 2009
New Revision: 784743
URL: http://svn.apache.org/viewvc?rev=784743&view=rev
Log:
Added the jndi registry default property in the camel-test module
Modified:
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
Modified: camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java?rev=784743&r1=784742&r2=784743&view=diff
==============================================================================
--- camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java (original)
+++ camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java Mon Jun 15 12:04:55 2009
@@ -160,6 +160,9 @@
if (in != null) {
log.debug("Using jndi.properties from classpath root");
properties.load(in);
+ } else {
+ // set the default initial factory
+ properties.put("java.naming.factory.initial", "org.apache.camel.util.jndi.CamelInitialContextFactory");
}
return new InitialContext(new Hashtable(properties));
}
Modified: camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java?rev=784743&r1=784742&r2=784743&view=diff
==============================================================================
--- camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java (original)
+++ camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java Mon Jun 15 12:04:55 2009
@@ -162,6 +162,8 @@
if (in != null) {
log.debug("Using jndi.properties from classpath root");
properties.load(in);
+ } else {
+ properties.put("java.naming.factory.initial", "org.apache.camel.util.jndi.CamelInitialContextFactory");
}
return new InitialContext(new Hashtable(properties));
}