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 <davscl...@apache.org> Authored: Wed Mar 23 10:33:00 2016 +0100 Committer: Claus Ibsen <davscl...@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>
