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:45 UTC
[2/5] camel git commit: CAMEL-9397: Removed camel-test-spring3 as
spring 3.x is not supported.
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>