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 2016/03/23 11:42:44 UTC
[1/5] camel git commit: Update min mvn version
Repository: camel
Updated Branches:
refs/heads/master b13394c64 -> fa78b8636
Update min mvn version
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fa78b863
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fa78b863
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fa78b863
Branch: refs/heads/master
Commit: fa78b86369c8dde6c21bfc3ec65004e4fe5fc240
Parents: 3953524
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Mar 23 11:42:14 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Mar 23 11:42:32 2016 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/fa78b863/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7654aa8..c38f4f0 100755
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
<inceptionYear>2007</inceptionYear>
<prerequisites>
- <maven>3.1.1</maven>
+ <maven>3.2.5</maven>
</prerequisites>
<properties>
[2/5] camel git commit: CAMEL-9397: Removed camel-test-spring3 as
spring 3.x is not supported.
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/camel/blob/667af83f/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/TransactedFullExampleTest.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/TransactedFullExampleTest.xml b/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/TransactedFullExampleTest.xml
deleted file mode 100644
index 0f7775d..0000000
--- a/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/TransactedFullExampleTest.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
- ">
-
- <import resource="database-context.xml"/>
-
- <bean id="rethrowCaughtException" class="org.apache.camel.itest.ibatis.ExceptionRethrower"/>
-
- <camelContext xmlns="http://camel.apache.org/schema/spring">
- <route>
- <from uri="direct:start"/>
- <onException>
- <exception>java.lang.Exception</exception>
- <to uri="mock:error1"/>
- </onException>
-
- <to uri="mock:middle"/>
- <to uri="direct:transacted"/>
- </route>
-
- <route>
- <from uri="direct:transacted"/>
- <transacted/>
-
- <doTry>
- <to uri="ibatis:table.add?statementType=Insert"/>
- <to uri="mock:end"/>
- <doCatch>
- <exception>java.lang.Exception</exception>
- <to uri="mock:error2"/>
- <bean ref="rethrowCaughtException"/>
- </doCatch>
- </doTry>
-
- </route>
- </camelContext>
-
-</beans>
http://git-wip-us.apache.org/repos/asf/camel/blob/667af83f/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/TransactedOnCompletionTest.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/TransactedOnCompletionTest.xml b/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/TransactedOnCompletionTest.xml
deleted file mode 100644
index 9f5d687..0000000
--- a/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/TransactedOnCompletionTest.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
- ">
-
- <import resource="database-context.xml" />
-
- <camelContext xmlns="http://camel.apache.org/schema/spring">
- <route>
- <from uri="direct:start" />
- <onCompletion>
- <to uri="mock:after" />
- </onCompletion>
- <transacted />
- <to uri="ibatis:table.add?statementType=Insert" />
- <to uri="mock:end" />
- </route>
- </camelContext>
-
-</beans>
http://git-wip-us.apache.org/repos/asf/camel/blob/667af83f/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/TransactedOnExceptionTest.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/TransactedOnExceptionTest.xml b/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/TransactedOnExceptionTest.xml
deleted file mode 100644
index b3315b1..0000000
--- a/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/TransactedOnExceptionTest.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
- ">
-
- <import resource="database-context.xml" />
-
- <camelContext trace="true" xmlns="http://camel.apache.org/schema/spring">
- <route>
- <from uri="direct:start" />
-
- <onException>
- <exception>java.lang.Exception</exception>
- <handled><constant>false</constant></handled>
- <to uri="mock:error" />
- </onException>
-
- <transacted />
-
- <to uri="ibatis:table.add?statementType=Insert" />
- <to uri="mock:end" />
- </route>
- </camelContext>
-
-</beans>
http://git-wip-us.apache.org/repos/asf/camel/blob/667af83f/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/TransactedPipelineTest.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/TransactedPipelineTest.xml b/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/TransactedPipelineTest.xml
deleted file mode 100644
index c670612..0000000
--- a/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/TransactedPipelineTest.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
- ">
-
- <import resource="database-context.xml"/>
-
- <camelContext xmlns="http://camel.apache.org/schema/spring">
- <route>
- <from uri="direct:start"/>
- <transacted/>
- <to uri="ibatis:table.add?statementType=Insert"/>
- <to uri="mock:end"/>
- </route>
- </camelContext>
-
-</beans>
http://git-wip-us.apache.org/repos/asf/camel/blob/667af83f/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/TransactedTryCatchTest.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/TransactedTryCatchTest.xml b/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/TransactedTryCatchTest.xml
deleted file mode 100644
index 860915f..0000000
--- a/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/TransactedTryCatchTest.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?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.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
- ">
-
- <import resource="database-context.xml"/>
-
- <bean id="rethrowCaughtException" class="org.apache.camel.itest.ibatis.ExceptionRethrower"/>
-
- <camelContext xmlns="http://camel.apache.org/schema/spring">
- <route>
- <from uri="direct:start"/>
- <transacted/>
-
- <doTry>
- <to uri="ibatis:table.add?statementType=Insert"/>
- <to uri="mock:end"/>
-
- <doCatch>
- <exception>java.lang.Exception</exception>
-
- <to uri="mock:error"/>
- <bean ref="rethrowCaughtException"/>
- </doCatch>
- </doTry>
- </route>
- </camelContext>
-
-</beans>
http://git-wip-us.apache.org/repos/asf/camel/blob/667af83f/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/database-context.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/database-context.xml b/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/database-context.xml
deleted file mode 100644
index 0d3476b..0000000
--- a/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/database-context.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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:jdbc="http://www.springframework.org/schema/jdbc"
- xsi:schemaLocation="
- http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <jdbc:embedded-database id="dataSource" type="DERBY" />
-
- <bean id="sqlMapClient" class="org.springframework.orm.ibatis.SqlMapClientFactoryBean">
- <property name="configLocation" value="ibatis-config.xml"/>
- <property name="useTransactionAwareDataSource" value="true"/>
- <property name="dataSource" ref="dataSource"/>
- </bean>
-
- <bean id="sqlMap" class="org.springframework.orm.ibatis.SqlMapClientTemplate">
- <property name="sqlMapClient" ref="sqlMapClient"/>
- </bean>
-
- <bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
- <property name="dataSource" ref="dataSource"/>
- </bean>
-
- <bean id="table" class="org.apache.camel.itest.ibatis.DummyTableImpl">
- <property name="sqlMapClient" ref="sqlMapClient"/>
- </bean>
-</beans>
http://git-wip-us.apache.org/repos/asf/camel/blob/667af83f/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/spring32/JmsRouteTest.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/spring32/JmsRouteTest.xml b/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/spring32/JmsRouteTest.xml
deleted file mode 100644
index 6ee9a57..0000000
--- a/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/spring32/JmsRouteTest.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
- ">
-
- <camelContext xmlns="http://camel.apache.org/schema/spring">
- <route>
- <from uri="activemq:queue:foo"/>
- <to uri="activemq:queue:bar"/>
- </route>
- <route>
- <from uri="activemq:queue:bar"/>
- <to uri="mock:result"/>
- </route>
- </camelContext>
-
- <!-- setup the profile for testing -->
- <beans profile="test">
- <bean id="activemq" class="org.apache.activemq.camel.component.ActiveMQComponent">
- <property name="connectionFactory">
- <bean class="org.apache.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL" value="vm://localhost?broker.persistent=false&broker.useJmx=false"/>
- </bean>
- </property>
- </bean>
- </beans>
-
-</beans>
http://git-wip-us.apache.org/repos/asf/camel/blob/667af83f/tests/camel-itest-spring32/src/test/resources/table.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring32/src/test/resources/table.xml b/tests/camel-itest-spring32/src/test/resources/table.xml
deleted file mode 100644
index a62696e..0000000
--- a/tests/camel-itest-spring32/src/test/resources/table.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sqlMap PUBLIC "-//iBATIS.com//DTD SQL MAP 2.0//EN"
- "http://www.ibatis.com/dtd/sql-map-2.dtd">
-
-<sqlMap namespace="table">
- <update id="create">create table t (d int)</update>
- <select id="values" resultClass="java.lang.Integer">select d from t</select>
- <insert id="add" parameterClass="java.lang.Integer">insert into t(d) values(#value#)</insert>
- <insert id="addOne">insert into t(d) values(1)</insert>
- <update id="doNothing">update t set d=d</update>
- <delete id="clear">delete from t</delete>
- <update id="drop">drop table t</update>
-</sqlMap>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/667af83f/tests/camel-itest-spring32/src/test/resources/transactions.properties
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring32/src/test/resources/transactions.properties b/tests/camel-itest-spring32/src/test/resources/transactions.properties
deleted file mode 100644
index 50d98b3..0000000
--- a/tests/camel-itest-spring32/src/test/resources/transactions.properties
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-#
-# 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.
-#
-#
-############################################################
-
-com.atomikos.icatch.console_file_name = tm.out
-com.atomikos.icatch.console_file_count = 1
-com.atomikos.icatch.automatic_resource_registration = true
-com.atomikos.icatch.client_demarcation = false
-com.atomikos.icatch.threaded_2pc = true
-com.atomikos.icatch.serial_jta_transactions = true
-com.atomikos.icatch.log_base_dir = ./target/
-com.atomikos.icatch.console_log_level = WARN
-com.atomikos.icatch.max_actives = 50
-com.atomikos.icatch.checkpoint_interval = 500
-com.atomikos.icatch.enable_logging = true
-com.atomikos.icatch.output_dir = ./target/
-com.atomikos.icatch.log_base_name = tmlog
-com.atomikos.icatch.console_file_limit = -1
-com.atomikos.icatch.max_timeout = 300000
-com.atomikos.icatch.tm_unique_name = camel-itest
-java.naming.factory.initial = com.sun.jndi.rmi.registry.RegistryContextFactory
-java.naming.provider.url = rmi://localhost:1099
-com.atomikos.icatch.service = com.atomikos.icatch.standalone.UserTransactionServiceFactory
-com.atomikos.icatch.force_shutdown_on_vm_exit = false
-com.atomikos.icatch.default_jta_timeout = 10000
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/667af83f/tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/pom.xml b/tests/pom.xml
index b1f665d..f31b8b4 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -36,7 +36,6 @@
<module>camel-itest-standalone</module>
<module>camel-itest</module>
<module>camel-itest-cdi</module>
- <module>camel-itest-spring32</module>
<module>camel-itest-spring40</module>
<module>camel-blueprint-cxf-test</module>
<module>camel-partial-classpath-test</module>
[4/5] camel git commit: CAMEL-9747: Java 8 upgrade - Set source and
target to java 1.8
Posted by da...@apache.org.
CAMEL-9747: Java 8 upgrade - Set source and target to java 1.8
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/39535244
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/39535244
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/39535244
Branch: refs/heads/master
Commit: 39535244a55f4f03e93485250fef80ba224ecec1
Parents: 667af83
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Mar 23 11:40:32 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Mar 23 11:42:32 2016 +0100
----------------------------------------------------------------------
.../org/apache/camel/component/mock/MockEndpoint.java | 6 +++++-
.../apache/camel/builder/xml/XPathTransformTest.java | 4 ++--
.../org/apache/camel/impl/ConfigurationHelperTest.java | 12 ++++++------
.../org/apache/camel/component/hl7/HL7Converter.java | 3 ++-
.../component/ignite/TestIgniteComputeResources.java | 3 ++-
5 files changed, 17 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/39535244/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
index 929ccff..7be0ed1 100644
--- a/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
@@ -681,7 +681,11 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint {
}
if (actualValue instanceof Expression) {
- actualValue = ((Expression)actualValue).evaluate(exchange, expectedValue != null ? expectedValue.getClass() : Object.class);
+ Class clazz = Object.class;
+ if (expectedValue != null) {
+ clazz = expectedValue.getClass();
+ }
+ actualValue = ((Expression)actualValue).evaluate(exchange, clazz);
} else if (actualValue instanceof Predicate) {
actualValue = ((Predicate)actualValue).matches(exchange);
} else if (expectedValue != null) {
http://git-wip-us.apache.org/repos/asf/camel/blob/39535244/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTransformTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTransformTest.java b/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTransformTest.java
index b62ff74..f0d194a 100644
--- a/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTransformTest.java
+++ b/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTransformTest.java
@@ -62,7 +62,7 @@ public class XPathTransformTest extends ContextTestSupport {
expect(l.isInfoEnabled()).andReturn(true).anyTimes();
- l.info(contains("Namespaces discovered in message"), anyObject());
+ l.info(contains("Namespaces discovered in message"), anyObject(Object.class));
expectLastCall().times(1);
replay(l);
@@ -91,7 +91,7 @@ public class XPathTransformTest extends ContextTestSupport {
expect(l.isInfoEnabled()).andReturn(true).anyTimes();
Capture<String> captures = new Capture<String>(CaptureType.ALL);
- l.info(capture(captures), anyObject());
+ l.info(capture(captures), anyObject(Object.class));
expectLastCall().anyTimes();
replay(l);
http://git-wip-us.apache.org/repos/asf/camel/blob/39535244/camel-core/src/test/java/org/apache/camel/impl/ConfigurationHelperTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/impl/ConfigurationHelperTest.java b/camel-core/src/test/java/org/apache/camel/impl/ConfigurationHelperTest.java
index aeab0dc..e4b7737 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/ConfigurationHelperTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/ConfigurationHelperTest.java
@@ -71,7 +71,7 @@ public class ConfigurationHelperTest {
assertEquals("URNs don't set the authority field", null, cfg.getParameter(EndpointConfiguration.URI_AUTHORITY));
assertEquals("URNs don't set the userInfo field", null, cfg.getParameter(EndpointConfiguration.URI_USER_INFO));
assertEquals("URNs don't set the host field", null, cfg.getParameter(EndpointConfiguration.URI_HOST));
- assertEquals("URNs don't set the port field", -1, cfg.getParameter(EndpointConfiguration.URI_PORT));
+ assertEquals("URNs don't set the port field", Integer.valueOf(-1), cfg.getParameter(EndpointConfiguration.URI_PORT));
assertEquals("URNs don't set the path field", null, cfg.getParameter(EndpointConfiguration.URI_PATH));
assertEquals("URNs don't set the query field", null, cfg.getParameter(EndpointConfiguration.URI_QUERY));
assertEquals("URNs don't set the fragment field", null, cfg.getParameter(EndpointConfiguration.URI_FRAGMENT));
@@ -86,7 +86,7 @@ public class ConfigurationHelperTest {
assertEquals("URNs don't set the authority field", null, cfg.getParameter(EndpointConfiguration.URI_AUTHORITY));
assertEquals("URNs don't set the userInfo field", null, cfg.getParameter(EndpointConfiguration.URI_USER_INFO));
assertEquals("URNs don't set the host field", null, cfg.getParameter(EndpointConfiguration.URI_HOST));
- assertEquals("URNs don't set the port field", -1, cfg.getParameter(EndpointConfiguration.URI_PORT));
+ assertEquals("URNs don't set the port field", Integer.valueOf(-1), cfg.getParameter(EndpointConfiguration.URI_PORT));
assertEquals("URNs don't set the path field", null, cfg.getParameter(EndpointConfiguration.URI_PATH));
assertEquals("URNs don't set the query field", null, cfg.getParameter(EndpointConfiguration.URI_QUERY));
assertEquals("URNs don't set the fragment field", null, cfg.getParameter(EndpointConfiguration.URI_FRAGMENT));
@@ -101,7 +101,7 @@ public class ConfigurationHelperTest {
assertEquals("foo", cfg.getParameter(EndpointConfiguration.URI_AUTHORITY));
assertEquals(null, cfg.getParameter(EndpointConfiguration.URI_USER_INFO));
assertEquals("foo", cfg.getParameter(EndpointConfiguration.URI_HOST));
- assertEquals(-1, cfg.getParameter(EndpointConfiguration.URI_PORT));
+ assertEquals(Integer.valueOf(-1), cfg.getParameter(EndpointConfiguration.URI_PORT));
assertEquals("", cfg.getParameter(EndpointConfiguration.URI_PATH));
assertEquals(null, cfg.getParameter(EndpointConfiguration.URI_QUERY));
assertEquals(null, cfg.getParameter(EndpointConfiguration.URI_FRAGMENT));
@@ -116,7 +116,7 @@ public class ConfigurationHelperTest {
assertEquals("foo", cfg.getParameter(EndpointConfiguration.URI_AUTHORITY));
assertEquals(null, cfg.getParameter(EndpointConfiguration.URI_USER_INFO));
assertEquals("foo", cfg.getParameter(EndpointConfiguration.URI_HOST));
- assertEquals(-1, cfg.getParameter(EndpointConfiguration.URI_PORT));
+ assertEquals(Integer.valueOf(-1), cfg.getParameter(EndpointConfiguration.URI_PORT));
assertEquals("/bar#defrag", cfg.getParameter(EndpointConfiguration.URI_PATH));
assertEquals(null, cfg.getParameter(EndpointConfiguration.URI_QUERY));
assertEquals(null, cfg.getParameter(EndpointConfiguration.URI_FRAGMENT));
@@ -131,7 +131,7 @@ public class ConfigurationHelperTest {
assertEquals("hadrian@localhost:9001", cfg.getParameter(EndpointConfiguration.URI_AUTHORITY));
assertEquals("hadrian", cfg.getParameter(EndpointConfiguration.URI_USER_INFO));
assertEquals("localhost", cfg.getParameter(EndpointConfiguration.URI_HOST));
- assertEquals(9001, cfg.getParameter(EndpointConfiguration.URI_PORT));
+ assertEquals(Integer.valueOf(9001), cfg.getParameter(EndpointConfiguration.URI_PORT));
assertEquals("/context/path/", cfg.getParameter(EndpointConfiguration.URI_PATH));
assertEquals("bar=true&baz=2#none", cfg.getParameter(EndpointConfiguration.URI_QUERY));
assertEquals(null, cfg.getParameter(EndpointConfiguration.URI_FRAGMENT));
@@ -155,7 +155,7 @@ public class ConfigurationHelperTest {
assertNotNull(config);
assertTrue(config instanceof DummyConfiguration);
assertEquals("one", config.getParameter("first"));
- assertEquals(2, config.getParameter("second"));
+ assertEquals(Integer.valueOf(2), config.getParameter("second"));
}
protected static void logConfigurationObject(EndpointConfiguration config) {
http://git-wip-us.apache.org/repos/asf/camel/blob/39535244/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7Converter.java
----------------------------------------------------------------------
diff --git a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7Converter.java b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7Converter.java
index e8c98fb..1d96db0 100644
--- a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7Converter.java
+++ b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7Converter.java
@@ -21,6 +21,7 @@ import ca.uhn.hl7v2.HL7Exception;
import ca.uhn.hl7v2.HapiContext;
import ca.uhn.hl7v2.model.Message;
import ca.uhn.hl7v2.parser.Parser;
+import ca.uhn.hl7v2.validation.ValidationContext;
import ca.uhn.hl7v2.validation.impl.ValidationContextFactory;
import org.apache.camel.Converter;
@@ -30,7 +31,7 @@ import org.apache.camel.Converter;
@Converter
public final class HL7Converter {
- private static final HapiContext DEFAULT_CONTEXT = new DefaultHapiContext(ValidationContextFactory.noValidation());
+ private static final HapiContext DEFAULT_CONTEXT = new DefaultHapiContext((ValidationContext) ValidationContextFactory.noValidation());
private HL7Converter() {
// Helper class
http://git-wip-us.apache.org/repos/asf/camel/blob/39535244/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/TestIgniteComputeResources.java
----------------------------------------------------------------------
diff --git a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/TestIgniteComputeResources.java b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/TestIgniteComputeResources.java
index 7c31e16e..76a5a23 100644
--- a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/TestIgniteComputeResources.java
+++ b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/TestIgniteComputeResources.java
@@ -95,7 +95,8 @@ public final class TestIgniteComputeResources {
public String reduce(List<ComputeJobResult> results) throws IgniteException {
StringBuilder answer = new StringBuilder();
for (ComputeJobResult res : results) {
- answer.append(res.getData()).append(",");
+ Object data = res.getData();
+ answer.append(data).append(",");
}
answer.deleteCharAt(answer.length() - 1);
return answer.toString();
[3/5] camel git commit: CAMEL-9397: Removed camel-test-spring3 as
spring 3.x is not supported.
Posted by da...@apache.org.
CAMEL-9397: Removed camel-test-spring3 as spring 3.x is not supported.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/667af83f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/667af83f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/667af83f
Branch: refs/heads/master
Commit: 667af83fd00d71bc85ebc9c6b54bc8a4ec3e04cf
Parents: 90a6030
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Mar 23 10:33:00 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Mar 23 11:42:32 2016 +0100
----------------------------------------------------------------------
.../src/main/resources/META-INF/LICENSE.txt | 203 -------------------
.../src/main/resources/META-INF/NOTICE.txt | 11 -
.../camel/itest/async/MyAsyncComponent.java | 37 ----
.../camel/itest/async/MyAsyncEndpoint.java | 73 -------
.../camel/itest/async/MyAsyncProducer.java | 77 -------
.../ibatis/AsyncEndpointTransacted2Test.java | 96 ---------
.../ibatis/AsyncEndpointTransactedTest.java | 88 --------
.../apache/camel/itest/ibatis/DummyTable.java | 35 ----
.../camel/itest/ibatis/DummyTableImpl.java | 54 -----
.../camel/itest/ibatis/ExceptionRethrower.java | 30 ---
.../camel/itest/ibatis/LoggingPipelineTest.java | 95 ---------
.../ibatis/PartiallyTransactedPipelineTest.java | 99 ---------
...edExceptionClauseAfterTransactedTagTest.java | 99 ---------
.../itest/ibatis/TransactedFullExampleTest.java | 127 ------------
.../ibatis/TransactedOnCompletionTest.java | 99 ---------
.../itest/ibatis/TransactedOnExceptionTest.java | 99 ---------
.../itest/ibatis/TransactedPipelineTest.java | 94 ---------
.../itest/ibatis/TransactedTryCatchTest.java | 107 ----------
.../camel/itest/spring32/JmsRouteTest.java | 48 -----
.../src/test/resources/ibatis-config.xml | 8 -
.../src/test/resources/log4j.properties | 37 ----
.../ibatis/AsyncEndpointTransacted2Test.xml | 52 -----
.../ibatis/AsyncEndpointTransactedTest.xml | 41 ----
.../camel/itest/ibatis/LoggingPipelineTest.xml | 43 ----
.../ibatis/PartiallyTransactedPipelineTest.xml | 37 ----
...nsactedExceptionClauseAfterTransactedTag.xml | 46 -----
.../itest/ibatis/TransactedFullExampleTest.xml | 58 ------
.../itest/ibatis/TransactedOnCompletionTest.xml | 39 ----
.../itest/ibatis/TransactedOnExceptionTest.xml | 44 ----
.../itest/ibatis/TransactedPipelineTest.xml | 36 ----
.../itest/ibatis/TransactedTryCatchTest.xml | 48 -----
.../camel/itest/ibatis/database-context.xml | 44 ----
.../camel/itest/spring32/JmsRouteTest.xml | 47 -----
.../src/test/resources/table.xml | 13 --
.../src/test/resources/transactions.properties | 43 ----
tests/pom.xml | 1 -
36 files changed, 2208 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/667af83f/tests/camel-itest-spring32/src/main/resources/META-INF/LICENSE.txt
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring32/src/main/resources/META-INF/LICENSE.txt b/tests/camel-itest-spring32/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b127..0000000
--- a/tests/camel-itest-spring32/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
-
http://git-wip-us.apache.org/repos/asf/camel/blob/667af83f/tests/camel-itest-spring32/src/main/resources/META-INF/NOTICE.txt
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring32/src/main/resources/META-INF/NOTICE.txt b/tests/camel-itest-spring32/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf..0000000
--- a/tests/camel-itest-spring32/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
- =========================================================================
- == NOTICE file corresponding to the section 4 d of ==
- == the Apache License, Version 2.0, ==
- == in this case for the Apache Camel distribution. ==
- =========================================================================
-
- This product includes software developed by
- The Apache Software Foundation (http://www.apache.org/).
-
- Please read the different LICENSE files present in the licenses directory of
- this distribution.
http://git-wip-us.apache.org/repos/asf/camel/blob/667af83f/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/async/MyAsyncComponent.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/async/MyAsyncComponent.java b/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/async/MyAsyncComponent.java
deleted file mode 100644
index 22f1c74..0000000
--- a/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/async/MyAsyncComponent.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * 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.itest.async;
-
-import java.util.Map;
-
-import org.apache.camel.Endpoint;
-import org.apache.camel.impl.DefaultComponent;
-
-/**
- * @version
- */
-public class MyAsyncComponent extends DefaultComponent {
-
- @Override
- protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
- MyAsyncEndpoint answer = new MyAsyncEndpoint(uri, this);
- answer.setReply(remaining);
- setProperties(answer, parameters);
- return answer;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/667af83f/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/async/MyAsyncEndpoint.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/async/MyAsyncEndpoint.java b/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/async/MyAsyncEndpoint.java
deleted file mode 100644
index 65d0b03..0000000
--- a/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/async/MyAsyncEndpoint.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * 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.itest.async;
-
-import org.apache.camel.Component;
-import org.apache.camel.Consumer;
-import org.apache.camel.Processor;
-import org.apache.camel.Producer;
-import org.apache.camel.impl.DefaultEndpoint;
-
-/**
- * @version
- */
-public class MyAsyncEndpoint extends DefaultEndpoint {
-
- private String reply;
- private long delay = 1000;
- private int failFirstAttempts;
-
- public MyAsyncEndpoint(String endpointUri, Component component) {
- super(endpointUri, component);
- }
-
- public Producer createProducer() throws Exception {
- return new MyAsyncProducer(this);
- }
-
- public Consumer createConsumer(Processor processor) throws Exception {
- throw new UnsupportedOperationException("Consumer not supported");
- }
-
- public boolean isSingleton() {
- return false;
- }
-
- public String getReply() {
- return reply;
- }
-
- public void setReply(String reply) {
- this.reply = reply;
- }
-
- public long getDelay() {
- return delay;
- }
-
- public void setDelay(long delay) {
- this.delay = delay;
- }
-
- public int getFailFirstAttempts() {
- return failFirstAttempts;
- }
-
- public void setFailFirstAttempts(int failFirstAttempts) {
- this.failFirstAttempts = failFirstAttempts;
- }
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/667af83f/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/async/MyAsyncProducer.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/async/MyAsyncProducer.java b/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/async/MyAsyncProducer.java
deleted file mode 100644
index b6884c8..0000000
--- a/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/async/MyAsyncProducer.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * 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.itest.async;
-
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.apache.camel.AsyncCallback;
-import org.apache.camel.CamelExchangeException;
-import org.apache.camel.Exchange;
-import org.apache.camel.impl.DefaultAsyncProducer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @version
- */
-public class MyAsyncProducer extends DefaultAsyncProducer {
-
- private static final Logger LOG = LoggerFactory.getLogger(MyAsyncProducer.class);
- private final ExecutorService executor = Executors.newCachedThreadPool();
- private final AtomicInteger counter = new AtomicInteger();
-
- public MyAsyncProducer(MyAsyncEndpoint endpoint) {
- super(endpoint);
- }
-
- public MyAsyncEndpoint getEndpoint() {
- return (MyAsyncEndpoint) super.getEndpoint();
- }
-
- public boolean process(final Exchange exchange, final AsyncCallback callback) {
- executor.submit(new Callable<Object>() {
- public Object call() throws Exception {
- LOG.info("Simulating a task which takes " + getEndpoint().getDelay() + " millis to reply");
- Thread.sleep(getEndpoint().getDelay());
-
- int count = counter.incrementAndGet();
- if (getEndpoint().getFailFirstAttempts() >= count) {
- LOG.info("Simulating a failure at attempt " + count);
- exchange.setException(new CamelExchangeException("Simulated error at attempt " + count, exchange));
- } else {
- String reply = getEndpoint().getReply();
- exchange.getOut().setBody(reply);
- // propagate headers
- exchange.getOut().setHeaders(exchange.getIn().getHeaders());
- LOG.info("Setting reply " + reply);
- }
-
- LOG.info("Callback done(false)");
- callback.done(false);
- return null;
- }
- });
-
- // indicate from this point forward its being routed asynchronously
- LOG.info("Task submitted, now tell Camel routing engine to that this Exchange is being continued asynchronously");
- return false;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/667af83f/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/AsyncEndpointTransacted2Test.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/AsyncEndpointTransacted2Test.java b/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/AsyncEndpointTransacted2Test.java
deleted file mode 100644
index 92c20b0..0000000
--- a/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/AsyncEndpointTransacted2Test.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * 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.itest.ibatis;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.apache.camel.CamelExecutionException;
-import org.apache.camel.EndpointInject;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-/**
- * @version
- */
-public class AsyncEndpointTransacted2Test extends CamelSpringTestSupport {
- @EndpointInject(uri = "direct:start")
- ProducerTemplate producer;
-
- private DummyTable table;
-
- @EndpointInject(uri = "mock:end")
- private MockEndpoint end;
-
- @Override
- protected AbstractXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/itest/ibatis/AsyncEndpointTransacted2Test.xml");
- }
-
- @Before
- public void createTable() {
- table = context.getRegistry().lookupByNameAndType("table", DummyTable.class);
- table.create();
- }
-
- @After
- public void dropTable() {
- table.drop();
- }
-
- @Test
- public void testAsyncEndpointOK() throws InterruptedException {
- end.expectedBodiesReceived("Bye Camel");
-
- producer.sendBody(3);
-
- Collection<Integer> values = table.values();
- assertEquals(2, values.size());
-
- Iterator<Integer> it = values.iterator();
- assertEquals(Integer.valueOf(3), it.next());
- assertEquals(Integer.valueOf(4), it.next());
-
- end.assertIsSatisfied();
- }
-
- @Test
- public void testAsyncEndpointRollback() {
- end.whenAnyExchangeReceived(new Processor() {
- public void process(Exchange exchange) throws Exception {
- throw new IllegalArgumentException("Damn");
- }
- });
-
- try {
- producer.sendBody(3);
- fail("Should have thrown exception");
- } catch (CamelExecutionException e) {
- assertIsInstanceOf(IllegalArgumentException.class, e.getCause().getCause());
- assertEquals(0, table.values().size());
- }
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/667af83f/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/AsyncEndpointTransactedTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/AsyncEndpointTransactedTest.java b/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/AsyncEndpointTransactedTest.java
deleted file mode 100644
index 33eb529..0000000
--- a/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/AsyncEndpointTransactedTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- * 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.itest.ibatis;
-
-import org.apache.camel.CamelExecutionException;
-import org.apache.camel.EndpointInject;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-/**
- * @version
- */
-public class AsyncEndpointTransactedTest extends CamelSpringTestSupport {
- @EndpointInject(uri = "direct:start")
- ProducerTemplate producer;
-
- private DummyTable table;
-
- @EndpointInject(uri = "mock:end")
- private MockEndpoint end;
-
- @Override
- protected AbstractXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/itest/ibatis/AsyncEndpointTransactedTest.xml");
- }
-
- @Before
- public void createTable() {
- table = context.getRegistry().lookupByNameAndType("table", DummyTable.class);
- table.create();
- }
-
- @After
- public void dropTable() {
- table.drop();
- }
-
- @Test
- public void testAsyncEndpointOK() throws InterruptedException {
- end.expectedBodiesReceived("Bye Camel");
-
- producer.sendBody(3);
- assertEquals(1, table.values().size());
- assertEquals(3, (int) table.iterator().next());
-
- end.assertIsSatisfied();
- }
-
- @Test
- public void testAsyncEndpointRollback() {
- end.whenAnyExchangeReceived(new Processor() {
- public void process(Exchange exchange) throws Exception {
- throw new IllegalArgumentException("Damn");
- }
- });
-
- try {
- producer.sendBody(3);
- fail("Should have thrown exception");
- } catch (CamelExecutionException e) {
- assertIsInstanceOf(IllegalArgumentException.class, e.getCause().getCause());
- assertEquals(0, table.values().size());
- }
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/667af83f/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/DummyTable.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/DummyTable.java b/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/DummyTable.java
deleted file mode 100644
index 9e9e062..0000000
--- a/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/DummyTable.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * 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.itest.ibatis;
-
-import java.util.Collection;
-
-/**
- * @version
- */
-public interface DummyTable extends Iterable<Integer> {
-
- void create();
-
- void add(int value);
-
- void clear();
-
- void drop();
-
- Collection<Integer> values();
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/667af83f/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/DummyTableImpl.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/DummyTableImpl.java b/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/DummyTableImpl.java
deleted file mode 100644
index 7467281..0000000
--- a/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/DummyTableImpl.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * 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.itest.ibatis;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.springframework.orm.ibatis.support.SqlMapClientDaoSupport;
-
-/**
- * @version
- */
-public class DummyTableImpl extends SqlMapClientDaoSupport implements DummyTable {
-
- public void add(int value) {
- getSqlMapClientTemplate().insert("table.add", value);
- }
-
- public void create() {
- getSqlMapClientTemplate().update("table.create");
- }
-
- public void clear() {
- getSqlMapClientTemplate().delete("table.clear");
- }
-
- public void drop() {
- getSqlMapClientTemplate().update("table.drop");
- }
-
- public Iterator<Integer> iterator() {
- return values().iterator();
- }
-
- @SuppressWarnings("unchecked")
- public Collection<Integer> values() {
- return getSqlMapClientTemplate().queryForList("table.values");
- }
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/667af83f/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/ExceptionRethrower.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/ExceptionRethrower.java b/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/ExceptionRethrower.java
deleted file mode 100644
index 033d774..0000000
--- a/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/ExceptionRethrower.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * 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.itest.ibatis;
-
-import org.apache.camel.ExchangeException;
-
-/**
- * @version
- */
-public class ExceptionRethrower {
-
- public void rethrowCaughtException(@ExchangeException Exception exception) throws Exception {
- throw exception;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/667af83f/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/LoggingPipelineTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/LoggingPipelineTest.java b/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/LoggingPipelineTest.java
deleted file mode 100644
index e0e84ac..0000000
--- a/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/LoggingPipelineTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * 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.itest.ibatis;
-
-import org.apache.camel.CamelExecutionException;
-import org.apache.camel.EndpointInject;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-/**
- * @version
- */
-public class LoggingPipelineTest extends CamelSpringTestSupport {
-
- private static class MyException extends Exception {
- private static final long serialVersionUID = -221148660533176643L;
-
- public MyException() {
- super("my exception");
- }
- }
-
- DummyTable table;
-
- @EndpointInject(uri = "direct:start")
- ProducerTemplate producer;
-
- @EndpointInject(uri = "mock:end")
- private MockEndpoint end;
-
- @EndpointInject(uri = "mock:error")
- private MockEndpoint error;
-
- @Override
- protected AbstractXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/itest/ibatis/LoggingPipelineTest.xml");
- }
-
- @Before
- public void createTable() {
- table = context.getRegistry().lookupByNameAndType("table", DummyTable.class);
- table.create();
- }
-
- @After
- public void dropTable() {
- table.drop();
- }
-
- @Test
- public void pipelineCompletes() {
- end.expectedMessageCount(1);
- producer.sendBody(3);
- }
-
- @Test
- public void pipelineAborts() {
- end.expectedMessageCount(1);
- end.whenAnyExchangeReceived(new Processor() {
- public void process(Exchange exchange) throws Exception {
- throw new MyException();
- }
- });
- error.expectedMessageCount(1);
- try {
- producer.sendBody(3);
- assertFalse(true);
- } catch (CamelExecutionException e) {
- assertEquals(MyException.class, e.getCause().getClass());
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/667af83f/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/PartiallyTransactedPipelineTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/PartiallyTransactedPipelineTest.java b/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/PartiallyTransactedPipelineTest.java
deleted file mode 100644
index bf4fbc8..0000000
--- a/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/PartiallyTransactedPipelineTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * 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.itest.ibatis;
-
-import org.apache.camel.CamelExecutionException;
-import org.apache.camel.EndpointInject;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-/**
- * @version
- */
-public class PartiallyTransactedPipelineTest extends CamelSpringTestSupport {
-
- private static class MyException extends Exception {
- private static final long serialVersionUID = -221148660533176643L;
-
- public MyException() {
- super("my exception");
- }
- }
-
- DummyTable table;
-
- @EndpointInject(uri = "direct:start")
- ProducerTemplate producer;
-
- @EndpointInject(uri = "mock:middle")
- private MockEndpoint middle;
-
- @EndpointInject(uri = "mock:end")
- private MockEndpoint end;
-
- @Override
- protected AbstractXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/itest/ibatis/PartiallyTransactedPipelineTest.xml");
- }
-
- @Before
- public void createTable() {
- table = context.getRegistry().lookupByNameAndType("table", DummyTable.class);
- table.create();
- }
-
- @After
- public void dropTable() {
- table.drop();
- }
-
- @Test
- public void pipelineCompletes() {
- middle.expectedMessageCount(1);
- end.expectedMessageCount(1);
- producer.sendBody(3);
- assertEquals(1, table.values().size());
- assertEquals(3, (int) table.iterator().next());
- }
-
- @Test
- public void pipelineAborts() {
- middle.expectedMessageCount(1);
- end.expectedMessageCount(1);
- end.whenAnyExchangeReceived(new Processor() {
- public void process(Exchange exchange) throws Exception {
- throw new MyException();
- }
- });
- try {
- producer.sendBody(3);
- assertFalse(true);
- } catch (CamelExecutionException e) {
- assertEquals(MyException.class, e.getCause().getCause().getClass());
- assertEquals(0, table.values().size());
- }
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/667af83f/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/TransactedExceptionClauseAfterTransactedTagTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/TransactedExceptionClauseAfterTransactedTagTest.java b/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/TransactedExceptionClauseAfterTransactedTagTest.java
deleted file mode 100644
index c82904c..0000000
--- a/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/TransactedExceptionClauseAfterTransactedTagTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * 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.itest.ibatis;
-
-import org.apache.camel.CamelExecutionException;
-import org.apache.camel.EndpointInject;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-/**
- * @version
- */
-public class TransactedExceptionClauseAfterTransactedTagTest extends CamelSpringTestSupport {
-
- private static class MyException extends Exception {
- private static final long serialVersionUID = -221148660533176643L;
-
- public MyException() {
- super("my exception");
- }
- }
-
- DummyTable table;
-
- @EndpointInject(uri = "direct:start")
- ProducerTemplate producer;
-
- @EndpointInject(uri = "mock:end")
- private MockEndpoint end;
-
- @EndpointInject(uri = "mock:error")
- private MockEndpoint error;
-
- @Override
- protected AbstractXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/itest/ibatis/TransactedExceptionClauseAfterTransactedTag.xml");
- }
-
- @Before
- public void createTable() {
- table = context.getRegistry().lookupByNameAndType("table", DummyTable.class);
- table.create();
- }
-
- @After
- public void dropTable() {
- table.drop();
- }
-
- @Test
- public void pipelineCompletes() {
- end.expectedMessageCount(1);
- error.expectedMessageCount(0);
- producer.sendBody(3);
- assertEquals(1, table.values().size());
- assertEquals(3, (int) table.iterator().next());
- }
-
- @Test
- public void pipelineAborts() {
- end.expectedMessageCount(1);
- end.whenAnyExchangeReceived(new Processor() {
- public void process(Exchange exchange) throws Exception {
- throw new MyException();
- }
- });
- error.expectedMessageCount(1);
- try {
- producer.sendBody(3);
- assertFalse(true);
- } catch (CamelExecutionException e) {
- assertEquals(MyException.class, e.getCause().getCause().getClass());
- assertEquals(0, table.values().size());
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/667af83f/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/TransactedFullExampleTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/TransactedFullExampleTest.java b/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/TransactedFullExampleTest.java
deleted file mode 100644
index f51ce1e..0000000
--- a/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/TransactedFullExampleTest.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**
- * 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.itest.ibatis;
-
-import org.apache.camel.CamelExecutionException;
-import org.apache.camel.EndpointInject;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-/**
- * @version
- */
-public class TransactedFullExampleTest extends CamelSpringTestSupport {
-
- private static class MyException extends Exception {
- private static final long serialVersionUID = -221148660533176643L;
-
- public MyException() {
- super("my exception");
- }
- }
-
- DummyTable table;
-
- @EndpointInject(uri = "direct:start")
- ProducerTemplate producer;
-
- @EndpointInject(uri = "mock:middle")
- private MockEndpoint middle;
-
- @EndpointInject(uri = "mock:end")
- private MockEndpoint end;
-
- @EndpointInject(uri = "mock:error1")
- private MockEndpoint error1;
-
- @EndpointInject(uri = "mock:error2")
- private MockEndpoint error2;
-
- @Override
- protected AbstractXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/itest/ibatis/TransactedFullExampleTest.xml");
- }
-
- @Before
- public void createTable() {
- table = context.getRegistry().lookupByNameAndType("table", DummyTable.class);
- table.create();
- }
-
- @After
- public void dropTable() {
- table.drop();
- }
-
- @Test
- public void pipelineCompletes() {
- middle.expectedMessageCount(1);
- end.expectedMessageCount(1);
- error1.expectedMessageCount(0);
- error2.expectedMessageCount(0);
- producer.sendBody(3);
- assertEquals(1, table.values().size());
- assertEquals(3, (int) table.iterator().next());
- }
-
- @Test
- public void pipelineAbortsInMiddle() {
- middle.expectedMessageCount(1);
- middle.whenAnyExchangeReceived(new Processor() {
- public void process(Exchange exchange) throws Exception {
- throw new MyException();
- }
- });
- error1.expectedMessageCount(1);
-
- try {
- producer.sendBody(3);
- assertFalse(true);
- } catch (Exception e) {
- // ignore
- }
- }
-
- @Test
- public void pipelineAbortsAtEnd() {
- middle.expectedMessageCount(1);
- end.expectedMessageCount(1);
- end.whenAnyExchangeReceived(new Processor() {
- public void process(Exchange exchange) throws Exception {
- throw new MyException();
- }
- });
- error2.expectedMessageCount(1);
-
- try {
- producer.sendBody(3);
- assertFalse(true);
- } catch (CamelExecutionException e) {
- assertEquals(MyException.class, e.getCause().getCause().getClass());
- assertEquals(0, table.values().size());
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/667af83f/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/TransactedOnCompletionTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/TransactedOnCompletionTest.java b/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/TransactedOnCompletionTest.java
deleted file mode 100644
index ee6b792..0000000
--- a/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/TransactedOnCompletionTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * 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.itest.ibatis;
-
-import org.apache.camel.CamelExecutionException;
-import org.apache.camel.EndpointInject;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-/**
- * @version
- */
-public class TransactedOnCompletionTest extends CamelSpringTestSupport {
-
- private static class MyException extends Exception {
- private static final long serialVersionUID = -221148660533176643L;
-
- public MyException() {
- super("my exception");
- }
- }
-
- DummyTable table;
-
- @EndpointInject(uri = "direct:start")
- ProducerTemplate producer;
-
- @EndpointInject(uri = "mock:end")
- private MockEndpoint end;
-
- @EndpointInject(uri = "mock:after")
- private MockEndpoint after;
-
- @Override
- protected AbstractXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/itest/ibatis/TransactedOnCompletionTest.xml");
- }
-
- @Before
- public void createTable() {
- table = context.getRegistry().lookupByNameAndType("table", DummyTable.class);
- table.create();
- }
-
- @After
- public void dropTable() {
- table.drop();
- }
-
- @Test
- public void pipelineCompletes() {
- end.expectedMessageCount(1);
- after.expectedMessageCount(1);
- producer.sendBody(3);
- assertEquals(1, table.values().size());
- assertEquals(3, (int) table.iterator().next());
- }
-
- @Test
- public void pipelineAborts() {
- end.expectedMessageCount(1);
- end.whenAnyExchangeReceived(new Processor() {
- public void process(Exchange exchange) throws Exception {
- throw new MyException();
- }
- });
- after.expectedMessageCount(1);
- try {
- producer.sendBody(3);
- assertFalse(true);
- } catch (CamelExecutionException e) {
- assertEquals(MyException.class, e.getCause().getCause().getClass());
- assertEquals(0, table.values().size());
- }
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/667af83f/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/TransactedOnExceptionTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/TransactedOnExceptionTest.java b/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/TransactedOnExceptionTest.java
deleted file mode 100644
index 650699d..0000000
--- a/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/TransactedOnExceptionTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * 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.itest.ibatis;
-
-import org.apache.camel.CamelExecutionException;
-import org.apache.camel.EndpointInject;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-/**
- * @version
- */
-public class TransactedOnExceptionTest extends CamelSpringTestSupport {
-
- private static class MyException extends Exception {
- private static final long serialVersionUID = -221148660533176643L;
-
- public MyException() {
- super("my exception");
- }
- }
-
- DummyTable table;
-
- @EndpointInject(uri = "direct:start")
- ProducerTemplate producer;
-
- @EndpointInject(uri = "mock:end")
- private MockEndpoint end;
-
- @EndpointInject(uri = "mock:error")
- private MockEndpoint error;
-
- @Override
- protected AbstractXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/itest/ibatis/TransactedOnExceptionTest.xml");
- }
-
- @Before
- public void createTable() {
- table = context.getRegistry().lookupByNameAndType("table", DummyTable.class);
- table.create();
- }
-
- @After
- public void dropTable() {
- table.drop();
- }
-
- @Test
- public void pipelineCompletes() {
- end.expectedMessageCount(1);
- error.expectedMessageCount(0);
- producer.sendBody(3);
- assertEquals(1, table.values().size());
- assertEquals(3, (int) table.iterator().next());
- }
-
- @Test
- public void pipelineAborts() {
- end.expectedMessageCount(1);
- end.whenAnyExchangeReceived(new Processor() {
- public void process(Exchange exchange) throws Exception {
- throw new MyException();
- }
- });
- error.expectedMessageCount(1);
- try {
- producer.sendBody(3);
- assertFalse(true);
- } catch (CamelExecutionException e) {
- assertEquals(MyException.class, e.getCause().getCause().getClass());
- assertEquals(0, table.values().size());
- }
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/667af83f/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/TransactedPipelineTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/TransactedPipelineTest.java b/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/TransactedPipelineTest.java
deleted file mode 100644
index dccaa9d..0000000
--- a/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/TransactedPipelineTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * 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.itest.ibatis;
-
-import org.apache.camel.CamelExecutionException;
-import org.apache.camel.EndpointInject;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-/**
- * @version
- */
-public class TransactedPipelineTest extends CamelSpringTestSupport {
-
- private static class MyException extends Exception {
- private static final long serialVersionUID = -221148660533176643L;
-
- public MyException() {
- super("my exception");
- }
- }
-
- DummyTable table;
-
- @EndpointInject(uri = "direct:start")
- ProducerTemplate producer;
-
- @EndpointInject(uri = "mock:end")
- private MockEndpoint end;
-
- @Override
- protected AbstractXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/itest/ibatis/TransactedPipelineTest.xml");
- }
-
- @Before
- public void createTable() {
- table = context.getRegistry().lookupByNameAndType("table", DummyTable.class);
- table.create();
- }
-
- @After
- public void dropTable() {
- table.drop();
- }
-
- @Test
- public void pipelineCompletes() {
- end.expectedMessageCount(1);
- producer.sendBody(3);
- assertEquals(1, table.values().size());
- assertEquals(3, (int) table.iterator().next());
- }
-
- @Test
- public void pipelineAborts() {
- end.expectedMessageCount(1);
- end.whenAnyExchangeReceived(new Processor() {
- public void process(Exchange exchange) throws Exception {
- throw new MyException();
- }
- });
- try {
- producer.sendBody(3);
- assertFalse(true);
- } catch (CamelExecutionException e) {
- assertEquals(MyException.class, e.getCause().getCause().getClass());
- assertEquals(0, table.values().size());
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/667af83f/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/TransactedTryCatchTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/TransactedTryCatchTest.java b/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/TransactedTryCatchTest.java
deleted file mode 100644
index ed27a48..0000000
--- a/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/ibatis/TransactedTryCatchTest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- * 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.itest.ibatis;
-
-import org.apache.camel.CamelExecutionException;
-import org.apache.camel.EndpointInject;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-/**
- * @version
- */
-public class TransactedTryCatchTest extends CamelSpringTestSupport {
-
- private static class MyException extends Exception {
- private static final long serialVersionUID = -221148660533176643L;
-
- public MyException() {
- super("my exception");
- }
- }
-
- DummyTable table;
-
- @EndpointInject(uri = "direct:start")
- ProducerTemplate producer;
-
- @EndpointInject(uri = "mock:end")
- private MockEndpoint end;
-
- @EndpointInject(uri = "mock:error")
- private MockEndpoint error;
-
- @Override
- protected AbstractXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/itest/ibatis/TransactedTryCatchTest.xml");
- }
-
- @Before
- public void createTable() {
- table = context.getRegistry().lookupByNameAndType("table", DummyTable.class);
- table.create();
- }
-
- @After
- public void dropTable() {
- table.drop();
- }
-
- @Test
- public void pipelineCompletes() {
- end.expectedMessageCount(1);
- error.expectedMessageCount(0);
- producer.sendBody(3);
- assertEquals(1, table.values().size());
- assertEquals(3, (int) table.iterator().next());
- }
-
- @Test
- public void pipelineAbortsLate() {
- end.expectedMessageCount(1);
- end.whenAnyExchangeReceived(new Processor() {
- public void process(Exchange exchange) throws Exception {
- throw new MyException();
- }
- });
- error.expectedMessageCount(1);
- error.whenAnyExchangeReceived(new Processor() {
- public void process(Exchange exchange) throws Exception {
- log.info("{}", exchange);
- }
- });
- try {
- producer.sendBody(3);
- assertFalse(true); // Should throw an exception
- } catch (CamelExecutionException e) {
- assertEquals(MyException.class, e.getCause().getCause().getClass());
- } catch (Exception e) {
- assertFalse(true); // Should throw a CamelExecutionException
- } finally {
- assertEquals(0, table.values().size());
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/667af83f/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/spring32/JmsRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/spring32/JmsRouteTest.java b/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/spring32/JmsRouteTest.java
deleted file mode 100644
index 38d5db1..0000000
--- a/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/spring32/JmsRouteTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * 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.itest.spring32;
-
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
-import org.springframework.context.support.AbstractApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-/**
- *
- */
-public class JmsRouteTest extends CamelSpringTestSupport {
-
- @Override
- protected AbstractApplicationContext createApplicationContext() {
- // must create application context with refrehs = false when using active profiles
- return new ClassPathXmlApplicationContext(new String[]{"org/apache/camel/itest/spring32/JmsRouteTest.xml"}, false);
- }
-
- @Override
- protected String[] activeProfiles() {
- return new String[]{"test"};
- }
-
- @Test
- public void testJmsRoute() throws Exception {
- getMockEndpoint("mock:result").expectedMessageCount(1);
-
- template.sendBody("activemq:queue:foo", "Hello World");
-
- assertMockEndpointsSatisfied();
- }
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/667af83f/tests/camel-itest-spring32/src/test/resources/ibatis-config.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring32/src/test/resources/ibatis-config.xml b/tests/camel-itest-spring32/src/test/resources/ibatis-config.xml
deleted file mode 100644
index fe9c872..0000000
--- a/tests/camel-itest-spring32/src/test/resources/ibatis-config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sqlMapConfig PUBLIC "-//iBATIS.com//DTD SQL MAP Config 2.0//EN"
- "http://www.ibatis.com/dtd/sql-map-config-2.dtd">
-
-<sqlMapConfig>
- <settings useStatementNamespaces="true" />
- <sqlMap resource="table.xml" />
-</sqlMapConfig>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/667af83f/tests/camel-itest-spring32/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring32/src/test/resources/log4j.properties b/tests/camel-itest-spring32/src/test/resources/log4j.properties
deleted file mode 100644
index a12c55d..0000000
--- a/tests/camel-itest-spring32/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-## ---------------------------------------------------------------------------
-## 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.
-## ---------------------------------------------------------------------------
-
-#
-# The logging properties used
-#
-log4j.rootLogger=INFO, out
-
-#log4j.logger.org.apache.activemq.spring=WARN
-
-# CONSOLE appender not used by default
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-#log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %-10.10X{camel.exchangeId} - %-10.10X{camel.messageId} - %m%n
-
-# File appender
-log4j.appender.out=org.apache.log4j.FileAppender
-log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-log4j.appender.out.file=target/camel-itest-spring32-test.log
-log4j.appender.out.append=true
-
http://git-wip-us.apache.org/repos/asf/camel/blob/667af83f/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/AsyncEndpointTransacted2Test.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/AsyncEndpointTransacted2Test.xml b/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/AsyncEndpointTransacted2Test.xml
deleted file mode 100644
index 1fc27d9..0000000
--- a/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/AsyncEndpointTransacted2Test.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?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.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
- ">
-
- <import resource="database-context.xml"/>
-
- <bean id="async" class="org.apache.camel.itest.async.MyAsyncComponent"/>
-
- <camelContext xmlns="http://camel.apache.org/schema/spring">
- <route>
- <from uri="direct:start"/>
- <transacted/>
- <to uri="log:ibatis3"/>
- <to uri="ibatis:table.add?statementType=Insert"/>
- <to uri="direct:foo"/>
- <to uri="async:Bye Camel"/>
- <to uri="log:end"/>
- <to uri="mock:end"/>
- </route>
-
- <route>
- <from uri="direct:foo"/>
- <transacted/>
- <to uri="async:Hi Camel"/>
- <setBody><constant>4</constant></setBody>
- <convertBodyTo type="int"/>
- <to uri="log:ibatis4"/>
- <to uri="ibatis:table.add?statementType=Insert"/>
- </route>
- </camelContext>
-
-</beans>
http://git-wip-us.apache.org/repos/asf/camel/blob/667af83f/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/AsyncEndpointTransactedTest.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/AsyncEndpointTransactedTest.xml b/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/AsyncEndpointTransactedTest.xml
deleted file mode 100644
index a3c8caf..0000000
--- a/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/AsyncEndpointTransactedTest.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
- ">
-
- <import resource="database-context.xml"/>
-
- <bean id="async" class="org.apache.camel.itest.async.MyAsyncComponent"/>
-
- <camelContext xmlns="http://camel.apache.org/schema/spring">
- <route>
- <from uri="direct:start"/>
- <transacted/>
- <to uri="ibatis:table.add?statementType=Insert"/>
- <to uri="log:before"/>
- <to uri="async:Bye Camel"/>
- <to uri="log:after"/>
- <to uri="mock:end"/>
- </route>
- </camelContext>
-
-</beans>
http://git-wip-us.apache.org/repos/asf/camel/blob/667af83f/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/LoggingPipelineTest.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/LoggingPipelineTest.xml b/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/LoggingPipelineTest.xml
deleted file mode 100644
index b466ae8..0000000
--- a/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/LoggingPipelineTest.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
- ">
-
- <import resource="database-context.xml"/>
-
- <camelContext xmlns="http://camel.apache.org/schema/spring">
- <route>
- <from uri="direct:start"/>
-
- <onException>
- <exception>java.lang.Exception</exception>
- <handled>
- <constant>false</constant>
- </handled>
- <to uri="mock:error"/>
- </onException>
-
- <to uri="mock:end"/>
- </route>
- </camelContext>
-
-</beans>
http://git-wip-us.apache.org/repos/asf/camel/blob/667af83f/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/PartiallyTransactedPipelineTest.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/PartiallyTransactedPipelineTest.xml b/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/PartiallyTransactedPipelineTest.xml
deleted file mode 100644
index b169388..0000000
--- a/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/PartiallyTransactedPipelineTest.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
- ">
-
- <import resource="database-context.xml"/>
-
- <camelContext xmlns="http://camel.apache.org/schema/spring">
- <route>
- <from uri="direct:start" />
- <to uri="mock:middle" />
- <transacted />
- <to uri="ibatis:table.add?statementType=Insert" />
- <to uri="mock:end" />
- </route>
- </camelContext>
-
-</beans>
http://git-wip-us.apache.org/repos/asf/camel/blob/667af83f/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/TransactedExceptionClauseAfterTransactedTag.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/TransactedExceptionClauseAfterTransactedTag.xml b/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/TransactedExceptionClauseAfterTransactedTag.xml
deleted file mode 100644
index 0265118..0000000
--- a/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/ibatis/TransactedExceptionClauseAfterTransactedTag.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
- ">
-
- <import resource="database-context.xml"/>
-
- <camelContext xmlns="http://camel.apache.org/schema/spring">
- <route>
- <from uri="direct:start"/>
-
- <transacted/>
-
- <onException>
- <exception>java.lang.Exception</exception>
- <handled>
- <constant>false</constant>
- </handled>
- <to uri="mock:error"/>
- </onException>
-
- <to uri="ibatis:table.add?statementType=Insert"/>
- <to uri="mock:end"/>
- </route>
- </camelContext>
-
-</beans>
[5/5] camel git commit: CAMEL-9747: Java 8 upgrade - Set source and
target to java 1.8
Posted by da...@apache.org.
CAMEL-9747: Java 8 upgrade - Set source and target to java 1.8
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/90a60302
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/90a60302
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/90a60302
Branch: refs/heads/master
Commit: 90a603026d5aa7d38b6df633cfdcd0b732513d1b
Parents: b13394c6
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Mar 23 10:32:32 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Mar 23 11:42:32 2016 +0100
----------------------------------------------------------------------
components/camel-avro/pom.xml | 2 +-
components/camel-pdf/pom.xml | 2 +-
components/camel-rabbitmq/pom.xml | 2 +-
components/camel-scr/pom.xml | 2 +-
components/camel-slack/pom.xml | 2 +-
components/camel-spring-boot-starter/pom.xml | 2 +-
examples/camel-example-spring-boot-starter/pom.xml | 2 +-
pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 4 ++--
.../resources/archetype-resources/__artifactId__-api/pom.xml | 2 +-
.../archetype-resources/__artifactId__-component/pom.xml | 4 ++--
.../src/main/resources/archetype-resources/pom.xml | 4 ++--
.../src/main/resources/archetype-resources/pom.xml | 4 ++--
.../src/main/resources/archetype-resources/pom.xml | 4 ++--
.../src/main/resources/archetype-resources/pom.xml | 4 ++--
.../src/main/resources/archetype-resources/pom.xml | 4 ++--
.../src/main/resources/archetype-resources/pom.xml | 4 ++--
.../src/main/resources/archetype-resources/pom.xml | 4 ++--
.../src/main/resources/archetype-resources/pom.xml | 4 ++--
.../src/main/resources/archetype-resources/pom.xml | 4 ++--
.../src/main/resources/archetype-resources/pom.xml | 4 ++--
tooling/archetypes/camel-archetype-scr/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 4 ++--
.../src/main/resources/archetype-resources/pom.xml | 4 ++--
.../src/main/resources/archetype-resources/pom.xml | 4 ++--
.../src/main/resources/archetype-resources/pom.xml | 4 ++--
26 files changed, 42 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/90a60302/components/camel-avro/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-avro/pom.xml b/components/camel-avro/pom.xml
index a287239..537352b 100644
--- a/components/camel-avro/pom.xml
+++ b/components/camel-avro/pom.xml
@@ -147,4 +147,4 @@
</dependencies>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/90a60302/components/camel-pdf/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-pdf/pom.xml b/components/camel-pdf/pom.xml
index b888c5a..d2b3c55 100644
--- a/components/camel-pdf/pom.xml
+++ b/components/camel-pdf/pom.xml
@@ -96,4 +96,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/90a60302/components/camel-rabbitmq/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-rabbitmq/pom.xml b/components/camel-rabbitmq/pom.xml
index 8d584f2..04f1212 100644
--- a/components/camel-rabbitmq/pom.xml
+++ b/components/camel-rabbitmq/pom.xml
@@ -104,4 +104,4 @@
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/90a60302/components/camel-scr/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-scr/pom.xml b/components/camel-scr/pom.xml
index f0e7561..d46710b 100644
--- a/components/camel-scr/pom.xml
+++ b/components/camel-scr/pom.xml
@@ -81,4 +81,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/90a60302/components/camel-slack/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-slack/pom.xml b/components/camel-slack/pom.xml
index 2bd7da9..939d001 100644
--- a/components/camel-slack/pom.xml
+++ b/components/camel-slack/pom.xml
@@ -69,4 +69,4 @@ limitations under the License.
</dependencies>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/90a60302/components/camel-spring-boot-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-boot-starter/pom.xml b/components/camel-spring-boot-starter/pom.xml
index 65ab3c2..2c71e43 100644
--- a/components/camel-spring-boot-starter/pom.xml
+++ b/components/camel-spring-boot-starter/pom.xml
@@ -43,4 +43,4 @@
</dependencies>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/90a60302/examples/camel-example-spring-boot-starter/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-boot-starter/pom.xml b/examples/camel-example-spring-boot-starter/pom.xml
index aa631da..0601c5f 100644
--- a/examples/camel-example-spring-boot-starter/pom.xml
+++ b/examples/camel-example-spring-boot-starter/pom.xml
@@ -95,4 +95,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/90a60302/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4e2d858..7654aa8 100755
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<site-repo-url>scpexe://people.apache.org/www/camel.apache.org/maven/</site-repo-url>
- <jdk.version>1.7</jdk.version>
+ <jdk.version>1.8</jdk.version>
<compiler.fork>false</compiler.fork>
<maven-compiler-plugin-version>3.5.1</maven-compiler-plugin-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/90a60302/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml
index 989137f..1b691b3 100644
--- a/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml
+++ b/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml
@@ -128,8 +128,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin-version}</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/camel/blob/90a60302/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-api/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-api/pom.xml b/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-api/pom.xml
index 25491a3..593928f 100644
--- a/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-api/pom.xml
+++ b/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-api/pom.xml
@@ -52,7 +52,7 @@
</goals>
<configuration>
<attach>true</attach>
- <source>1.7</source>
+ <source>1.8</source>
<quiet>true</quiet>
<detectOfflineLinks>false</detectOfflineLinks>
<javadocVersion>1.7</javadocVersion>
http://git-wip-us.apache.org/repos/asf/camel/blob/90a60302/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml b/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
index 1ee1d01..a552eeb 100644
--- a/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
+++ b/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
@@ -113,8 +113,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin-version}</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/camel/blob/90a60302/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/pom.xml
index 739bb37..4803a68 100644
--- a/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/pom.xml
+++ b/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/pom.xml
@@ -40,8 +40,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin-version}</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/camel/blob/90a60302/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
index c193558..55ab8cf 100644
--- a/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
+++ b/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
@@ -86,8 +86,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin-version}</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/camel/blob/90a60302/tooling/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/pom.xml
index 9980f61..3820aae 100644
--- a/tooling/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/pom.xml
+++ b/tooling/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/pom.xml
@@ -83,8 +83,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin-version}</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/camel/blob/90a60302/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
index 702210a..cb57110 100644
--- a/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
+++ b/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
@@ -84,8 +84,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin-version}</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/camel/blob/90a60302/tooling/archetypes/camel-archetype-cxf-code-first-blueprint/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/camel-archetype-cxf-code-first-blueprint/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-cxf-code-first-blueprint/src/main/resources/archetype-resources/pom.xml
index abed905..f85a8dc 100644
--- a/tooling/archetypes/camel-archetype-cxf-code-first-blueprint/src/main/resources/archetype-resources/pom.xml
+++ b/tooling/archetypes/camel-archetype-cxf-code-first-blueprint/src/main/resources/archetype-resources/pom.xml
@@ -60,8 +60,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin-version}</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/camel/blob/90a60302/tooling/archetypes/camel-archetype-cxf-contract-first-blueprint/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/camel-archetype-cxf-contract-first-blueprint/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-cxf-contract-first-blueprint/src/main/resources/archetype-resources/pom.xml
index dfb9996..924e214 100644
--- a/tooling/archetypes/camel-archetype-cxf-contract-first-blueprint/src/main/resources/archetype-resources/pom.xml
+++ b/tooling/archetypes/camel-archetype-cxf-contract-first-blueprint/src/main/resources/archetype-resources/pom.xml
@@ -88,8 +88,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin-version}</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/camel/blob/90a60302/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml
index 505f695..2fea3f5 100644
--- a/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml
+++ b/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml
@@ -77,8 +77,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin-version}</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/camel/blob/90a60302/tooling/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml
index 96aa803..6b53a53 100644
--- a/tooling/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml
+++ b/tooling/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml
@@ -94,8 +94,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin-version}</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
<compilerId>groovy-eclipse-compiler</compilerId>
<!-- set verbose to be true if you want lots of uninteresting messages -->
<!-- <verbose>true</verbose> -->
http://git-wip-us.apache.org/repos/asf/camel/blob/90a60302/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml
index 007542e..9f3ec61 100644
--- a/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml
+++ b/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml
@@ -74,8 +74,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin-version}</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/camel/blob/90a60302/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
index 4d1bff6..98e759b 100644
--- a/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
+++ b/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
@@ -95,8 +95,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin-version}</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/camel/blob/90a60302/tooling/archetypes/camel-archetype-scr/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/camel-archetype-scr/pom.xml b/tooling/archetypes/camel-archetype-scr/pom.xml
index ee50b3e..13ee2b9 100644
--- a/tooling/archetypes/camel-archetype-scr/pom.xml
+++ b/tooling/archetypes/camel-archetype-scr/pom.xml
@@ -75,4 +75,4 @@
</pluginManagement>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/90a60302/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml
index 78f4019..a2e5310 100644
--- a/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml
+++ b/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml
@@ -72,8 +72,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin-version}</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/camel/blob/90a60302/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml
index eac4c64..56cdf48 100644
--- a/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml
+++ b/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml
@@ -79,8 +79,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin-version}</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/camel/blob/90a60302/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml
index d35d3d9..026a9c8 100644
--- a/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml
+++ b/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml
@@ -80,8 +80,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin-version}</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/camel/blob/90a60302/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml
index d9ff59d..0ba1e8c 100644
--- a/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml
+++ b/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml
@@ -95,8 +95,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin-version}</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
<plugin>