You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/11/24 03:59:45 UTC
[1/3] camel git commit: CAMEL-8064 Fixed the issue of
MockEndpointsAndSkip annotation does not resolve property placeholders
Repository: camel
Updated Branches:
refs/heads/camel-2.13.x e9dded769 -> 62119f16d
refs/heads/camel-2.14.x 6687fafad -> a0c8a5969
CAMEL-8064 Fixed the issue of MockEndpointsAndSkip annotation does not resolve property placeholders
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b24552f3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b24552f3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b24552f3
Branch: refs/heads/camel-2.14.x
Commit: b24552f38a4ffc9a60d9ab1183cce4191ae617d3
Parents: 6687faf
Author: Willem Jiang <wi...@gmail.com>
Authored: Mon Nov 24 10:45:52 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Mon Nov 24 10:58:29 2014 +0800
----------------------------------------------------------------------
.../test/spring/CamelSpringDelegatingTestContextLoader.java | 6 ++++--
.../camel/test/spring/CamelSpringTestContextLoader.java | 7 ++++---
.../CamelSpringJUnit4ClassRunnerMockEndpointsAndSkipTest.java | 2 +-
.../spring/CamelSpringJUnit4ClassRunnerPlainTest-context.xml | 4 ++++
.../resources/org/apache/camel/test/spring/test.properties | 3 ++-
5 files changed, 15 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b24552f3/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringDelegatingTestContextLoader.java
----------------------------------------------------------------------
diff --git a/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringDelegatingTestContextLoader.java b/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringDelegatingTestContextLoader.java
index a3bb4a3..cea1656 100644
--- a/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringDelegatingTestContextLoader.java
+++ b/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringDelegatingTestContextLoader.java
@@ -268,8 +268,10 @@ public class CamelSpringDelegatingTestContextLoader extends DelegatingSmartConte
public void execute(String contextName, SpringCamelContext camelContext)
throws Exception {
- logger.info("Enabling auto mocking and skipping of endpoints matching pattern [{}] on CamelContext with name [{}].", mockEndpoints, contextName);
- camelContext.addRegisterEndpointCallback(new InterceptSendToMockEndpointStrategy(mockEndpoints, true));
+ // resovle the property place holders of the mockEndpoints
+ String mockEndpointsValue = camelContext.resolvePropertyPlaceholders(mockEndpoints);
+ logger.info("Enabling auto mocking and skipping of endpoints matching pattern [{}] on CamelContext with name [{}].", mockEndpointsValue, contextName);
+ camelContext.addRegisterEndpointCallback(new InterceptSendToMockEndpointStrategy(mockEndpointsValue, true));
}
});
}
http://git-wip-us.apache.org/repos/asf/camel/blob/b24552f3/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java
----------------------------------------------------------------------
diff --git a/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java b/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java
index e973b44..ad294e2 100644
--- a/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java
+++ b/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java
@@ -46,7 +46,6 @@ import org.springframework.test.context.support.AbstractContextLoader;
import org.springframework.test.context.support.AbstractGenericContextLoader;
import org.springframework.test.context.support.GenericXmlContextLoader;
import org.springframework.util.StringUtils;
-
import static org.apache.camel.test.spring.CamelSpringTestHelper.getAllMethods;
/**
@@ -397,8 +396,10 @@ public class CamelSpringTestContextLoader extends AbstractContextLoader {
@Override
public void execute(String contextName, SpringCamelContext camelContext)
throws Exception {
- LOG.info("Enabling auto mocking and skipping of endpoints matching pattern [{}] on CamelContext with name [{}].", mockEndpoints, contextName);
- camelContext.addRegisterEndpointCallback(new InterceptSendToMockEndpointStrategy(mockEndpoints, true));
+ // resovle the property place holders of the mockEndpoints
+ String mockEndpointsValue = camelContext.resolvePropertyPlaceholders(mockEndpoints);
+ LOG.info("Enabling auto mocking and skipping of endpoints matching pattern [{}] on CamelContext with name [{}].", mockEndpointsValue, contextName);
+ camelContext.addRegisterEndpointCallback(new InterceptSendToMockEndpointStrategy(mockEndpointsValue, true));
}
});
}
http://git-wip-us.apache.org/repos/asf/camel/blob/b24552f3/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerMockEndpointsAndSkipTest.java
----------------------------------------------------------------------
diff --git a/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerMockEndpointsAndSkipTest.java b/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerMockEndpointsAndSkipTest.java
index d20e72b..59191ad 100644
--- a/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerMockEndpointsAndSkipTest.java
+++ b/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerMockEndpointsAndSkipTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-@MockEndpointsAndSkip("seda:*")
+@MockEndpointsAndSkip("{{mock.skip}}")
public class CamelSpringJUnit4ClassRunnerMockEndpointsAndSkipTest
extends CamelSpringJUnit4ClassRunnerPlainTest {
http://git-wip-us.apache.org/repos/asf/camel/blob/b24552f3/components/camel-test-spring/src/test/resources/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerPlainTest-context.xml
----------------------------------------------------------------------
diff --git a/components/camel-test-spring/src/test/resources/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerPlainTest-context.xml b/components/camel-test-spring/src/test/resources/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerPlainTest-context.xml
index ee2e7ce..f6e171c 100644
--- a/components/camel-test-spring/src/test/resources/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerPlainTest-context.xml
+++ b/components/camel-test-spring/src/test/resources/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerPlainTest-context.xml
@@ -34,6 +34,10 @@
<to uri="mock:b"/>
</route>
</camelContext>
+
+ <bean id="bridgePropertyPlaceholder" class="org.apache.camel.spring.spi.BridgePropertyPlaceholderConfigurer">
+ <property name="location" value="classpath:org/apache/camel/test/spring/test.properties"/>
+ </bean>
<camelContext id="camelContext2" xmlns="http://camel.apache.org/schema/spring" trace="true" autoStartup="true">
<route>
http://git-wip-us.apache.org/repos/asf/camel/blob/b24552f3/components/camel-test-spring/src/test/resources/org/apache/camel/test/spring/test.properties
----------------------------------------------------------------------
diff --git a/components/camel-test-spring/src/test/resources/org/apache/camel/test/spring/test.properties b/components/camel-test-spring/src/test/resources/org/apache/camel/test/spring/test.properties
index f891086..6b0115e 100644
--- a/components/camel-test-spring/src/test/resources/org/apache/camel/test/spring/test.properties
+++ b/components/camel-test-spring/src/test/resources/org/apache/camel/test/spring/test.properties
@@ -15,4 +15,5 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-cool.end=mock:test
\ No newline at end of file
+cool.end=mock:test
+mock.skip=seda:*
\ No newline at end of file
[3/3] camel git commit: CAMEL-8064 Fixed the issue of
MockEndpointsAndSkip annotation does not resolve property placeholders
Posted by ni...@apache.org.
CAMEL-8064 Fixed the issue of MockEndpointsAndSkip annotation does not resolve property placeholders
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/62119f16
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/62119f16
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/62119f16
Branch: refs/heads/camel-2.13.x
Commit: 62119f16de730c2522618a05ce9ba3a1a9cfe765
Parents: e9dded7
Author: Willem Jiang <wi...@gmail.com>
Authored: Mon Nov 24 10:45:52 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Mon Nov 24 10:59:19 2014 +0800
----------------------------------------------------------------------
.../test/spring/CamelSpringDelegatingTestContextLoader.java | 6 ++++--
.../camel/test/spring/CamelSpringTestContextLoader.java | 7 ++++---
.../CamelSpringJUnit4ClassRunnerMockEndpointsAndSkipTest.java | 2 +-
.../spring/CamelSpringJUnit4ClassRunnerPlainTest-context.xml | 4 ++++
.../resources/org/apache/camel/test/spring/test.properties | 3 ++-
5 files changed, 15 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/62119f16/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringDelegatingTestContextLoader.java
----------------------------------------------------------------------
diff --git a/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringDelegatingTestContextLoader.java b/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringDelegatingTestContextLoader.java
index a3bb4a3..cea1656 100644
--- a/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringDelegatingTestContextLoader.java
+++ b/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringDelegatingTestContextLoader.java
@@ -268,8 +268,10 @@ public class CamelSpringDelegatingTestContextLoader extends DelegatingSmartConte
public void execute(String contextName, SpringCamelContext camelContext)
throws Exception {
- logger.info("Enabling auto mocking and skipping of endpoints matching pattern [{}] on CamelContext with name [{}].", mockEndpoints, contextName);
- camelContext.addRegisterEndpointCallback(new InterceptSendToMockEndpointStrategy(mockEndpoints, true));
+ // resovle the property place holders of the mockEndpoints
+ String mockEndpointsValue = camelContext.resolvePropertyPlaceholders(mockEndpoints);
+ logger.info("Enabling auto mocking and skipping of endpoints matching pattern [{}] on CamelContext with name [{}].", mockEndpointsValue, contextName);
+ camelContext.addRegisterEndpointCallback(new InterceptSendToMockEndpointStrategy(mockEndpointsValue, true));
}
});
}
http://git-wip-us.apache.org/repos/asf/camel/blob/62119f16/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java
----------------------------------------------------------------------
diff --git a/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java b/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java
index 18fa9c3..6bdb544 100644
--- a/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java
+++ b/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java
@@ -46,7 +46,6 @@ import org.springframework.test.context.support.AbstractContextLoader;
import org.springframework.test.context.support.AbstractGenericContextLoader;
import org.springframework.test.context.support.GenericXmlContextLoader;
import org.springframework.util.StringUtils;
-
import static org.apache.camel.test.spring.CamelSpringTestHelper.getAllMethods;
/**
@@ -383,8 +382,10 @@ public class CamelSpringTestContextLoader extends AbstractContextLoader {
@Override
public void execute(String contextName, SpringCamelContext camelContext)
throws Exception {
- LOG.info("Enabling auto mocking and skipping of endpoints matching pattern [{}] on CamelContext with name [{}].", mockEndpoints, contextName);
- camelContext.addRegisterEndpointCallback(new InterceptSendToMockEndpointStrategy(mockEndpoints, true));
+ // resovle the property place holders of the mockEndpoints
+ String mockEndpointsValue = camelContext.resolvePropertyPlaceholders(mockEndpoints);
+ LOG.info("Enabling auto mocking and skipping of endpoints matching pattern [{}] on CamelContext with name [{}].", mockEndpointsValue, contextName);
+ camelContext.addRegisterEndpointCallback(new InterceptSendToMockEndpointStrategy(mockEndpointsValue, true));
}
});
}
http://git-wip-us.apache.org/repos/asf/camel/blob/62119f16/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerMockEndpointsAndSkipTest.java
----------------------------------------------------------------------
diff --git a/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerMockEndpointsAndSkipTest.java b/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerMockEndpointsAndSkipTest.java
index ce57fbe..2481486 100644
--- a/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerMockEndpointsAndSkipTest.java
+++ b/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerMockEndpointsAndSkipTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-@MockEndpointsAndSkip("seda:*")
+@MockEndpointsAndSkip("{{mock.skip}}")
public class CamelSpringJUnit4ClassRunnerMockEndpointsAndSkipTest
extends CamelSpringJUnit4ClassRunnerPlainTest {
http://git-wip-us.apache.org/repos/asf/camel/blob/62119f16/components/camel-test-spring/src/test/resources/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerPlainTest-context.xml
----------------------------------------------------------------------
diff --git a/components/camel-test-spring/src/test/resources/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerPlainTest-context.xml b/components/camel-test-spring/src/test/resources/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerPlainTest-context.xml
index ee2e7ce..f6e171c 100644
--- a/components/camel-test-spring/src/test/resources/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerPlainTest-context.xml
+++ b/components/camel-test-spring/src/test/resources/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerPlainTest-context.xml
@@ -34,6 +34,10 @@
<to uri="mock:b"/>
</route>
</camelContext>
+
+ <bean id="bridgePropertyPlaceholder" class="org.apache.camel.spring.spi.BridgePropertyPlaceholderConfigurer">
+ <property name="location" value="classpath:org/apache/camel/test/spring/test.properties"/>
+ </bean>
<camelContext id="camelContext2" xmlns="http://camel.apache.org/schema/spring" trace="true" autoStartup="true">
<route>
http://git-wip-us.apache.org/repos/asf/camel/blob/62119f16/components/camel-test-spring/src/test/resources/org/apache/camel/test/spring/test.properties
----------------------------------------------------------------------
diff --git a/components/camel-test-spring/src/test/resources/org/apache/camel/test/spring/test.properties b/components/camel-test-spring/src/test/resources/org/apache/camel/test/spring/test.properties
index f891086..6b0115e 100644
--- a/components/camel-test-spring/src/test/resources/org/apache/camel/test/spring/test.properties
+++ b/components/camel-test-spring/src/test/resources/org/apache/camel/test/spring/test.properties
@@ -15,4 +15,5 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-cool.end=mock:test
\ No newline at end of file
+cool.end=mock:test
+mock.skip=seda:*
\ No newline at end of file
[2/3] camel git commit: CAMEL-8064 Merged the patch into
camel-test-spring3
Posted by ni...@apache.org.
CAMEL-8064 Merged the patch into camel-test-spring3
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a0c8a596
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a0c8a596
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a0c8a596
Branch: refs/heads/camel-2.14.x
Commit: a0c8a5969192864e1761cbcb16e41f6775a725cb
Parents: b24552f
Author: Willem Jiang <wi...@gmail.com>
Authored: Mon Nov 24 10:48:03 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Mon Nov 24 10:58:40 2014 +0800
----------------------------------------------------------------------
.../test/spring/CamelSpringDelegatingTestContextLoader.java | 6 ++++--
.../camel/test/spring/CamelSpringTestContextLoader.java | 7 ++++---
.../CamelSpringJUnit4ClassRunnerMockEndpointsAndSkipTest.java | 2 +-
.../spring/CamelSpringJUnit4ClassRunnerPlainTest-context.xml | 4 ++++
.../resources/org/apache/camel/test/spring/test.properties | 3 ++-
5 files changed, 15 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a0c8a596/components/camel-test-spring3/src/main/java/org/apache/camel/test/spring/CamelSpringDelegatingTestContextLoader.java
----------------------------------------------------------------------
diff --git a/components/camel-test-spring3/src/main/java/org/apache/camel/test/spring/CamelSpringDelegatingTestContextLoader.java b/components/camel-test-spring3/src/main/java/org/apache/camel/test/spring/CamelSpringDelegatingTestContextLoader.java
index a3bb4a3..cea1656 100644
--- a/components/camel-test-spring3/src/main/java/org/apache/camel/test/spring/CamelSpringDelegatingTestContextLoader.java
+++ b/components/camel-test-spring3/src/main/java/org/apache/camel/test/spring/CamelSpringDelegatingTestContextLoader.java
@@ -268,8 +268,10 @@ public class CamelSpringDelegatingTestContextLoader extends DelegatingSmartConte
public void execute(String contextName, SpringCamelContext camelContext)
throws Exception {
- logger.info("Enabling auto mocking and skipping of endpoints matching pattern [{}] on CamelContext with name [{}].", mockEndpoints, contextName);
- camelContext.addRegisterEndpointCallback(new InterceptSendToMockEndpointStrategy(mockEndpoints, true));
+ // resovle the property place holders of the mockEndpoints
+ String mockEndpointsValue = camelContext.resolvePropertyPlaceholders(mockEndpoints);
+ logger.info("Enabling auto mocking and skipping of endpoints matching pattern [{}] on CamelContext with name [{}].", mockEndpointsValue, contextName);
+ camelContext.addRegisterEndpointCallback(new InterceptSendToMockEndpointStrategy(mockEndpointsValue, true));
}
});
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a0c8a596/components/camel-test-spring3/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java
----------------------------------------------------------------------
diff --git a/components/camel-test-spring3/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java b/components/camel-test-spring3/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java
index e973b44..ad294e2 100644
--- a/components/camel-test-spring3/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java
+++ b/components/camel-test-spring3/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java
@@ -46,7 +46,6 @@ import org.springframework.test.context.support.AbstractContextLoader;
import org.springframework.test.context.support.AbstractGenericContextLoader;
import org.springframework.test.context.support.GenericXmlContextLoader;
import org.springframework.util.StringUtils;
-
import static org.apache.camel.test.spring.CamelSpringTestHelper.getAllMethods;
/**
@@ -397,8 +396,10 @@ public class CamelSpringTestContextLoader extends AbstractContextLoader {
@Override
public void execute(String contextName, SpringCamelContext camelContext)
throws Exception {
- LOG.info("Enabling auto mocking and skipping of endpoints matching pattern [{}] on CamelContext with name [{}].", mockEndpoints, contextName);
- camelContext.addRegisterEndpointCallback(new InterceptSendToMockEndpointStrategy(mockEndpoints, true));
+ // resovle the property place holders of the mockEndpoints
+ String mockEndpointsValue = camelContext.resolvePropertyPlaceholders(mockEndpoints);
+ LOG.info("Enabling auto mocking and skipping of endpoints matching pattern [{}] on CamelContext with name [{}].", mockEndpointsValue, contextName);
+ camelContext.addRegisterEndpointCallback(new InterceptSendToMockEndpointStrategy(mockEndpointsValue, true));
}
});
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a0c8a596/components/camel-test-spring3/src/test/java/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerMockEndpointsAndSkipTest.java
----------------------------------------------------------------------
diff --git a/components/camel-test-spring3/src/test/java/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerMockEndpointsAndSkipTest.java b/components/camel-test-spring3/src/test/java/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerMockEndpointsAndSkipTest.java
index d20e72b..59191ad 100644
--- a/components/camel-test-spring3/src/test/java/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerMockEndpointsAndSkipTest.java
+++ b/components/camel-test-spring3/src/test/java/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerMockEndpointsAndSkipTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-@MockEndpointsAndSkip("seda:*")
+@MockEndpointsAndSkip("{{mock.skip}}")
public class CamelSpringJUnit4ClassRunnerMockEndpointsAndSkipTest
extends CamelSpringJUnit4ClassRunnerPlainTest {
http://git-wip-us.apache.org/repos/asf/camel/blob/a0c8a596/components/camel-test-spring3/src/test/resources/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerPlainTest-context.xml
----------------------------------------------------------------------
diff --git a/components/camel-test-spring3/src/test/resources/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerPlainTest-context.xml b/components/camel-test-spring3/src/test/resources/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerPlainTest-context.xml
index ee2e7ce..f6e171c 100644
--- a/components/camel-test-spring3/src/test/resources/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerPlainTest-context.xml
+++ b/components/camel-test-spring3/src/test/resources/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerPlainTest-context.xml
@@ -34,6 +34,10 @@
<to uri="mock:b"/>
</route>
</camelContext>
+
+ <bean id="bridgePropertyPlaceholder" class="org.apache.camel.spring.spi.BridgePropertyPlaceholderConfigurer">
+ <property name="location" value="classpath:org/apache/camel/test/spring/test.properties"/>
+ </bean>
<camelContext id="camelContext2" xmlns="http://camel.apache.org/schema/spring" trace="true" autoStartup="true">
<route>
http://git-wip-us.apache.org/repos/asf/camel/blob/a0c8a596/components/camel-test-spring3/src/test/resources/org/apache/camel/test/spring/test.properties
----------------------------------------------------------------------
diff --git a/components/camel-test-spring3/src/test/resources/org/apache/camel/test/spring/test.properties b/components/camel-test-spring3/src/test/resources/org/apache/camel/test/spring/test.properties
index f891086..6b0115e 100644
--- a/components/camel-test-spring3/src/test/resources/org/apache/camel/test/spring/test.properties
+++ b/components/camel-test-spring3/src/test/resources/org/apache/camel/test/spring/test.properties
@@ -15,4 +15,5 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-cool.end=mock:test
\ No newline at end of file
+cool.end=mock:test
+mock.skip=seda:*
\ No newline at end of file