Author: davsclaus
Date: Tue Jan 8 09:48:26 2013
New Revision: 1430193
URL: http://svn.apache.org/viewvc?rev=1430193&view=rev
Log:
CAMEL-5671: Added spring 3.1 profile test, and support for using that with
CamelTestSpringSupport class.
Added:
camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringTestSupportActiveProfileTest.java
- copied, changed from r1430150,
camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringActiveProfileTest.java
camel/trunk/tests/camel-itest-spring31/
camel/trunk/tests/camel-itest-spring31/pom.xml (with props)
camel/trunk/tests/camel-itest-spring31/src/
camel/trunk/tests/camel-itest-spring31/src/main/
camel/trunk/tests/camel-itest-spring31/src/main/resources/
camel/trunk/tests/camel-itest-spring31/src/main/resources/META-INF/
camel/trunk/tests/camel-itest-spring31/src/main/resources/META-INF/LICENSE.txt
(with props)
camel/trunk/tests/camel-itest-spring31/src/main/resources/META-INF/NOTICE.txt
(with props)
camel/trunk/tests/camel-itest-spring31/src/test/
camel/trunk/tests/camel-itest-spring31/src/test/java/
camel/trunk/tests/camel-itest-spring31/src/test/java/org/
camel/trunk/tests/camel-itest-spring31/src/test/java/org/apache/
camel/trunk/tests/camel-itest-spring31/src/test/java/org/apache/camel/
camel/trunk/tests/camel-itest-spring31/src/test/java/org/apache/camel/itest/
camel/trunk/tests/camel-itest-spring31/src/test/java/org/apache/camel/itest/spring31/
camel/trunk/tests/camel-itest-spring31/src/test/java/org/apache/camel/itest/spring31/JmsRouteTest.java
(with props)
camel/trunk/tests/camel-itest-spring31/src/test/resources/
camel/trunk/tests/camel-itest-spring31/src/test/resources/log4j.properties
(with props)
camel/trunk/tests/camel-itest-spring31/src/test/resources/org/
camel/trunk/tests/camel-itest-spring31/src/test/resources/org/apache/
camel/trunk/tests/camel-itest-spring31/src/test/resources/org/apache/camel/
camel/trunk/tests/camel-itest-spring31/src/test/resources/org/apache/camel/itest/
camel/trunk/tests/camel-itest-spring31/src/test/resources/org/apache/camel/itest/spring31/
camel/trunk/tests/camel-itest-spring31/src/test/resources/org/apache/camel/itest/spring31/JmsRouteTest.xml
(with props)
Modified:
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java
camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringActiveProfileTest.java
camel/trunk/tests/pom.xml
Modified:
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java?rev=1430193&r1=1430192&r2=1430193&view=diff
==============================================================================
---
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java
(original)
+++
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java
Tue Jan 8 09:48:26 2013
@@ -19,6 +19,7 @@ package org.apache.camel.test.junit4;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
+
import org.apache.camel.CamelContext;
import org.apache.camel.spring.CamelBeanPostProcessor;
import org.apache.camel.spring.SpringCamelContext;
@@ -70,13 +71,12 @@ public abstract class CamelSpringTestSup
if (isCreateCamelContextPerClass()) {
applicationContext = threadAppContext.get();
if (applicationContext == null) {
- applicationContext = createApplicationContext();
+ applicationContext = doCreateApplicationContext();
threadAppContext.set(applicationContext);
}
} else {
- applicationContext = createApplicationContext();
+ applicationContext = doCreateApplicationContext();
}
- assertNotNull("Should have created a valid spring context",
applicationContext);
SpringCamelContext.setNoStart(false);
}
} else {
@@ -84,6 +84,29 @@ public abstract class CamelSpringTestSup
}
}
+ private AbstractApplicationContext doCreateApplicationContext() {
+ AbstractApplicationContext context = createApplicationContext();
+ assertNotNull("Should have created a valid Spring application
context", context);
+
+ String[] profiles = activeProfiles();
+ if (profiles != null && profiles.length > 0) {
+ // the context must not be active
+ if (context.isActive()) {
+ throw new IllegalStateException("Cannot active profiles: " +
Arrays.asList(profiles) + " on active Spring application context: " + context
+ + ". The code in your createApplicationContext() method
should be adjusted to create the application context with refresh = false as
parameter");
+ }
+ log.info("Spring activating profiles: {}",
Arrays.asList(profiles));
+ context.getEnvironment().setActiveProfiles(profiles);
+ }
+
+ // ensure the context has been refreshed at least once
+ if (!context.isActive()) {
+ context.refresh();
+ }
+
+ return context;
+ }
+
@Override
@After
public void tearDown() throws Exception {
@@ -172,6 +195,23 @@ public abstract class CamelSpringTestSup
}
}
+ /**
+ * Which active profiles should be used.
+ * <p/>
+ * <b>Important:</b> When using active profiles, then the code in {@link
#createApplicationContext()} should create
+ * the Spring {@link AbstractApplicationContext} without refreshing. For
example creating an
+ * {@link
org.springframework.context.support.ClassPathXmlApplicationContext} you would
need to pass in
+ * <tt>false</tt> in the refresh parameter, in the constructor.
+ * Camel will thrown an {@link IllegalStateException} if this is not
correct stating this problem.
+ * The reason is that we cannot active profiles <b>after</b> a Spring
application context has already
+ * been refreshed, and is active.
+ *
+ * @return an array of active profiles to use, use <tt>null</tt> to not
use any active profiles.
+ */
+ protected String[] activeProfiles() {
+ return null;
+ }
+
@Override
protected CamelContext createCamelContext() throws Exception {
// don't start the springCamelContext if we
Modified:
camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringActiveProfileTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringActiveProfileTest.java?rev=1430193&r1=1430192&r2=1430193&view=diff
==============================================================================
---
camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringActiveProfileTest.java
(original)
+++
camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringActiveProfileTest.java
Tue Jan 8 09:48:26 2013
@@ -26,15 +26,24 @@ import org.springframework.beans.factory
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.ContextConfiguration;
-@ContextConfiguration
+// START SNIPPET: e1
+
+/**
+ * Spring style testing with annotations to configure and setup the test.
+ * <p/>
+ * As we do next extend any base test class, we need to inject our resources
+ * for testing such as the {@link CamelContext} and {@link ProducerTemplate}.
+ */
+@ContextConfiguration
@ActiveProfiles("test")
@RunWith(CamelSpringJUnit4ClassRunner.class)
public class CamelSpringActiveProfileTest {
+
@Autowired
protected CamelContext camelContext;
@Produce(uri = "direct:start", context = "camelContext")
protected ProducerTemplate start;
-
+
@Test
public void testLoadActiveProfile() throws InterruptedException {
MockEndpoint mock = camelContext.getEndpoint("mock:test",
MockEndpoint.class);
@@ -44,3 +53,4 @@ public class CamelSpringActiveProfileTes
}
}
+// END SNIPPET: e1
Copied:
camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringTestSupportActiveProfileTest.java
(from r1430150,
camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringActiveProfileTest.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringTestSupportActiveProfileTest.java?p2=camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringTestSupportActiveProfileTest.java&p1=camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringActiveProfileTest.java&r1=1430150&r2=1430193&rev=1430193&view=diff
==============================================================================
---
camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringActiveProfileTest.java
(original)
+++
camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringTestSupportActiveProfileTest.java
Tue Jan 8 09:48:26 2013
@@ -16,31 +16,35 @@
*/
package org.apache.camel.test.junit4;
-import org.apache.camel.CamelContext;
-import org.apache.camel.Produce;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.ContextConfiguration;
-
-@ContextConfiguration
-@ActiveProfiles("test")
-@RunWith(CamelSpringJUnit4ClassRunner.class)
-public class CamelSpringActiveProfileTest {
- @Autowired
- protected CamelContext camelContext;
- @Produce(uri = "direct:start", context = "camelContext")
- protected ProducerTemplate start;
-
+import org.springframework.context.support.AbstractApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+// START SNIPPET: e1
+
+/**
+ * Just extend the CamelSpringTestSupport and use Camel test kit for easy
Camel based unit testing.
+ */
+public class CamelSpringTestSupportActiveProfileTest extends
CamelSpringTestSupport {
+
+ @Override
+ protected AbstractApplicationContext createApplicationContext() {
+ // must not refresh when using active profiles
+ return new ClassPathXmlApplicationContext(new
String[]{"org/apache/camel/test/junit4/CamelSpringActiveProfileTest-context.xml"},
false);
+ }
+
+ @Override
+ protected String[] activeProfiles() {
+ // return the active profiles to be used
+ return new String[]{"test"};
+ }
+
@Test
public void testLoadActiveProfile() throws InterruptedException {
- MockEndpoint mock = camelContext.getEndpoint("mock:test",
MockEndpoint.class);
- mock.expectedBodiesReceived("Hello World");
- start.sendBody("World");
- mock.assertIsSatisfied();
+ getMockEndpoint("mock:test").expectedBodiesReceived("Hello World");
+ template.sendBody("direct:start", "World");
+ assertMockEndpointsSatisfied();
}
}
+// END SNIPPET: e1
Added: camel/trunk/tests/camel-itest-spring31/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-spring31/pom.xml?rev=1430193&view=auto
==============================================================================
--- camel/trunk/tests/camel-itest-spring31/pom.xml (added)
+++ camel/trunk/tests/camel-itest-spring31/pom.xml Tue Jan 8 09:48:26 2013
@@ -0,0 +1,81 @@
+<?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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>tests</artifactId>
+ <version>2.11-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>camel-itest-spring31</artifactId>
+ <name>Camel :: Integration Tests :: Spring 3.1</name>
+ <description>Integration Test against Spring 3.1</description>
+
+ <!-- force using spring 3.1.x -->
+ <properties>
+ <spring-version>${spring31-version}</spring-version>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-jms</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-camel</artifactId>
+ </dependency>
+
+ <!-- testing -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test-spring</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
Propchange: camel/trunk/tests/camel-itest-spring31/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/tests/camel-itest-spring31/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/tests/camel-itest-spring31/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
camel/trunk/tests/camel-itest-spring31/src/main/resources/META-INF/LICENSE.txt
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-spring31/src/main/resources/META-INF/LICENSE.txt?rev=1430193&view=auto
==============================================================================
---
camel/trunk/tests/camel-itest-spring31/src/main/resources/META-INF/LICENSE.txt
(added)
+++
camel/trunk/tests/camel-itest-spring31/src/main/resources/META-INF/LICENSE.txt
Tue Jan 8 09:48:26 2013
@@ -0,0 +1,203 @@
+
+ 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.
+
Propchange:
camel/trunk/tests/camel-itest-spring31/src/main/resources/META-INF/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/tests/camel-itest-spring31/src/main/resources/META-INF/LICENSE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
camel/trunk/tests/camel-itest-spring31/src/main/resources/META-INF/NOTICE.txt
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-spring31/src/main/resources/META-INF/NOTICE.txt?rev=1430193&view=auto
==============================================================================
---
camel/trunk/tests/camel-itest-spring31/src/main/resources/META-INF/NOTICE.txt
(added)
+++
camel/trunk/tests/camel-itest-spring31/src/main/resources/META-INF/NOTICE.txt
Tue Jan 8 09:48:26 2013
@@ -0,0 +1,11 @@
+ =========================================================================
+ == 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.
Propchange:
camel/trunk/tests/camel-itest-spring31/src/main/resources/META-INF/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/tests/camel-itest-spring31/src/main/resources/META-INF/NOTICE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
camel/trunk/tests/camel-itest-spring31/src/test/java/org/apache/camel/itest/spring31/JmsRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-spring31/src/test/java/org/apache/camel/itest/spring31/JmsRouteTest.java?rev=1430193&view=auto
==============================================================================
---
camel/trunk/tests/camel-itest-spring31/src/test/java/org/apache/camel/itest/spring31/JmsRouteTest.java
(added)
+++
camel/trunk/tests/camel-itest-spring31/src/test/java/org/apache/camel/itest/spring31/JmsRouteTest.java
Tue Jan 8 09:48:26 2013
@@ -0,0 +1,48 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.itest.spring31;
+
+import org.apache.camel.test.junit4.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/spring31/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();
+ }
+}
Propchange:
camel/trunk/tests/camel-itest-spring31/src/test/java/org/apache/camel/itest/spring31/JmsRouteTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/tests/camel-itest-spring31/src/test/java/org/apache/camel/itest/spring31/JmsRouteTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
camel/trunk/tests/camel-itest-spring31/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-spring31/src/test/resources/log4j.properties?rev=1430193&view=auto
==============================================================================
--- camel/trunk/tests/camel-itest-spring31/src/test/resources/log4j.properties
(added)
+++ camel/trunk/tests/camel-itest-spring31/src/test/resources/log4j.properties
Tue Jan 8 09:48:26 2013
@@ -0,0 +1,37 @@
+## ---------------------------------------------------------------------------
+## 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-spring31-test.log
+log4j.appender.out.append=true
+
Propchange:
camel/trunk/tests/camel-itest-spring31/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/tests/camel-itest-spring31/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
camel/trunk/tests/camel-itest-spring31/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
camel/trunk/tests/camel-itest-spring31/src/test/resources/org/apache/camel/itest/spring31/JmsRouteTest.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-spring31/src/test/resources/org/apache/camel/itest/spring31/JmsRouteTest.xml?rev=1430193&view=auto
==============================================================================
---
camel/trunk/tests/camel-itest-spring31/src/test/resources/org/apache/camel/itest/spring31/JmsRouteTest.xml
(added)
+++
camel/trunk/tests/camel-itest-spring31/src/test/resources/org/apache/camel/itest/spring31/JmsRouteTest.xml
Tue Jan 8 09:48:26 2013
@@ -0,0 +1,47 @@
+<?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>
Propchange:
camel/trunk/tests/camel-itest-spring31/src/test/resources/org/apache/camel/itest/spring31/JmsRouteTest.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/tests/camel-itest-spring31/src/test/resources/org/apache/camel/itest/spring31/JmsRouteTest.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
camel/trunk/tests/camel-itest-spring31/src/test/resources/org/apache/camel/itest/spring31/JmsRouteTest.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: camel/trunk/tests/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/pom.xml?rev=1430193&r1=1430192&r2=1430193&view=diff
==============================================================================
--- camel/trunk/tests/pom.xml (original)
+++ camel/trunk/tests/pom.xml Tue Jan 8 09:48:26 2013
@@ -37,6 +37,7 @@
<module>camel-itest</module>
<module>camel-itest-cdi</module>
<module>camel-itest-spring30</module>
+ <module>camel-itest-spring31</module>
<module>camel-blueprint-cxf-test</module>
<module>camel-partial-classpath-test</module>
<module>camel-typeconverterscan-test</module>
