svn commit: r1208321 - in /camel/branches/camel-2.8.x: ./ examples/camel-example-spring-jms/src/test/java/org/apache/camel/example/

[ningjiang]

Author: ningjiang
Date: Wed Nov 30 08:33:50 2011
New Revision: 1208321

URL: http://svn.apache.org/viewvc?rev=1208321&view=rev
Log:
Merged revisions 1208301 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1208301 | ningjiang | 2011-11-30 14:53:02 +0800 (Wed, 30 Nov 2011) | 1 line
  
  enhance the camel-example-spring-jms to run the test without start the server
........

Modified:
    camel/branches/camel-2.8.x/   (props changed)
    
camel/branches/camel-2.8.x/examples/camel-example-spring-jms/src/test/java/org/apache/camel/example/SpringJmsAOPClientServerTest.java
    
camel/branches/camel-2.8.x/examples/camel-example-spring-jms/src/test/java/org/apache/camel/example/SpringJmsClientServerTest.java

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 30 08:33:50 2011
@@ -1 +1 @@
-/camel/trunk:1202148,1202167,1202204-1202206,1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743,1207784
+/camel/trunk:1202148,1202167,1202204-1202206,1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743,1207784,1208301

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.8.x/examples/camel-example-spring-jms/src/test/java/org/apache/camel/example/SpringJmsAOPClientServerTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/examples/camel-example-spring-jms/src/test/java/org/apache/camel/example/SpringJmsAOPClientServerTest.java?rev=1208321&r1=1208320&r2=1208321&view=diff
==============================================================================
--- 
camel/branches/camel-2.8.x/examples/camel-example-spring-jms/src/test/java/org/apache/camel/example/SpringJmsAOPClientServerTest.java
 (original)
+++ 
camel/branches/camel-2.8.x/examples/camel-example-spring-jms/src/test/java/org/apache/camel/example/SpringJmsAOPClientServerTest.java
 Wed Nov 30 08:33:50 2011
@@ -23,7 +23,11 @@ public class SpringJmsAOPClientServerTes
     
     @BeforeClass
     public static void setUpServer() {
-        serverContext = new 
ClassPathXmlApplicationContext("/META-INF/spring/camel-server-aop.xml");
+        if 
(!"true".equalsIgnoreCase(System.getProperty("skipStartingCamelContext"))) {
+            serverContext = new 
ClassPathXmlApplicationContext("/META-INF/spring/camel-server-aop.xml");
+        } else {
+            System.out.println("Skipping starting CamelContext as system 
property skipStartingCamelContext is set to be true.");
+        }
     }
 
 }

Modified: 
camel/branches/camel-2.8.x/examples/camel-example-spring-jms/src/test/java/org/apache/camel/example/SpringJmsClientServerTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/examples/camel-example-spring-jms/src/test/java/org/apache/camel/example/SpringJmsClientServerTest.java?rev=1208321&r1=1208320&r2=1208321&view=diff
==============================================================================
--- 
camel/branches/camel-2.8.x/examples/camel-example-spring-jms/src/test/java/org/apache/camel/example/SpringJmsClientServerTest.java
 (original)
+++ 
camel/branches/camel-2.8.x/examples/camel-example-spring-jms/src/test/java/org/apache/camel/example/SpringJmsClientServerTest.java
 Wed Nov 30 08:33:50 2011
@@ -35,7 +35,12 @@ public class SpringJmsClientServerTest e
     
     @BeforeClass
     public static void setUpServer() {
-        serverContext = new 
ClassPathXmlApplicationContext("/META-INF/spring/camel-server.xml");
+        if 
(!"true".equalsIgnoreCase(System.getProperty("skipStartingCamelContext"))) {
+            serverContext = new 
ClassPathXmlApplicationContext("/META-INF/spring/camel-server.xml");
+        } else {
+            System.out.println("Skipping starting CamelContext as system 
property skipStartingCamelContext is set to be true.");
+        }
+        
     }
     
     @AfterClass