Modified: camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/idempotent/jdbc/CustomizedJdbcMessageIdRepositoryTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/idempotent/jdbc/CustomizedJdbcMessageIdRepositoryTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff ============================================================================== --- camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/idempotent/jdbc/CustomizedJdbcMessageIdRepositoryTest.java (original) +++ camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/idempotent/jdbc/CustomizedJdbcMessageIdRepositoryTest.java Wed Jan 23 15:26:07 2013 @@ -48,7 +48,7 @@ public class CustomizedJdbcMessageIdRepo public void setUp() throws Exception { super.setUp(); - dataSource = context.getRegistry().lookup("dataSource", DataSource.class); + dataSource = context.getRegistry().lookupByNameAndType("dataSource", DataSource.class); jdbcTemplate = new JdbcTemplate(dataSource); jdbcTemplate.afterPropertiesSet(); }
Modified: camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/idempotent/jdbc/JdbcMessageIdRepositoryTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/idempotent/jdbc/JdbcMessageIdRepositoryTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff ============================================================================== --- camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/idempotent/jdbc/JdbcMessageIdRepositoryTest.java (original) +++ camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/idempotent/jdbc/JdbcMessageIdRepositoryTest.java Wed Jan 23 15:26:07 2013 @@ -52,7 +52,7 @@ public class JdbcMessageIdRepositoryTest public void setUp() throws Exception { super.setUp(); - dataSource = context.getRegistry().lookup("dataSource", DataSource.class); + dataSource = context.getRegistry().lookupByNameAndType("dataSource", DataSource.class); jdbcTemplate = new JdbcTemplate(dataSource); jdbcTemplate.afterPropertiesSet(); } Modified: camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/CamelEndpointInjectTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/CamelEndpointInjectTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff ============================================================================== --- camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/CamelEndpointInjectTest.java (original) +++ camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/CamelEndpointInjectTest.java Wed Jan 23 15:26:07 2013 @@ -35,7 +35,7 @@ public class CamelEndpointInjectTest ext assertNotNull(mock); mock.expectedMessageCount(1); - MyProducer producer = context.getRegistry().lookup("myProducer", MyProducer.class); + MyProducer producer = context.getRegistry().lookupByNameAndType("myProducer", MyProducer.class); producer.doSomething("Hello World"); mock.assertIsSatisfied(); Modified: camel/trunk/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java?rev=1437464&r1=1437463&r2=1437464&view=diff ============================================================================== --- camel/trunk/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java (original) +++ camel/trunk/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java Wed Jan 23 15:26:07 2013 @@ -809,7 +809,7 @@ public class XMLSecurityDataFormat imple public void setKeyOrTrustStoreParametersId(String registryId) { this.keyOrTrustStoreParametersId = registryId; if (camelContext != null) { - Object parametersObj = camelContext.getRegistry().lookup(this.keyOrTrustStoreParametersId); + Object parametersObj = camelContext.getRegistry().lookupByName(this.keyOrTrustStoreParametersId); if (parametersObj instanceof KeyStoreParameters) { this.keyOrTrustStoreParameters = (KeyStoreParameters)parametersObj; } else { Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/AsyncEndpointTransacted2Test.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/AsyncEndpointTransacted2Test.java?rev=1437464&r1=1437463&r2=1437464&view=diff ============================================================================== --- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/AsyncEndpointTransacted2Test.java (original) +++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/AsyncEndpointTransacted2Test.java Wed Jan 23 15:26:07 2013 @@ -51,7 +51,7 @@ public class AsyncEndpointTransacted2Tes @Before public void createTable() { - table = context.getRegistry().lookup("table", DummyTable.class); + table = context.getRegistry().lookupByNameAndType("table", DummyTable.class); table.create(); } Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/AsyncEndpointTransactedTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/AsyncEndpointTransactedTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff ============================================================================== --- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/AsyncEndpointTransactedTest.java (original) +++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/AsyncEndpointTransactedTest.java Wed Jan 23 15:26:07 2013 @@ -48,7 +48,7 @@ public class AsyncEndpointTransactedTest @Before public void createTable() { - table = context.getRegistry().lookup("table", DummyTable.class); + table = context.getRegistry().lookupByNameAndType("table", DummyTable.class); table.create(); } Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/LoggingPipelineTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/LoggingPipelineTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff ============================================================================== --- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/LoggingPipelineTest.java (original) +++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/LoggingPipelineTest.java Wed Jan 23 15:26:07 2013 @@ -60,7 +60,7 @@ public class LoggingPipelineTest extends @Before public void createTable() { - table = context.getRegistry().lookup("table", DummyTable.class); + table = context.getRegistry().lookupByNameAndType("table", DummyTable.class); table.create(); } Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/PartiallyTransactedPipelineTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/PartiallyTransactedPipelineTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff ============================================================================== --- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/PartiallyTransactedPipelineTest.java (original) +++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/PartiallyTransactedPipelineTest.java Wed Jan 23 15:26:07 2013 @@ -60,7 +60,7 @@ public class PartiallyTransactedPipeline @Before public void createTable() { - table = context.getRegistry().lookup("table", DummyTable.class); + table = context.getRegistry().lookupByNameAndType("table", DummyTable.class); table.create(); } Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/TransactedExceptionClauseAfterTransactedTagTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/TransactedExceptionClauseAfterTransactedTagTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff ============================================================================== --- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/TransactedExceptionClauseAfterTransactedTagTest.java (original) +++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/TransactedExceptionClauseAfterTransactedTagTest.java Wed Jan 23 15:26:07 2013 @@ -60,7 +60,7 @@ public class TransactedExceptionClauseAf @Before public void createTable() { - table = context.getRegistry().lookup("table", DummyTable.class); + table = context.getRegistry().lookupByNameAndType("table", DummyTable.class); table.create(); } Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/TransactedFullExampleTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/TransactedFullExampleTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff ============================================================================== --- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/TransactedFullExampleTest.java (original) +++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/TransactedFullExampleTest.java Wed Jan 23 15:26:07 2013 @@ -66,7 +66,7 @@ public class TransactedFullExampleTest e @Before public void createTable() { - table = context.getRegistry().lookup("table", DummyTable.class); + table = context.getRegistry().lookupByNameAndType("table", DummyTable.class); table.create(); } Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/TransactedOnCompletionTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/TransactedOnCompletionTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff ============================================================================== --- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/TransactedOnCompletionTest.java (original) +++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/TransactedOnCompletionTest.java Wed Jan 23 15:26:07 2013 @@ -60,7 +60,7 @@ public class TransactedOnCompletionTest @Before public void createTable() { - table = context.getRegistry().lookup("table", DummyTable.class); + table = context.getRegistry().lookupByNameAndType("table", DummyTable.class); table.create(); } Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/TransactedOnExceptionTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/TransactedOnExceptionTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff ============================================================================== --- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/TransactedOnExceptionTest.java (original) +++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/TransactedOnExceptionTest.java Wed Jan 23 15:26:07 2013 @@ -60,7 +60,7 @@ public class TransactedOnExceptionTest e @Before public void createTable() { - table = context.getRegistry().lookup("table", DummyTable.class); + table = context.getRegistry().lookupByNameAndType("table", DummyTable.class); table.create(); } Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/TransactedPipelineTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/TransactedPipelineTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff ============================================================================== --- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/TransactedPipelineTest.java (original) +++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/TransactedPipelineTest.java Wed Jan 23 15:26:07 2013 @@ -57,7 +57,7 @@ public class TransactedPipelineTest exte @Before public void createTable() { - table = context.getRegistry().lookup("table", DummyTable.class); + table = context.getRegistry().lookupByNameAndType("table", DummyTable.class); table.create(); } Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/TransactedTryCatchTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/TransactedTryCatchTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff ============================================================================== --- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/TransactedTryCatchTest.java (original) +++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/TransactedTryCatchTest.java Wed Jan 23 15:26:07 2013 @@ -60,7 +60,7 @@ public class TransactedTryCatchTest exte @Before public void createTable() { - table = context.getRegistry().lookup("table", DummyTable.class); + table = context.getRegistry().lookupByNameAndType("table", DummyTable.class); table.create(); } Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/BeanCallDerivedClassTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/BeanCallDerivedClassTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff ============================================================================== --- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/BeanCallDerivedClassTest.java (original) +++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/BeanCallDerivedClassTest.java Wed Jan 23 15:26:07 2013 @@ -32,7 +32,7 @@ public class BeanCallDerivedClassTest ex @Test public void testCallBean() throws Exception { - DerivedClass derived = context.getRegistry().lookup("derived", DerivedClass.class); + DerivedClass derived = context.getRegistry().lookupByNameAndType("derived", DerivedClass.class); template.sendBody("direct:start", "Hello World"); assertEquals("Hello World", derived.getBody()); Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff ============================================================================== --- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java (original) +++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java Wed Jan 23 15:26:07 2013 @@ -92,11 +92,11 @@ public class JmsResequencerTest extends resultEndpoint = getMockEndpoint("mock:result"); - Object lookedUpBean = context.getRegistry().lookup("myBean1"); + Object lookedUpBean = context.getRegistry().lookupByName("myBean1"); assertSame("Lookup of 'myBean' should return same object!", b1, lookedUpBean); - lookedUpBean = context.getRegistry().lookup("myBean2"); + lookedUpBean = context.getRegistry().lookupByName("myBean2"); assertSame("Lookup of 'myBean' should return same object!", b2, lookedUpBean); - lookedUpBean = context.getRegistry().lookup("myBean3"); + lookedUpBean = context.getRegistry().lookupByName("myBean3"); assertSame("Lookup of 'myBean' should return same object!", b3, lookedUpBean); } Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/proxy/SpringEchoCamelProxyTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/proxy/SpringEchoCamelProxyTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff ============================================================================== --- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/proxy/SpringEchoCamelProxyTest.java (original) +++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/proxy/SpringEchoCamelProxyTest.java Wed Jan 23 15:26:07 2013 @@ -33,7 +33,7 @@ public class SpringEchoCamelProxyTest ex @Test public void testEchoProduce() throws Exception { - EchoClient client = context.getRegistry().lookup("client", EchoClient.class); + EchoClient client = context.getRegistry().lookupByNameAndType("client", EchoClient.class); String reply = client.hello("Camel"); assertEquals("Hello Camel", reply); Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff ============================================================================== --- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java (original) +++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java Wed Jan 23 15:26:07 2013 @@ -52,7 +52,7 @@ public class FromJmsToJdbcIdempotentCons public void setUp() throws Exception { super.setUp(); - dataSource = context.getRegistry().lookup(getDatasourceName(), DataSource.class); + dataSource = context.getRegistry().lookupByNameAndType(getDatasourceName(), DataSource.class); jdbcTemplate = new JdbcTemplate(dataSource); jdbcTemplate.afterPropertiesSet(); } @@ -224,7 +224,7 @@ public class FromJmsToJdbcIdempotentCons return new RouteBuilder() { @Override public void configure() throws Exception { - IdempotentRepository<?> repository = context.getRegistry().lookup("messageIdRepository", IdempotentRepository.class); + IdempotentRepository<?> repository = context.getRegistry().lookupByNameAndType("messageIdRepository", IdempotentRepository.class); from("activemq:queue:inbox") .transacted("required")
