servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r411178 - in /incubator/servicemix/trunk/servicemix-core/src/test: java/org/apache/servicemix/client/ java/org/apache/servicemix/jbi/audit/jdbc/ java/org/apache/servicemix/jbi/installation/ java/org/apache/servicemix/jbi/management/task/ ja...
Date Fri, 02 Jun 2006 15:11:12 GMT
Author: gnodet
Date: Fri Jun  2 08:11:11 2006
New Revision: 411178

URL: http://svn.apache.org/viewvc?rev=411178&view=rev
Log:
Use the embedded flag for unit test when jmx and hotdeploy is not needed

Modified:
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/client/SimpleClientTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/audit/jdbc/JdbcAuditorTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/ComponentAssemblyInstallationTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/JbiTaskSupport.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/AbstractTransactionTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/DeliveryChannelImplTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/MEPExchangeTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/BrokerTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/PubSubTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/SubscriptionPropertyCopyTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlowTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/tck/ExamplePojoTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/client/example.xml
    incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/components/util/chained-router.xml
    incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/examples/spring-async-pojo.xml
    incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/examples/spring-pojo.xml
    incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/examples/spring-simple.xml
    incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/config/example-component-route-spring.xml
    incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/config/example-component-route.xml
    incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/config/example-spring.xml
    incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/config/example-uri-route.xml
    incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/config/example.xml
    incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/config/subscription-spring.xml
    incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/config/subscription.xml
    incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/nmr/flow/jms/broker.xml
    incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/nmr/flow/jms/client.xml

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/client/SimpleClientTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/client/SimpleClientTest.java?rev=411178&r1=411177&r2=411178&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/client/SimpleClientTest.java
(original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/client/SimpleClientTest.java
Fri Jun  2 08:11:11 2006
@@ -42,6 +42,7 @@
 
     protected void setUp() throws Exception {
         container = new JBIContainer();
+        container.setEmbedded(true);
         container.init();
         container.start();
         out = new OutBinding() {

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/audit/jdbc/JdbcAuditorTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/audit/jdbc/JdbcAuditorTest.java?rev=411178&r1=411177&r2=411178&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/audit/jdbc/JdbcAuditorTest.java
(original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/audit/jdbc/JdbcAuditorTest.java
Fri Jun  2 08:11:11 2006
@@ -60,6 +60,7 @@
     
     public void testInsertUpdate() throws Exception {
         jbi.setFlowName("st");
+        jbi.setEmbedded(true);
         jbi.init();
         jbi.start();
         SenderComponent sender = new SenderComponent();

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/ComponentAssemblyInstallationTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/ComponentAssemblyInstallationTest.java?rev=411178&r1=411177&r2=411178&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/ComponentAssemblyInstallationTest.java
(original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/ComponentAssemblyInstallationTest.java
Fri Jun  2 08:11:11 2006
@@ -16,6 +16,7 @@
 package org.apache.servicemix.jbi.installation;
 
 import org.apache.servicemix.jbi.container.JBIContainer;
+import org.apache.servicemix.jbi.util.FileUtil;
 
 import java.io.File;
 import java.net.URL;
@@ -53,6 +54,8 @@
 				+ tempRootDir.getAbsolutePath() + "]");
 
 		container.setRootDir(tempRootDir.getAbsolutePath());
+        container.setMonitorDeploymentDirectory(false);
+        container.setMonitorInstallationDirectory(false);
 		container.init();
 		container.start();
 
@@ -96,21 +99,7 @@
 	protected void tearDown() throws Exception {
 		super.tearDown();
 		container.shutDown();
-		deleteDir(tempRootDir);
+		FileUtil.deleteFile(tempRootDir);
 	}
 
-	public static boolean deleteDir(File dir) {
-		System.out.println("Deleting directory : " + dir.getAbsolutePath());
-		if (dir.isDirectory()) {
-			String[] children = dir.list();
-			for (int i = 0; i < children.length; i++) {
-				boolean success = deleteDir(new File(dir, children[i]));
-				if (!success) {
-					return false;
-				}
-			}
-		}
-		// The directory is now empty so delete it
-		return dir.delete();
-	}
 }

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/JbiTaskSupport.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/JbiTaskSupport.java?rev=411178&r1=411177&r2=411178&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/JbiTaskSupport.java
(original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/JbiTaskSupport.java
Fri Jun  2 08:11:11 2006
@@ -36,6 +36,8 @@
     protected void setUp() throws Exception {
         super.setUp();
         container.setCreateMBeanServer(true);
+        container.setMonitorDeploymentDirectory(false);
+        container.setMonitorInstallationDirectory(false);
         container.init();
         container.start();
         

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/AbstractTransactionTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/AbstractTransactionTest.java?rev=411178&r1=411177&r2=411178&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/AbstractTransactionTest.java
(original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/AbstractTransactionTest.java
Fri Jun  2 08:11:11 2006
@@ -86,7 +86,7 @@
         container.setName(name);
         container.setFlow(createFlow());
         container.setAutoEnlistInTransaction(true);
-        container.setMonitorInstallationDirectory(false);
+        container.setEmbedded(true);
         container.init();
         container.start();
         return container;

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/DeliveryChannelImplTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/DeliveryChannelImplTest.java?rev=411178&r1=411177&r2=411178&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/DeliveryChannelImplTest.java
(original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/DeliveryChannelImplTest.java
Fri Jun  2 08:11:11 2006
@@ -32,6 +32,7 @@
     
     protected void setUp() throws Exception {
         container = new JBIContainer();
+        container.setEmbedded(true);
         container.init();
         container.start();
         SenderComponent component = new SenderComponent();

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/MEPExchangeTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/MEPExchangeTest.java?rev=411178&r1=411177&r2=411178&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/MEPExchangeTest.java
(original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/MEPExchangeTest.java
Fri Jun  2 08:11:11 2006
@@ -20,6 +20,7 @@
 import org.apache.servicemix.jbi.ExchangeTimeoutException;
 import org.apache.servicemix.jbi.container.JBIContainer;
 import org.apache.servicemix.jbi.jaxp.StringSource;
+import org.apache.servicemix.tck.ExchangeCompletedListener;
 
 import javax.jbi.messaging.DeliveryChannel;
 import javax.jbi.messaging.ExchangeStatus;
@@ -44,6 +45,7 @@
 	private JBIContainer container;
 	private TestComponent provider;
 	private TestComponent consumer;
+    private ExchangeCompletedListener listener;
 	
 	public static class TestComponent extends ComponentSupport {
 		public TestComponent(QName service, String endpoint) {
@@ -57,7 +59,10 @@
 	public void setUp() throws Exception {
 		// Create jbi container
 		container = new JBIContainer();
+        container.setEmbedded(true);
 		container.setFlowName("st");
+        listener = new ExchangeCompletedListener();
+        container.addListener(listener);
 		container.init();
 		container.start();
 		// Create components
@@ -69,6 +74,9 @@
 	}
 	
 	public void tearDown() throws Exception {
+        if (listener != null) {
+            listener.assertExchangeCompleted();
+        }
 		if (container != null) {
 			container.shutDown();
 		}

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/BrokerTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/BrokerTest.java?rev=411178&r1=411177&r2=411178&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/BrokerTest.java
(original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/BrokerTest.java
Fri Jun  2 08:11:11 2006
@@ -39,6 +39,7 @@
     
     public void testExternalRouting() throws Exception {
         JBIContainer container = new JBIContainer();
+        container.setEmbedded(true);
         container.init();
         container.start();
         ReceiverComponent receiver = new ReceiverComponent() {

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/PubSubTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/PubSubTest.java?rev=411178&r1=411177&r2=411178&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/PubSubTest.java
(original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/PubSubTest.java
Fri Jun  2 08:11:11 2006
@@ -34,8 +34,7 @@
 
     protected void setUp() throws Exception {
         container = new JBIContainer();
-        container.setUseMBeanServer(true);
-        container.setCreateMBeanServer(false);
+        container.setEmbedded(true);
         container.setFlowName("seda");
         container.init();
         container.start();

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/SubscriptionPropertyCopyTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/SubscriptionPropertyCopyTest.java?rev=411178&r1=411177&r2=411178&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/SubscriptionPropertyCopyTest.java
(original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/SubscriptionPropertyCopyTest.java
Fri Jun  2 08:11:11 2006
@@ -68,9 +68,7 @@
             if (subscriptionFlowName != null) {
                 container.getDefaultBroker().getSubscriptionManager().setFlowName(subscriptionFlowName);
             }
-            // TODO: check why the following line is enabled, there is 
-            // a 5 seconds pause when Management stuff is initialized
-			//container.setCreateMBeanServer(true);
+            container.setEmbedded(true);
 			container.init();
 			container.start();
 			

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlowTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlowTest.java?rev=411178&r1=411177&r2=411178&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlowTest.java
(original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlowTest.java
Fri Jun  2 08:11:11 2006
@@ -79,6 +79,7 @@
         senderFlow.setJmsURL("tcp://localhost:61216");
         senderFlow.setTransactionContextManager(tcm);
         senderContainer.setTransactionManager(tm);
+        senderContainer.setEmbedded(true);
         senderContainer.setName("senderContainer");
         senderContainer.setFlow(senderFlow);
         senderContainer.setMonitorInstallationDirectory(false);
@@ -90,6 +91,7 @@
         receiverFlow.setJmsURL("tcp://localhost:61216");
         receiverFlow.setTransactionContextManager(tcm);
         receiverContainer.setTransactionManager(tm);
+        receiverContainer.setEmbedded(true);
         receiverContainer.setName("receiverContainer");
         receiverContainer.setFlow(receiverFlow);
         receiverContainer.setMonitorInstallationDirectory(false);

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/tck/ExamplePojoTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/tck/ExamplePojoTest.java?rev=411178&r1=411177&r2=411178&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/tck/ExamplePojoTest.java
(original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/tck/ExamplePojoTest.java
Fri Jun  2 08:11:11 2006
@@ -38,6 +38,7 @@
     }
 
     protected void setUp() throws Exception {
+        container.setEmbedded(true);
         container.init();
         container.start();
         receiver = new ReceiverComponent();

Modified: incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/client/example.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/client/example.xml?rev=411178&r1=411177&r2=411178&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/client/example.xml
(original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/client/example.xml
Fri Jun  2 08:11:11 2006
@@ -3,7 +3,7 @@
 	   xmlns:foo="http://servicemix.org/cheese/">
 
   <!-- the JBI container -->
-  <sm:container id="jbi">
+  <sm:container id="jbi" embedded="true">
     <sm:activationSpecs>
 
       <sm:activationSpec componentName="receiver" service="foo:receiver">

Modified: incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/components/util/chained-router.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/components/util/chained-router.xml?rev=411178&r1=411177&r2=411178&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/components/util/chained-router.xml
(original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/components/util/chained-router.xml
Fri Jun  2 08:11:11 2006
@@ -4,7 +4,7 @@
        xmlns:util="java://org.apache.servicemix.components.util">
 
 	<!-- the JBI container -->
-	<sm:container id="jbi" flowName="st">
+	<sm:container id="jbi" flowName="st" embedded="true">
 		<sm:activationSpecs>
 
 			<sm:activationSpec componentName="sender"

Modified: incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/examples/spring-async-pojo.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/examples/spring-async-pojo.xml?rev=411178&r1=411177&r2=411178&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/examples/spring-async-pojo.xml
(original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/examples/spring-async-pojo.xml
Fri Jun  2 08:11:11 2006
@@ -4,6 +4,7 @@
 
   <!-- the JBI container -->
   <bean id="jbi" class="org.apache.servicemix.jbi.container.SpringJBIContainer">
+    <property name="embedded" value="true" />
     <property name="componentNames">
       <list>
         <value>sender</value>

Modified: incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/examples/spring-pojo.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/examples/spring-pojo.xml?rev=411178&r1=411177&r2=411178&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/examples/spring-pojo.xml
(original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/examples/spring-pojo.xml
Fri Jun  2 08:11:11 2006
@@ -4,6 +4,7 @@
 
   <!-- the JBI container -->
   <bean id="jbi" class="org.apache.servicemix.jbi.container.SpringJBIContainer">
+    <property name="embedded" value="true" />
     <property name="componentNames">
       <list>
         <value>sender</value>

Modified: incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/examples/spring-simple.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/examples/spring-simple.xml?rev=411178&r1=411177&r2=411178&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/examples/spring-simple.xml
(original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/examples/spring-simple.xml
Fri Jun  2 08:11:11 2006
@@ -4,6 +4,7 @@
 
   <!-- the JBI container -->
   <bean id="jbi" class="org.apache.servicemix.jbi.container.SpringJBIContainer">
+    <property name="embedded" value="true" />
     <property name="componentNames">
       <list>
         <value>sender</value>

Modified: incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/config/example-component-route-spring.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/config/example-component-route-spring.xml?rev=411178&r1=411177&r2=411178&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/config/example-component-route-spring.xml
(original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/config/example-component-route-spring.xml
Fri Jun  2 08:11:11 2006
@@ -4,6 +4,7 @@
 
   <!-- the JBI container -->
   <bean id="jbi" class="org.apache.servicemix.jbi.container.SpringJBIContainer">
+    <property name="embedded" value="true" />
     <property name="activationSpecs">
       <list>
         <bean class="org.apache.servicemix.jbi.container.ActivationSpec">

Modified: incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/config/example-component-route.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/config/example-component-route.xml?rev=411178&r1=411177&r2=411178&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/config/example-component-route.xml
(original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/config/example-component-route.xml
Fri Jun  2 08:11:11 2006
@@ -3,7 +3,7 @@
 	   xmlns:foo="http://servicemix.org/cheese/">
 
 	<!-- the JBI container -->
-	<container id="jbi" xmlns="http://servicemix.apache.org/config/1.0">
+	<container id="jbi" xmlns="http://servicemix.apache.org/config/1.0" embedded="true">
 		<activationSpecs>
 
 			<activationSpec componentName="sender" service="foo:sender" endpoint="sender">

Modified: incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/config/example-spring.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/config/example-spring.xml?rev=411178&r1=411177&r2=411178&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/config/example-spring.xml
(original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/config/example-spring.xml
Fri Jun  2 08:11:11 2006
@@ -4,6 +4,7 @@
 
   <!-- the JBI container -->
   <bean id="jbi" class="org.apache.servicemix.jbi.container.SpringJBIContainer">
+    <property name="embedded" value="true" />
     <property name="activationSpecs">
       <list>
         <bean class="org.apache.servicemix.jbi.container.ActivationSpec">

Modified: incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/config/example-uri-route.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/config/example-uri-route.xml?rev=411178&r1=411177&r2=411178&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/config/example-uri-route.xml
(original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/config/example-uri-route.xml
Fri Jun  2 08:11:11 2006
@@ -3,7 +3,7 @@
 	   xmlns:foo="http://servicemix.org/cheese/">
 
 	<!-- the JBI container -->
-	<container id="jbi" xmlns="http://servicemix.apache.org/config/1.0">
+	<container id="jbi" embedded="true" xmlns="http://servicemix.apache.org/config/1.0">
 		<activationSpecs>
 
 			<activationSpec componentName="sender" 

Modified: incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/config/example.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/config/example.xml?rev=411178&r1=411177&r2=411178&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/config/example.xml
(original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/config/example.xml
Fri Jun  2 08:11:11 2006
@@ -3,7 +3,7 @@
 	   xmlns:foo="http://servicemix.org/cheese/">
 
   <!-- the JBI container -->
-  <sm:container id="jbi">
+  <sm:container id="jbi" embedded="true">
     <sm:activationSpecs>
 
       <sm:activationSpec componentName="sender" 

Modified: incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/config/subscription-spring.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/config/subscription-spring.xml?rev=411178&r1=411177&r2=411178&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/config/subscription-spring.xml
(original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/config/subscription-spring.xml
Fri Jun  2 08:11:11 2006
@@ -4,6 +4,7 @@
   <!-- the JBI container -->
   <bean id="jbi"
     class="org.apache.servicemix.jbi.container.SpringJBIContainer">
+    <property name="embedded" value="true" />
     <property name="activationSpecs">
       <list>
         <bean class="org.apache.servicemix.jbi.container.ActivationSpec">

Modified: incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/config/subscription.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/config/subscription.xml?rev=411178&r1=411177&r2=411178&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/config/subscription.xml
(original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/config/subscription.xml
Fri Jun  2 08:11:11 2006
@@ -3,7 +3,7 @@
 	   xmlns:foo="http://servicemix.org/cheese/">
 
   <!-- the JBI container -->
-  <sm:container id="jbi">
+  <sm:container id="jbi" embedded="true">
     <sm:activationSpecs>
 
       <sm:activationSpec componentName="receiver" service="foo:receiver">

Modified: incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/nmr/flow/jms/broker.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/nmr/flow/jms/broker.xml?rev=411178&r1=411177&r2=411178&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/nmr/flow/jms/broker.xml
(original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/nmr/flow/jms/broker.xml
Fri Jun  2 08:11:11 2006
@@ -9,7 +9,7 @@
 http://servicemix.apache.org/config/1.0 
 conf/servicemix.xsd"> 
 
-  <sm:container id="jbi" name ="service" flowName="cluster"> 
+  <sm:container id="jbi" name ="service" flowName="cluster" embedded="true"> 
     <sm:activationSpecs> 
       <sm:activationSpec componentName="pingService" 
 service="foo:pingService"> 

Modified: incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/nmr/flow/jms/client.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/nmr/flow/jms/client.xml?rev=411178&r1=411177&r2=411178&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/nmr/flow/jms/client.xml
(original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/nmr/flow/jms/client.xml
Fri Jun  2 08:11:11 2006
@@ -10,7 +10,8 @@
 
   <sm:container id="jbi" 
       flowName="cluster" 
-      name="jbi"/> 
+      name="jbi"
+      embedded="true" /> 
 
   <bean id="client" 
       class="org.apache.servicemix.client.DefaultServiceMixClient"> 



Mime
View raw message