Author: ningjiang
Date: Tue Aug 23 08:54:54 2011
New Revision: 1160588
URL: http://svn.apache.org/viewvc?rev=1160588&view=rev
Log:
Merged revisions 1160547 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1160547 | ningjiang | 2011-08-23 12:54:59 +0800 (Tue, 23 Aug 2011) | 1 line
CAMEL-4368 Fixed the issue of the debug doesn't work in the
CamelSpringTestSupport
........
Added:
camel/branches/camel-2.8.x/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugSpringTest.java
- copied, changed from r1160547,
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugSpringTest.java
camel/branches/camel-2.8.x/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugSpringTest.java
- copied, changed from r1160547,
camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugSpringTest.java
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
camel/branches/camel-2.8.x/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java
camel/branches/camel-2.8.x/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 23 08:54:54 2011
@@ -1 +1 @@
-/camel/trunk:1155230,1156108,1156260,1156524,1157348,1157798,1157831,1157878,1158153,1159171,1159174,1159457,1159460,1159606,1159867
+/camel/trunk:1155230,1156108,1156260,1156524,1157348,1157798,1157831,1157878,1158153,1159171,1159174,1159457,1159460,1159606,1159867,1160547
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.8.x/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java?rev=1160588&r1=1160587&r2=1160588&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
(original)
+++
camel/branches/camel-2.8.x/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
Tue Aug 23 08:54:54 2011
@@ -65,7 +65,12 @@ public class SpringCamelContext extends
setApplicationContext(applicationContext);
}
+
public static SpringCamelContext springCamelContext(ApplicationContext
applicationContext) throws Exception {
+ return springCamelContext(applicationContext, true);
+ }
+
+ public static SpringCamelContext springCamelContext(ApplicationContext
applicationContext, boolean maybeStart) throws Exception {
// lets try and look up a configured camel context in the context
String[] names =
applicationContext.getBeanNamesForType(SpringCamelContext.class);
if (names.length == 1) {
@@ -73,7 +78,9 @@ public class SpringCamelContext extends
}
SpringCamelContext answer = new SpringCamelContext();
answer.setApplicationContext(applicationContext);
- answer.afterPropertiesSet();
+ if (maybeStart) {
+ answer.afterPropertiesSet();
+ }
return answer;
}
Modified:
camel/branches/camel-2.8.x/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java?rev=1160588&r1=1160587&r2=1160588&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java
(original)
+++
camel/branches/camel-2.8.x/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java
Tue Aug 23 08:54:54 2011
@@ -176,6 +176,7 @@ public abstract class CamelSpringTestSup
@Override
protected CamelContext createCamelContext() throws Exception {
- return SpringCamelContext.springCamelContext(applicationContext);
+ // don't start the springCamelContext if we
+ return SpringCamelContext.springCamelContext(applicationContext,
false);
}
}
Copied:
camel/branches/camel-2.8.x/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugSpringTest.java
(from r1160547,
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugSpringTest.java)
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugSpringTest.java?p2=camel/branches/camel-2.8.x/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugSpringTest.java&p1=camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugSpringTest.java&r1=1160547&r2=1160588&rev=1160588&view=diff
==============================================================================
---
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugSpringTest.java
(original)
+++
camel/branches/camel-2.8.x/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugSpringTest.java
Tue Aug 23 08:54:54 2011
@@ -27,12 +27,6 @@ import org.springframework.context.suppo
public class DebugSpringTest extends CamelSpringTestSupport {
private boolean debugged;
-
- @Override
- public boolean isUseDebugger() {
- // must enable debugger
- return true;
- }
@Override
protected void debugBefore(Exchange exchange, Processor processor,
Modified:
camel/branches/camel-2.8.x/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java?rev=1160588&r1=1160587&r2=1160588&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java
(original)
+++
camel/branches/camel-2.8.x/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java
Tue Aug 23 08:54:54 2011
@@ -167,6 +167,6 @@ public abstract class CamelSpringTestSup
@Override
protected CamelContext createCamelContext() throws Exception {
- return SpringCamelContext.springCamelContext(applicationContext);
+ return SpringCamelContext.springCamelContext(applicationContext,
false);
}
}
Copied:
camel/branches/camel-2.8.x/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugSpringTest.java
(from r1160547,
camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugSpringTest.java)
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugSpringTest.java?p2=camel/branches/camel-2.8.x/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugSpringTest.java&p1=camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugSpringTest.java&r1=1160547&r2=1160588&rev=1160588&view=diff
==============================================================================
---
camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugSpringTest.java
(original)
+++
camel/branches/camel-2.8.x/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugSpringTest.java
Tue Aug 23 08:54:54 2011
@@ -27,12 +27,6 @@ import org.springframework.context.suppo
public class DebugSpringTest extends CamelSpringTestSupport {
private boolean debugged;
-
- @Override
- public boolean isUseDebugger() {
- // must enable debugger
- return true;
- }
@Override
protected void debugBefore(Exchange exchange, Processor processor,
