You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/09/30 09:49:14 UTC
svn commit: r1391960 - in /camel/branches/camel-2.10.x: ./
components/camel-spring/src/test/resources/org/apache/camel/spring/contextscan/
Author: davsclaus
Date: Sun Sep 30 07:49:14 2012
New Revision: 1391960
URL: http://svn.apache.org/viewvc?rev=1391960&view=rev
Log:
CAMEL-5456: Added license. Polished.
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/components/camel-spring/src/test/resources/org/apache/camel/spring/contextscan/ContextScanOnExceptionAndDLCErrorHandler.xml
camel/branches/camel-2.10.x/components/camel-spring/src/test/resources/org/apache/camel/spring/contextscan/ContextScanOnExceptionAndDLCErrorHandlerReverse.xml
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1391958
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.10.x/components/camel-spring/src/test/resources/org/apache/camel/spring/contextscan/ContextScanOnExceptionAndDLCErrorHandler.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-spring/src/test/resources/org/apache/camel/spring/contextscan/ContextScanOnExceptionAndDLCErrorHandler.xml?rev=1391960&r1=1391959&r2=1391960&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-spring/src/test/resources/org/apache/camel/spring/contextscan/ContextScanOnExceptionAndDLCErrorHandler.xml (original)
+++ camel/branches/camel-2.10.x/components/camel-spring/src/test/resources/org/apache/camel/spring/contextscan/ContextScanOnExceptionAndDLCErrorHandler.xml Sun Sep 30 07:49:14 2012
@@ -1,6 +1,23 @@
<?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" xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
@@ -8,16 +25,9 @@
<context:component-scan base-package="org.apache.camel.spring.contextscan.normalorder"/>
- <bean id="damn" class="java.lang.IllegalArgumentException">
- <constructor-arg index="0" value="Damn"/>
- </bean>
-
- <bean id="deadLetter" class="org.apache.camel.builder.DeadLetterChannelBuilder">
- <property name="deadLetterUri" value="mock:dead"/>
- </bean>
-
<camelContext xmlns="http://camel.apache.org/schema/spring" errorHandlerRef="deadLetter">
<contextScan/>
- </camelContext>
+ <errorHandler id="deadLetter" type="DeadLetterChannel" deadLetterUri="mock:dead"/>
+ </camelContext>
</beans>
Modified: camel/branches/camel-2.10.x/components/camel-spring/src/test/resources/org/apache/camel/spring/contextscan/ContextScanOnExceptionAndDLCErrorHandlerReverse.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-spring/src/test/resources/org/apache/camel/spring/contextscan/ContextScanOnExceptionAndDLCErrorHandlerReverse.xml?rev=1391960&r1=1391959&r2=1391960&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-spring/src/test/resources/org/apache/camel/spring/contextscan/ContextScanOnExceptionAndDLCErrorHandlerReverse.xml (original)
+++ camel/branches/camel-2.10.x/components/camel-spring/src/test/resources/org/apache/camel/spring/contextscan/ContextScanOnExceptionAndDLCErrorHandlerReverse.xml Sun Sep 30 07:49:14 2012
@@ -1,6 +1,23 @@
<?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" xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
@@ -8,16 +25,9 @@
<context:component-scan base-package="org.apache.camel.spring.contextscan.reverseorder"/>
- <bean id="damn" class="java.lang.IllegalArgumentException">
- <constructor-arg index="0" value="Damn"/>
- </bean>
-
- <bean id="deadLetter" class="org.apache.camel.builder.DeadLetterChannelBuilder">
- <property name="deadLetterUri" value="mock:dead"/>
- </bean>
-
<camelContext xmlns="http://camel.apache.org/schema/spring" errorHandlerRef="deadLetter">
<contextScan/>
- </camelContext>
+ <errorHandler id="deadLetter" type="DeadLetterChannel" deadLetterUri="mock:dead"/>
+ </camelContext>
</beans>