Author: davsclaus
Date: Tue Aug 11 07:33:32 2009
New Revision: 803014
URL: http://svn.apache.org/viewvc?rev=803014&view=rev
Log:
CAMEL-1899: CamelContext in Spring XML automatic register a ProducerTemplate
and/or ConsumerTemplate if none have been declared in XML so we have one by
default. Convention over configuration.
Added:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAlreadyExistTest.java
(with props)
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAutoRegisterTest.java
(with props)
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAlreadyExistTest.java
(with props)
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTest.java
(with props)
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateAlreadyExistTest-context.xml
(with props)
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateAutoRegisterTest-context.xml
(with props)
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ProducerTemplateAlreadyExistTest-context.xml
(with props)
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTest-context.xml
- copied, changed from r802993,
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/EndpointUriSetFromSpringTest-context.xml
Modified:
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
Modified:
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java?rev=803014&r1=803013&r2=803014&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
(original)
+++
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
Tue Aug 11 07:33:32 2009
@@ -262,6 +262,9 @@
// register as endpoint defined indirectly in the routes by
from/to types having id explict set
registerEndpointsWithIdsDefinedInFromOrToTypes(element,
parserContext, contextId);
+ // register templates if not already defined
+ registerTemplates(element, parserContext, contextId);
+
// lets inject the namespaces into any namespace aware POJOs
injectNamespaces(element);
if (!createdBeanPostProcessor) {
@@ -271,6 +274,7 @@
createBeanPostProcessor(parserContext, contextId,
childElement, builder);
}
}
+
}
protected void injectNamespaces(Element element) {
@@ -295,7 +299,7 @@
}
/**
- * Uses for auto registering endpoints from the <tt>from</tt> or
<tt>to</tt> DSL if they have an id attribute set
+ * Used for auto registering endpoints from the <tt>from</tt> or
<tt>to</tt> DSL if they have an id attribute set
*/
protected void registerEndpointsWithIdsDefinedInFromOrToTypes(Element
element, ParserContext parserContext, String contextId) {
NodeList list = element.getChildNodes();
@@ -315,6 +319,56 @@
}
}
+ /**
+ * Used for auto registering producer and consumer templates if not
already defined in XML.
+ */
+ protected void registerTemplates(Element element, ParserContext
parserContext, String contextId) {
+ boolean template = false;
+ boolean consumerTemplate = false;
+
+ NodeList list = element.getChildNodes();
+ int size = list.getLength();
+ for (int i = 0; i < size; i++) {
+ Node child = list.item(i);
+ if (child instanceof Element) {
+ Element childElement = (Element)child;
+ String localName = childElement.getLocalName();
+ if ("template".equals(localName)) {
+ template = true;
+ } else if ("consumerTemplate".equals(localName)) {
+ consumerTemplate = true;
+ }
+ }
+ }
+
+ if (!template) {
+ String id = "template";
+ // auto create a template
+ Element templateElement =
element.getOwnerDocument().createElement("template");
+ templateElement.setAttribute("id", id);
+ BeanDefinitionParser parser = parserMap.get("template");
+ BeanDefinition definition = parser.parse(templateElement,
parserContext);
+ parserContext.registerComponent(new
BeanComponentDefinition(definition, id));
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Registered a default ProducerTemplate with id: " +
id);
+ }
+ }
+
+ if (!consumerTemplate) {
+ String id = "consumerTemplate";
+ // auto create a template
+ Element templateElement =
element.getOwnerDocument().createElement("consumerTemplate");
+ templateElement.setAttribute("id", id);
+ BeanDefinitionParser parser = parserMap.get("consumerTemplate");
+ BeanDefinition definition = parser.parse(templateElement,
parserContext);
+ parserContext.registerComponent(new
BeanComponentDefinition(definition, id));
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Registered a default ConsumerTemplate with id: " +
id);
+ }
+ }
+
+ }
+
private void registerEndpoint(Element childElement, ParserContext
parserContext, String contextId) {
String id = childElement.getAttribute("id");
// must have an id to be registered
Added:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAlreadyExistTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAlreadyExistTest.java?rev=803014&view=auto
==============================================================================
---
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAlreadyExistTest.java
(added)
+++
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAlreadyExistTest.java
Tue Aug 11 07:33:32 2009
@@ -0,0 +1,48 @@
+/**
+ * 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.junit.Test;
+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 ConsumerTemplateAlreadyExistTest extends
AbstractJUnit38SpringContextTests {
+
+ @Autowired
+ private ConsumerTemplate template;
+
+ @Autowired
+ private CamelContext context;
+
+ @Test
+ public void testHasExistingTemplate() {
+ assertNotNull("Should have injected a consumer template", template);
+
+ ConsumerTemplate lookup =
context.getRegistry().lookup("myConsumerTemplate", ConsumerTemplate.class);
+ assertNotNull("Should lookup consumer template", lookup);
+
+ ConsumerTemplate lookup2 =
context.getRegistry().lookup("consumerTemplate", ConsumerTemplate.class);
+ assertNull("Should not be able to lookup consumer template", lookup2);
+ }
+}
\ No newline at end of file
Propchange:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAlreadyExistTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAlreadyExistTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAutoRegisterTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAutoRegisterTest.java?rev=803014&view=auto
==============================================================================
---
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAutoRegisterTest.java
(added)
+++
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAutoRegisterTest.java
Tue Aug 11 07:33:32 2009
@@ -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.junit.Test;
+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 ConsumerTemplateAutoRegisterTest extends
AbstractJUnit38SpringContextTests {
+
+ @Autowired
+ private ConsumerTemplate template;
+
+ @Autowired
+ private CamelContext context;
+
+ @Test
+ public void testHasTemplate() {
+ assertNotNull("Should have injected a consumer template", template);
+
+ ConsumerTemplate lookup =
context.getRegistry().lookup("consumerTemplate", ConsumerTemplate.class);
+ assertNotNull("Should lookup consumer template", lookup);
+ }
+}
\ No newline at end of file
Propchange:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAutoRegisterTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAutoRegisterTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
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/ProducerTemplateAlreadyExistTest.java?rev=803014&view=auto
==============================================================================
---
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAlreadyExistTest.java
(added)
+++
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAlreadyExistTest.java
Tue Aug 11 07:33:32 2009
@@ -0,0 +1,48 @@
+/**
+ * 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.ProducerTemplate;
+import org.junit.Test;
+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 ProducerTemplateAlreadyExistTest extends
AbstractJUnit38SpringContextTests {
+
+ @Autowired
+ private ProducerTemplate template;
+
+ @Autowired
+ private CamelContext context;
+
+ @Test
+ 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);
+ }
+}
\ No newline at end of file
Propchange:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAlreadyExistTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAlreadyExistTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTest.java?rev=803014&view=auto
==============================================================================
---
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTest.java
(added)
+++
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTest.java
Tue Aug 11 07:33:32 2009
@@ -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.ProducerTemplate;
+import org.junit.Test;
+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 ProducerTemplateAutoRegisterTest extends
AbstractJUnit38SpringContextTests {
+
+ @Autowired
+ private ProducerTemplate template;
+
+ @Autowired
+ private CamelContext context;
+
+ @Test
+ public void testHasTemplate() {
+ assertNotNull("Should have injected a producer template", template);
+
+ ProducerTemplate lookup = context.getRegistry().lookup("template",
ProducerTemplate.class);
+ assertNotNull("Should lookup producer template", lookup);
+ }
+}
Propchange:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateAlreadyExistTest-context.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateAlreadyExistTest-context.xml?rev=803014&view=auto
==============================================================================
---
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateAlreadyExistTest-context.xml
(added)
+++
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateAlreadyExistTest-context.xml
Tue Aug 11 07:33:32 2009
@@ -0,0 +1,29 @@
+<?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="myConsumerTemplate"/>
+ </camelContext>
+
+</beans>
Propchange:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateAlreadyExistTest-context.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateAlreadyExistTest-context.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateAlreadyExistTest-context.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateAutoRegisterTest-context.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateAutoRegisterTest-context.xml?rev=803014&view=auto
==============================================================================
---
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateAutoRegisterTest-context.xml
(added)
+++
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateAutoRegisterTest-context.xml
Tue Aug 11 07:33:32 2009
@@ -0,0 +1,28 @@
+<?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";>
+ </camelContext>
+
+</beans>
Propchange:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateAutoRegisterTest-context.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateAutoRegisterTest-context.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ConsumerTemplateAutoRegisterTest-context.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
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/ProducerTemplateAlreadyExistTest-context.xml?rev=803014&view=auto
==============================================================================
---
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ProducerTemplateAlreadyExistTest-context.xml
(added)
+++
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ProducerTemplateAlreadyExistTest-context.xml
Tue Aug 11 07:33:32 2009
@@ -0,0 +1,29 @@
+<?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";>
+ <template id="myTemplate"/>
+ </camelContext>
+
+</beans>
Propchange:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ProducerTemplateAlreadyExistTest-context.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ProducerTemplateAlreadyExistTest-context.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ProducerTemplateAlreadyExistTest-context.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Copied:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTest-context.xml
(from r802993,
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/EndpointUriSetFromSpringTest-context.xml)
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTest-context.xml?p2=camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTest-context.xml&p1=camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/EndpointUriSetFromSpringTest-context.xml&r1=802993&r2=803014&rev=803014&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/EndpointUriSetFromSpringTest-context.xml
(original)
+++
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTest-context.xml
Tue Aug 11 07:33:32 2009
@@ -22,8 +22,7 @@
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <camelContext xmlns="http://camel.apache.org/schema/spring";>
- </camelContext>
+ <camelContext xmlns="http://camel.apache.org/schema/spring";>
+ </camelContext>
- <bean name="foo:bar" class="org.apache.camel.component.mock.MockEndpoint"/>
</beans>
