You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by js...@apache.org on 2007/08/07 19:27:10 UTC
svn commit: r563575 - in /activemq/camel/trunk/camel-core/src:
main/java/org/apache/camel/impl/ test/java/org/apache/camel/
test/java/org/apache/camel/impl/ test/java/org/apache/camel/util/jndi/
test/resources/
Author: jstrachan
Date: Tue Aug 7 10:27:09 2007
New Revision: 563575
URL: http://svn.apache.org/viewvc?view=rev&rev=563575
Log:
refactored to not have a jndi.properties by default - to avoid dependent projects using camel-core test-jar having a JNDI provider forced on them
Added:
activemq/camel/trunk/camel-core/src/test/resources/jndi-example.properties (contents, props changed)
- copied, changed from r563503, activemq/camel/trunk/camel-core/src/test/resources/jndi.properties
Removed:
activemq/camel/trunk/camel-core/src/test/resources/jndi.properties
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/RegistryTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/util/jndi/JndiTest.java
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?view=diff&rev=563575&r1=563574&r2=563575
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java Tue Aug 7 10:27:09 2007
@@ -80,7 +80,14 @@
* @param jndiContext
*/
public DefaultCamelContext(Context jndiContext) {
- setRegistry(new JndiRegistry(jndiContext));
+ this(new JndiRegistry(jndiContext));
+ }
+
+ /**
+ * Creates the {@link CamelContext} using the given registry
+ */
+ public DefaultCamelContext(Registry registry) {
+ this.registry = registry;
}
/**
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java?view=diff&rev=563575&r1=563574&r2=563575
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java Tue Aug 7 10:27:09 2007
@@ -19,7 +19,9 @@
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.spi.Language;
+import org.apache.camel.util.jndi.JndiTest;
/**
* A useful base class which creates a {@link CamelContext} with some routes along with a {@link CamelTemplate}
@@ -92,7 +94,7 @@
}
protected CamelContext createCamelContext() throws Exception {
- return new DefaultCamelContext();
+ return new DefaultCamelContext(new JndiRegistry(JndiTest.createInitialContext()));
}
protected RouteBuilder createRouteBuilder() throws Exception {
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/RegistryTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/RegistryTest.java?view=diff&rev=563575&r1=563574&r2=563575
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/RegistryTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/RegistryTest.java Tue Aug 7 10:27:09 2007
@@ -17,6 +17,7 @@
package org.apache.camel.impl;
import junit.framework.TestCase;
+import org.apache.camel.util.jndi.JndiTest;
import java.util.Arrays;
import java.util.List;
@@ -25,8 +26,7 @@
* @version $Revision: $
*/
public class RegistryTest extends TestCase {
-
- protected JndiRegistry registry = new JndiRegistry();
+ protected JndiRegistry registry;
public void testBind() throws Exception {
List foo = Arrays.asList("a", "b", "c");
@@ -45,5 +45,10 @@
public void testLookupOfUnknownName() throws Exception {
Object value = registry.lookup("No such entry!");
assertNull("Should not find anything!", value);
+ }
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ registry = new JndiRegistry(JndiTest.createInitialContext());
}
}
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/util/jndi/JndiTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/util/jndi/JndiTest.java?view=diff&rev=563575&r1=563574&r2=563575
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/util/jndi/JndiTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/util/jndi/JndiTest.java Tue Aug 7 10:27:09 2007
@@ -22,6 +22,9 @@
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import java.util.Hashtable;
+import java.util.Properties;
+import java.io.InputStream;
/**
* @version $Revision: 1.1 $
@@ -29,6 +32,15 @@
public class JndiTest extends TestSupport {
protected Context context;
+ public static Context createInitialContext() throws Exception {
+ InputStream in = JndiTest.class.getClassLoader().getResourceAsStream("jndi-example.properties");
+ assertNotNull("Cannot find jndi-example.properties on the classpath!", in);
+ Properties properties = new Properties();
+ properties.load(in);
+ return new InitialContext(new Hashtable(properties));
+
+ }
+
public void testLookupOfSimpleName() throws Exception {
Object value = assertLookup("foo");
assertEquals("foo", "bar", value);
@@ -52,6 +64,6 @@
protected void setUp() throws Exception {
super.setUp();
- context = new InitialContext();
+ context = createInitialContext();
}
}
Copied: activemq/camel/trunk/camel-core/src/test/resources/jndi-example.properties (from r563503, activemq/camel/trunk/camel-core/src/test/resources/jndi.properties)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/resources/jndi-example.properties?view=diff&rev=563575&p1=activemq/camel/trunk/camel-core/src/test/resources/jndi.properties&r1=563503&p2=activemq/camel/trunk/camel-core/src/test/resources/jndi-example.properties&r2=563575
==============================================================================
(empty)
Propchange: activemq/camel/trunk/camel-core/src/test/resources/jndi-example.properties
------------------------------------------------------------------------------
svn:eol-style = native