camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject git commit: CAMEL-7165: Drop support for spring 3.1
Date Tue, 04 Feb 2014 11:14:43 GMT
Updated Branches:
  refs/heads/master bb8d2f4cc -> c2c08b4e4


CAMEL-7165: Drop support for spring 3.1


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c2c08b4e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c2c08b4e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c2c08b4e

Branch: refs/heads/master
Commit: c2c08b4e4f846babc2015071687e10a87bcc8dd4
Parents: bb8d2f4
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Tue Feb 4 12:15:45 2014 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Tue Feb 4 12:15:45 2014 +0100

----------------------------------------------------------------------
 .../camel/itest/spring31/JmsRouteTest.java      | 48 --------------------
 .../camel/itest/spring31/JmsRouteTest.xml       | 47 -------------------
 2 files changed, 95 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/c2c08b4e/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/spring31/JmsRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/spring31/JmsRouteTest.java
b/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/spring31/JmsRouteTest.java
deleted file mode 100644
index 5fab3de..0000000
--- a/tests/camel-itest-spring32/src/test/java/org/apache/camel/itest/spring31/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.spring31;
-
-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/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();
-    }
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/c2c08b4e/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/spring31/JmsRouteTest.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/spring31/JmsRouteTest.xml
b/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/spring31/JmsRouteTest.xml
deleted file mode 100644
index 6ee9a57..0000000
--- a/tests/camel-itest-spring32/src/test/resources/org/apache/camel/itest/spring31/JmsRouteTest.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-			 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-			 xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-       http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
-    ">
-
-  <camelContext xmlns="http://camel.apache.org/schema/spring">
- 		<route>
- 			<from uri="activemq:queue:foo"/>
- 			<to uri="activemq:queue:bar"/>
- 		</route>
- 		<route>
- 			<from uri="activemq:queue:bar"/>
- 			<to uri="mock:result"/>
- 		</route>
- 	</camelContext>
-
-  <!-- setup the profile for testing -->
-  <beans profile="test">
-    <bean id="activemq" class="org.apache.activemq.camel.component.ActiveMQComponent">
-   		<property name="connectionFactory">
-   			<bean class="org.apache.activemq.ActiveMQConnectionFactory">
-   				<property name="brokerURL" value="vm://localhost?broker.persistent=false&amp;broker.useJmx=false"/>
-   			</bean>
-   		</property>
-   	</bean>
-  </beans>
-
-</beans>


Mime
View raw message