Author: davsclaus
Date: Thu Apr 15 11:40:17 2010
New Revision: 934376
URL: http://svn.apache.org/viewvc?rev=934376&view=rev
Log:
CAMEL-2649: FactoryBean for ProducerTemplate and ConsumerTemplate should return
singleton instances.
Added:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateHasTwoTemplatesTest.java
(with props)
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateHasTwoTemplatesTest.java
(contents, props changed)
- copied, changed from r934375,
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAlreadyExistTest.java
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateHasTwoTemplatesTest-context.xml
(with props)
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ProducerTemplateHasTwoTemplatesTest-context.xml
- copied, changed from r934328,
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ProducerTemplateAlreadyExistTest-context.xml
Added:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateHasTwoTemplatesTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateHasTwoTemplatesTest.java?rev=934376&view=auto
==============================================================================
---
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateHasTwoTemplatesTest.java
(added)
+++
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateHasTwoTemplatesTest.java
Thu Apr 15 11:40:17 2010
@@ -0,0 +1,45 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.spring.config;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import
org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
+
+/**
+ * @version $Revision$
+ */
+...@contextconfiguration
+public class ConsumerTemplateHasTwoTemplatesTest extends
AbstractJUnit38SpringContextTests {
+
+ @Autowired
+ private CamelContext context;
+
+ public void testHasTwoTemplates() {
+ ConsumerTemplate lookup = context.getRegistry().lookup("myTemplate",
ConsumerTemplate.class);
+ assertNotNull("Should lookup producer template", lookup);
+
+ ConsumerTemplate lookup2 =
context.getRegistry().lookup("myOtherTemplate", ConsumerTemplate.class);
+ assertNotNull("Should lookup producer template", lookup2);
+
+ assertNotSame("Should not be same", lookup, lookup2);
+ }
+
+}
\ No newline at end of file
Propchange:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateHasTwoTemplatesTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateHasTwoTemplatesTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateHasTwoTemplatesTest.java
(from r934375,
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAlreadyExistTest.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateHasTwoTemplatesTest.java?p2=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateHasTwoTemplatesTest.java&p1=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAlreadyExistTest.java&r1=934375&r2=934376&rev=934376&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAlreadyExistTest.java
(original)
+++
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateHasTwoTemplatesTest.java
Thu Apr 15 11:40:17 2010
@@ -26,31 +26,19 @@ import org.springframework.test.context.
* @version $Revision$
*/
@ContextConfiguration
-public class ProducerTemplateAlreadyExistTest extends
AbstractJUnit38SpringContextTests {
-
- @Autowired
- private ProducerTemplate template;
+public class ProducerTemplateHasTwoTemplatesTest extends
AbstractJUnit38SpringContextTests {
@Autowired
private CamelContext context;
- public void testHasExistingTemplate() {
- assertNotNull("Should have injected a producer template", template);
-
- ProducerTemplate lookup = context.getRegistry().lookup("myTemplate",
ProducerTemplate.class);
- assertNotNull("Should lookup producer template", lookup);
-
- ProducerTemplate lookup2 = context.getRegistry().lookup("template",
ProducerTemplate.class);
- assertNull("Should not be able to lookup producer template", lookup2);
- }
-
- public void testShouldBeSingleton() {
+ public void testHasTwoTemplates() {
ProducerTemplate lookup = context.getRegistry().lookup("myTemplate",
ProducerTemplate.class);
assertNotNull("Should lookup producer template", lookup);
- ProducerTemplate lookup2 = context.getRegistry().lookup("myTemplate",
ProducerTemplate.class);
- assertNotNull("Should lookup producer template", lookup);
+ ProducerTemplate lookup2 =
context.getRegistry().lookup("myOtherTemplate", ProducerTemplate.class);
+ assertNotNull("Should lookup producer template", lookup2);
- assertSame("Should be same instances (singleton)", lookup, lookup2);
+ assertNotSame("Should not be same", lookup, lookup2);
}
+
}
\ No newline at end of file
Propchange:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateHasTwoTemplatesTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateHasTwoTemplatesTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateHasTwoTemplatesTest-context.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateHasTwoTemplatesTest-context.xml?rev=934376&view=auto
==============================================================================
---
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateHasTwoTemplatesTest-context.xml
(added)
+++
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateHasTwoTemplatesTest-context.xml
Thu Apr 15 11:40:17 2010
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
+ ">
+
+ <camelContext xmlns="http://camel.apache.org/schema/spring";>
+ <consumerTemplate id="myTemplate"/>
+ <consumerTemplate id="myOtherTemplate"/>
+ </camelContext>
+
+</beans>
Propchange:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateHasTwoTemplatesTest-context.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateHasTwoTemplatesTest-context.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateHasTwoTemplatesTest-context.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Copied:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ProducerTemplateHasTwoTemplatesTest-context.xml
(from r934328,
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ProducerTemplateAlreadyExistTest-context.xml)
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ProducerTemplateHasTwoTemplatesTest-context.xml?p2=camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ProducerTemplateHasTwoTemplatesTest-context.xml&p1=camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ProducerTemplateAlreadyExistTest-context.xml&r1=934328&r2=934376&rev=934376&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ProducerTemplateAlreadyExistTest-context.xml
(original)
+++
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ProducerTemplateHasTwoTemplatesTest-context.xml
Thu Apr 15 11:40:17 2010
@@ -24,6 +24,7 @@
<camelContext xmlns="http://camel.apache.org/schema/spring";>
<template id="myTemplate"/>
+ <template id="myOtherTemplate"/>
</camelContext>
</beans>
