You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2005/12/28 13:25:21 UTC
svn commit: r359493 - in /incubator/servicemix/trunk: ./
servicemix-components/
servicemix-components/src/test/java/org/apache/servicemix/components/http/
servicemix-components/src/test/java/org/apache/servicemix/components/pojo/
servicemix-components/...
Author: gnodet
Date: Wed Dec 28 04:24:38 2005
New Revision: 359493
URL: http://svn.apache.org/viewcvs?rev=359493&view=rev
Log:
Fix build / tests
Added:
incubator/servicemix/trunk/servicemix-components/src/test/resources/broker.xml
Removed:
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/broker.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jca/broker.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/wsif/broker.xml
Modified:
incubator/servicemix/trunk/pom.xml
incubator/servicemix/trunk/servicemix-components/pom.xml
incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapAndSaajTest.java
incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapAttachmentsTest.java
incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapTest.java
incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/pojo/MyReceiver.java
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/cache/example.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/drools/example.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/drools/jbi-example-forward.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/drools/jbi-example.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/email/example.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/email/mimeMail.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/email/simpleMail.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/file/example.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/groovy/example.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/groovy/groovy-chain.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/groovy/spring-groovy.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/http/example.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/activemqAsServer.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/example.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/group-example.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jca/example.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jca/exampleWithXA.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jca/xa-on-jca-flow.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jms/example-endpoint-subscription.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jms/example.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/net/ftp.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/net/ftpPoll.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/pojo/example-more-pojo.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/pojo/example.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/quartz/example.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/reflection/example.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/rss/example.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/saaj/example.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/script/groovy-transform.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/script/spring-groovy.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/validation/example.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/vfs/example.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/vfs/example_win.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/wsif/example.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xfire/xfire-inout.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xfire/xfire-out.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/example.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/pipeline.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/publish.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/router-example.xml
incubator/servicemix/trunk/servicemix-core/pom.xml
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/tck/MessageList.java
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/tck/SpringTestSupport.java
incubator/servicemix/trunk/servicemix-http/pom.xml
incubator/servicemix/trunk/servicemix-jsr181/pom.xml
Modified: incubator/servicemix/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/pom.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/pom.xml (original)
+++ incubator/servicemix/trunk/pom.xml Wed Dec 28 04:24:38 2005
@@ -817,7 +817,7 @@
<dependency>
<groupId>jetty</groupId>
<artifactId>org.mortbay.jetty</artifactId>
- <version>4.2.20RC0</version>
+ <version>5.1.9</version>
</dependency>
<dependency>
<groupId>jgroups</groupId>
@@ -967,6 +967,16 @@
<artifactId>jta</artifactId>
</exclusion>
</exclusions>
+ </dependency>
+ <dependency>
+ <groupId>springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>1.2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>1.2.5</version>
</dependency>
<dependency>
<groupId>stax</groupId>
Modified: incubator/servicemix/trunk/servicemix-components/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/pom.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/pom.xml Wed Dec 28 04:24:38 2005
@@ -307,7 +307,11 @@
</dependency>
<dependency>
<groupId>springframework</groupId>
- <artifactId>spring</artifactId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>springframework</groupId>
+ <artifactId>spring-beans</artifactId>
</dependency>
<dependency>
<groupId>stax</groupId>
@@ -390,6 +394,9 @@
<!-- These ones can not work, need rewrite -->
<exclude>**/JmsOverJcaWithFullXATest.*</exclude>
+
+ <!-- exclude until amq4 stable -->
+ <exclude>**/JmsOverJca*.*</exclude>
<!-- enable when geronimo has support for attachments -->
<exclude>**/HttpSoapAttachmentsTest.*</exclude>
Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapAndSaajTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapAndSaajTest.java?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapAndSaajTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapAndSaajTest.java Wed Dec 28 04:24:38 2005
@@ -45,6 +45,7 @@
container.setMonitorInstallationDirectory(false);
container.setUseMBeanServer(false);
container.setCreateMBeanServer(false);
+ container.setEmbedded(true);
container.init();
container.start();
}
Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapAttachmentsTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapAttachmentsTest.java?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapAttachmentsTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapAttachmentsTest.java Wed Dec 28 04:24:38 2005
@@ -49,6 +49,7 @@
container.setMonitorInstallationDirectory(false);
container.setUseMBeanServer(false);
container.setCreateMBeanServer(false);
+ container.setEmbedded(true);
container.init();
container.start();
}
Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapTest.java?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapTest.java Wed Dec 28 04:24:38 2005
@@ -56,6 +56,7 @@
container.setMonitorInstallationDirectory(false);
container.setUseMBeanServer(false);
container.setCreateMBeanServer(false);
+ container.setEmbedded(true);
container.init();
container.start();
}
Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/pojo/MyReceiver.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/pojo/MyReceiver.java?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/pojo/MyReceiver.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/pojo/MyReceiver.java Wed Dec 28 04:24:38 2005
@@ -15,9 +15,6 @@
*/
package org.apache.servicemix.components.pojo;
-import org.apache.servicemix.MessageExchangeListener;
-import org.apache.servicemix.tck.MessageList;
-
import javax.jbi.JBIException;
import javax.jbi.component.ComponentContext;
import javax.jbi.component.ComponentLifeCycle;
@@ -28,12 +25,19 @@
import javax.management.ObjectName;
import javax.xml.namespace.QName;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.servicemix.MessageExchangeListener;
+import org.apache.servicemix.tck.MessageList;
+
/**
* @version $Revision$
*/
// START SNIPPET: receive
public class MyReceiver implements ComponentLifeCycle, MessageExchangeListener {
+ private static final Log log = LogFactory.getLog(MyReceiver.class);
+
private ComponentContext context;
private ObjectName extensionMBeanName;
private MessageList messageList = new MessageList();
@@ -64,7 +68,7 @@
// MessageExchangeListener interface
//-------------------------------------------------------------------------
public void onMessageExchange(MessageExchange exchange) throws MessagingException {
- System.out.println("Received message " + exchange);
+ log.info("Received message " + exchange);
NormalizedMessage message = exchange.getMessage("in");
getMessageList().addMessage(message);
exchange.setStatus(ExchangeStatus.DONE);
Added: incubator/servicemix/trunk/servicemix-components/src/test/resources/broker.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/broker.xml?rev=359493&view=auto
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/broker.xml (added)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/broker.xml Wed Dec 28 04:24:38 2005
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://activemq.org/config/1.0">
+
+ <broker persistent="false">
+
+ <transportConnectors>
+ <transportConnector uri="tcp://localhost:61626" />
+ </transportConnectors>
+
+ </broker>
+
+</beans>
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/cache/example.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/cache/example.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/cache/example.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/cache/example.xml Wed Dec 28 04:24:38 2005
@@ -2,7 +2,7 @@
<beans xmlns:foo="http://servicemix.org/cheese/">
<!-- the JBI container -->
- <container id="jbi" xmlns="http://servicemix.org/config/1.0">
+ <container id="jbi" xmlns="http://servicemix.org/config/1.0" embedded="true">
<activationSpecs>
<!-- START SNIPPET: cache -->
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/drools/example.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/drools/example.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/drools/example.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/drools/example.xml Wed Dec 28 04:24:38 2005
@@ -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>
<!-- START SNIPPET: drools -->
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/drools/jbi-example-forward.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/drools/jbi-example-forward.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/drools/jbi-example-forward.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/drools/jbi-example-forward.xml Wed Dec 28 04:24:38 2005
@@ -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>
<!-- START SNIPPET: drools -->
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/drools/jbi-example.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/drools/jbi-example.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/drools/jbi-example.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/drools/jbi-example.xml Wed Dec 28 04:24:38 2005
@@ -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>
<!-- START SNIPPET: drools -->
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/email/example.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/email/example.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/email/example.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/email/example.xml Wed Dec 28 04:24:38 2005
@@ -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>
<!-- START SNIPPET: mime -->
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/email/mimeMail.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/email/mimeMail.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/email/mimeMail.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/email/mimeMail.xml Wed Dec 28 04:24:38 2005
@@ -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>
<!-- START SNIPPET: expr -->
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/email/simpleMail.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/email/simpleMail.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/email/simpleMail.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/email/simpleMail.xml Wed Dec 28 04:24:38 2005
@@ -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>
<!-- START SNIPPET: xpath -->
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/file/example.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/file/example.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/file/example.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/file/example.xml Wed Dec 28 04:24:38 2005
@@ -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>
<!-- START SNIPPET: send -->
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/groovy/example.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/groovy/example.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/groovy/example.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/groovy/example.xml Wed Dec 28 04:24:38 2005
@@ -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-components/src/test/resources/org/apache/servicemix/components/groovy/groovy-chain.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/groovy/groovy-chain.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/groovy/groovy-chain.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/groovy/groovy-chain.xml Wed Dec 28 04:24:38 2005
@@ -5,7 +5,7 @@
xmlns:foo="http://servicemix.org/cheese/">
<!-- the JBI container -->
- <sm:container spring:id="jbi" flowName="st">
+ <sm:container spring:id="jbi" flowName="st" embedded="true">
<sm:activationSpecs>
<!-- chaining router -->
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/groovy/spring-groovy.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/groovy/spring-groovy.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/groovy/spring-groovy.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/groovy/spring-groovy.xml Wed Dec 28 04:24:38 2005
@@ -10,6 +10,7 @@
<value>receiver</value>
</list>
</property>
+ <property name="embedded" value="true" />
</bean>
<!-- components within the JBI container -->
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/http/example.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/http/example.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/http/example.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/http/example.xml Wed Dec 28 04:24:38 2005
@@ -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>
<!-- START SNIPPET: send -->
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/activemqAsServer.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/activemqAsServer.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/activemqAsServer.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/activemqAsServer.xml Wed Dec 28 04:24:38 2005
@@ -4,16 +4,16 @@
<!-- lets run an embedded broker -->
<bean id="broker" class="org.activemq.xbean.BrokerFactoryBean">
- <property name="config" value="classpath:org/apache/servicemix/components/jabber/broker.xml"/>
+ <property name="config" value="classpath:broker.xml"/>
</bean>
<!-- the JBI container -->
- <sm:container id="jbi" depends-on="broker">
+ <sm:container id="jbi" depends-on="broker" embedded="true">
<sm:activationSpecs>
<sm:activationSpec componentName="myJabberSender" service="foo:myJabberSender">
<sm:component><bean class="org.apache.servicemix.components.jabber.JabberChatSender">
<property name="host" value="localhost"/>
- <property name="port" value="6222"/>
+ <property name="port" value="61626"/>
<property name="login" value="false"/>
<property name="participant" value="test2@servicemix.org"/>
</bean></sm:component>
@@ -22,7 +22,7 @@
<sm:activationSpec componentName="myJabberReceiver" service="foo:myJabberReceiver" destinationService="foo:receiver">
<sm:component><bean class="org.apache.servicemix.components.jabber.JabberReceiver">
<property name="host" value="localhost"/>
- <property name="port" value="6222"/>
+ <property name="port" value="61626"/>
<property name="user" value="test2@servicemix.org"/>
<property name="password" value="rocks"/>
</bean></sm:component>
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/example.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/example.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/example.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/example.xml Wed Dec 28 04:24:38 2005
@@ -4,18 +4,18 @@
<!-- lets run an embedded broker -->
<bean id="broker" class="org.activemq.xbean.BrokerFactoryBean">
- <property name="config" value="classpath:org/apache/servicemix/components/jabber/broker.xml"/>
+ <property name="config" value="classpath:broker.xml"/>
</bean>
<!-- the JBI container -->
- <sm:container id="jbi" depends-on="broker">
+ <sm:container id="jbi" depends-on="broker" embedded="true">
<sm:activationSpecs>
<!-- START SNIPPET: send -->
<sm:activationSpec componentName="myJabberSender" service="foo:myJabberSender" endpoint="myJabberSender">
<sm:component><bean class="org.apache.servicemix.components.jabber.JabberChatSender">
<property name="host" value="localhost"/>
- <property name="port" value="6222"/>
+ <property name="port" value="61626"/>
<property name="user" value="test1@servicemix.org"/>
<property name="password" value="rocks"/>
<property name="participant" value="test2@servicemix.org"/>
@@ -27,7 +27,7 @@
<sm:activationSpec componentName="myJabberReceiver" service="foo:myJabberReceiver" endpoint="myJabberReceiver" destinationService="foo:receiver">
<sm:component><bean class="org.apache.servicemix.components.jabber.JabberReceiver">
<property name="host" value="localhost"/>
- <property name="port" value="6222"/>
+ <property name="port" value="61626"/>
<property name="user" value="test2@servicemix.org"/>
<property name="password" value="rocks"/>
</bean></sm:component>
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/group-example.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/group-example.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/group-example.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/group-example.xml Wed Dec 28 04:24:38 2005
@@ -4,18 +4,18 @@
<!-- lets run an embedded broker -->
<bean id="broker" class="org.activemq.xbean.BrokerFactoryBean">
- <property name="config" value="classpath:org/apache/servicemix/components/jabber/broker.xml"/>
+ <property name="config" value="classpath:broker.xml"/>
</bean>
<!-- the JBI container -->
- <sm:container id="jbi" depends-on="broker">
+ <sm:container id="jbi" depends-on="broker" embedded="true">
<sm:activationSpecs>
<!-- START SNIPPET: send -->
<sm:activationSpec componentName="myJabberSender" service="foo:myJabberSender" endpoint="myJabberSender">
<sm:component><bean class="org.apache.servicemix.components.jabber.JabberGroupChatSender">
<property name="host" value="localhost"/>
- <property name="port" value="6222"/>
+ <property name="port" value="61626"/>
<property name="user" value="test1@servicemix.org"/>
<property name="password" value="rocks"/>
<property name="room" value="servicemixroom"/>
@@ -27,7 +27,7 @@
<sm:activationSpec componentName="myJabberReceiver" service="foo:myJabberReceiver" endpoint="myJabberReceiver" destinationService="foo:receiver">
<sm:component><bean class="org.apache.servicemix.components.jabber.JabberReceiver">
<property name="host" value="localhost"/>
- <property name="port" value="6222"/>
+ <property name="port" value="61626"/>
<property name="user" value="test2@servicemix.org"/>
<property name="password" value="rocks"/>
</bean></sm:component>
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jca/example.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jca/example.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jca/example.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jca/example.xml Wed Dec 28 04:24:38 2005
@@ -7,7 +7,7 @@
|| ActiveMQ Broker
-->
<bean id="broker" class="org.activemq.xbean.BrokerFactoryBean" singleton="true">
- <property name="config" value="classpath:org/apache/servicemix/components/jca/broker.xml"/>
+ <property name="config" value="classpath:broker.xml"/>
</bean>
<!-- START SNIPPET: jca -->
@@ -31,7 +31,7 @@
<!-- END SNIPPET: jca -->
<!-- the JBI container -->
- <sm:container id="jbi">
+ <sm:container id="jbi" depends-on="broker" embedded="true">
<sm:activationSpecs>
<sm:activationSpec componentName="myJmsSender" service="foo:myJmsSender">
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jca/exampleWithXA.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jca/exampleWithXA.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jca/exampleWithXA.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jca/exampleWithXA.xml Wed Dec 28 04:24:38 2005
@@ -6,7 +6,7 @@
|| ActiveMQ Broker
-->
<bean id="broker" class="org.activemq.xbean.BrokerFactoryBean" singleton="true">
- <property name="config" value="classpath:org/apache/servicemix/components/jca/broker.xml"/>
+ <property name="config" value="classpath:broker.xml"/>
</bean>
<!-- START SNIPPET: jca -->
@@ -34,7 +34,7 @@
<!-- END SNIPPET: tm -->
<!-- the JBI container -->
- <sm:container id="jbi">
+ <sm:container id="jbi" depends-on="broker" embedded="true">
<sm:activationSpecs>
<sm:activationSpec componentName="myJmsSender" service="foo:myJmsSender">
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jca/xa-on-jca-flow.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jca/xa-on-jca-flow.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jca/xa-on-jca-flow.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jca/xa-on-jca-flow.xml Wed Dec 28 04:24:38 2005
@@ -6,7 +6,7 @@
|| ActiveMQ Broker
-->
<bean id="broker" class="org.activemq.xbean.BrokerFactoryBean" singleton="true">
- <property name="config" value="classpath:org/apache/servicemix/components/jca/broker.xml"/>
+ <property name="config" value="classpath:broker.xml"/>
</bean>
<!-- START SNIPPET: jca -->
@@ -35,7 +35,7 @@
<!-- END SNIPPET: tm -->
<!-- the JBI container -->
- <sm:container id="jbi">
+ <sm:container id="jbi" depends-on="broker" embedded="true">
<!-- use JCA flow -->
<property name="flow">
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jms/example-endpoint-subscription.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jms/example-endpoint-subscription.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jms/example-endpoint-subscription.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jms/example-endpoint-subscription.xml Wed Dec 28 04:24:38 2005
@@ -2,8 +2,12 @@
<beans xmlns:sm="http://servicemix.org/config/1.0"
xmlns:foo="http://servicemix.org/cheese/">
+ <bean id="broker" class="org.activemq.xbean.BrokerFactoryBean" singleton="true">
+ <property name="config" value="classpath:broker.xml"/>
+ </bean>
+
<!-- the JBI container -->
- <sm:container id="jbi">
+ <sm:container id="jbi" depends-on="broker" embedded="true">
<sm:activationSpecs>
<sm:activationSpec componentName="jmsSender" service="foo:jmsSender">
@@ -73,7 +77,7 @@
<bean id="jmsFactory" class="org.activemq.pool.PooledConnectionFactory">
<property name="connectionFactory">
<bean class="org.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL" value="vm://localhost" />
+ <property name="brokerURL" value="tcp://localhost:61626" />
</bean>
</property>
</bean>
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jms/example.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jms/example.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jms/example.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jms/example.xml Wed Dec 28 04:24:38 2005
@@ -2,8 +2,12 @@
<beans xmlns:sm="http://servicemix.org/config/1.0"
xmlns:foo="http://servicemix.org/cheese/">
+ <bean id="broker" class="org.activemq.xbean.BrokerFactoryBean" singleton="true">
+ <property name="config" value="classpath:broker.xml"/>
+ </bean>
+
<!-- the JBI container -->
- <sm:container id="jbi">
+ <sm:container id="jbi" depends-on="broker" embedded="true">
<sm:activationSpecs>
<sm:activationSpec componentName="myJmsSender" service="foo:myJmsSender">
@@ -82,9 +86,7 @@
<bean id="jmsFactory" class="org.activemq.pool.PooledConnectionFactory">
<property name="connectionFactory">
<bean class="org.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL">
- <value>vm://localhost</value>
- </property>
+ <property name="brokerURL" value="tcp://localhost:61626" />
</bean>
</property>
</bean>
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/net/ftp.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/net/ftp.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/net/ftp.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/net/ftp.xml Wed Dec 28 04:24:38 2005
@@ -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>
<!-- START SNIPPET: sender -->
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/net/ftpPoll.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/net/ftpPoll.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/net/ftpPoll.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/net/ftpPoll.xml Wed Dec 28 04:24:38 2005
@@ -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="ftpSender" service="foo:ftpSender">
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/pojo/example-more-pojo.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/pojo/example-more-pojo.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/pojo/example-more-pojo.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/pojo/example-more-pojo.xml Wed Dec 28 04:24:38 2005
@@ -3,7 +3,7 @@
<beans xmlns:sm="http://servicemix.org/config/1.0"
xmlns:foo="http://servicemix.org/cheese/">
- <sm:container id="jbi">
+ <sm:container id="jbi" embedded="true">
<sm:activationSpecs>
<sm:activationSpec componentName="receiver" service="foo:receiver">
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/pojo/example.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/pojo/example.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/pojo/example.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/pojo/example.xml Wed Dec 28 04:24:38 2005
@@ -3,7 +3,7 @@
<beans xmlns:sm="http://servicemix.org/config/1.0"
xmlns:foo="http://servicemix.org/cheese/">
- <sm:container id="jbi">
+ <sm:container id="jbi" embedded="true">
<sm:activationSpecs>
<sm:activationSpec componentName="sender" service="foo:sender" destinationService="foo:receiver">
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/quartz/example.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/quartz/example.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/quartz/example.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/quartz/example.xml Wed Dec 28 04:24:38 2005
@@ -3,7 +3,7 @@
xmlns:my="http://servicemix.org/cheese/">
<!-- the JBI container -->
- <sm:container id="jbi">
+ <sm:container id="jbi" embedded="true">
<sm:activationSpecs>
<!-- START SNIPPET: timer -->
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/reflection/example.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/reflection/example.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/reflection/example.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/reflection/example.xml Wed Dec 28 04:24:38 2005
@@ -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>
<!-- START SNIPPET: inOnly -->
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/rss/example.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/rss/example.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/rss/example.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/rss/example.xml Wed Dec 28 04:24:38 2005
@@ -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>
<!-- START SNIPPET: rss -->
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/saaj/example.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/saaj/example.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/saaj/example.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/saaj/example.xml Wed Dec 28 04:24:38 2005
@@ -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>
<!-- START SNIPPET: saaj -->
<sm:activationSpec componentName="stockQuote" service="foo:stockQuote" endpoint="stockQuote">
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/script/groovy-transform.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/script/groovy-transform.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/script/groovy-transform.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/script/groovy-transform.xml Wed Dec 28 04:24:38 2005
@@ -12,6 +12,7 @@
<value>receiver</value>
</list>
</property>
+ <property name="embedded" value="true"/>
</bean>
<!-- components within the JBI container -->
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/script/spring-groovy.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/script/spring-groovy.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/script/spring-groovy.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/script/spring-groovy.xml Wed Dec 28 04:24:38 2005
@@ -2,7 +2,7 @@
<beans xmlns:sm="http://servicemix.org/config/1.0"
xmlns:foo="http://servicemix.org/cheese/">
- <sm:container id="jbi" flowName="st">
+ <sm:container id="jbi" flowName="st" embedded="true">
<sm:activationSpecs>
<sm:activationSpec componentName="sender" service="foo:sender" endpoint="sender"
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/validation/example.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/validation/example.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/validation/example.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/validation/example.xml Wed Dec 28 04:24:38 2005
@@ -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>
<!-- START SNIPPET: example -->
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/vfs/example.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/vfs/example.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/vfs/example.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/vfs/example.xml Wed Dec 28 04:24:38 2005
@@ -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>
<!-- START SNIPPET: send -->
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/vfs/example_win.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/vfs/example_win.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/vfs/example_win.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/vfs/example_win.xml Wed Dec 28 04:24:38 2005
@@ -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>
<!-- START SNIPPET: send -->
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/wsif/example.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/wsif/example.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/wsif/example.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/wsif/example.xml Wed Dec 28 04:24:38 2005
@@ -4,7 +4,7 @@
<!-- ActiveMQ message broker -->
<bean id="broker" class="org.activemq.xbean.BrokerFactoryBean">
- <property name="config" value="classpath:org/apache/servicemix/components/wsif/broker.xml"/>
+ <property name="config" value="classpath:broker.xml"/>
</bean>
<!-- JCA container -->
@@ -27,7 +27,7 @@
</bean>
<!-- JBI container -->
- <sm:container id="jbi">
+ <sm:container id="jbi" embedded="true">
<sm:activationSpecs>
<!-- START SNIPPET: wsif -->
<sm:activationSpec componentName="checkAvailability" service="foo:checkAvailability">
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xfire/xfire-inout.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xfire/xfire-inout.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xfire/xfire-inout.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xfire/xfire-inout.xml Wed Dec 28 04:24:38 2005
@@ -3,7 +3,7 @@
xmlns:xfire="http://xfire.components.servicemix.org">
<!-- the JBI container -->
- <sm:container id="jbi">
+ <sm:container id="jbi" embedded="true">
<sm:activationSpecs>
<sm:activationSpec componentName="sender" service="xfire:sender" destinationService="xfire:OneWayService">
<sm:component><bean class="org.apache.servicemix.tck.SenderComponent"/></sm:component>
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xfire/xfire-out.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xfire/xfire-out.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xfire/xfire-out.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xfire/xfire-out.xml Wed Dec 28 04:24:38 2005
@@ -3,7 +3,7 @@
xmlns:xfire="http://xfire.components.servicemix.org">
<!-- the JBI container -->
- <sm:container id="jbi">
+ <sm:container id="jbi" embedded="true">
<sm:activationSpecs>
<sm:activationSpec componentName="sender" endpoint="sender" service="xfire:sender" destinationService="xfire:OneWayService">
<sm:component><bean class="org.apache.servicemix.tck.SenderComponent"/></sm:component>
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/example.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/example.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/example.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/example.xml Wed Dec 28 04:24:38 2005
@@ -2,8 +2,12 @@
<beans xmlns:sm="http://servicemix.org/config/1.0"
xmlns:foo="http://servicemix.org/cheese/">
+ <bean id="broker" class="org.activemq.xbean.BrokerFactoryBean" singleton="true">
+ <property name="config" value="classpath:broker.xml"/>
+ </bean>
+
<!-- the JBI container -->
- <sm:container id="jbi">
+ <sm:container id="jbi" depends-on="broker" embedded="true">
<sm:activationSpecs>
<!-- START SNIPPET: send -->
@@ -113,7 +117,7 @@
<bean id="jmsFactory" class="org.activemq.pool.PooledConnectionFactory">
<property name="connectionFactory">
<bean class="org.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL" value="vm://localhost?broker.persistent=false"/>
+ <property name="brokerURL" value="tcp://localhost:61626"/>
</bean>
</property>
</bean>
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/pipeline.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/pipeline.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/pipeline.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/pipeline.xml Wed Dec 28 04:24:38 2005
@@ -4,7 +4,7 @@
xmlns:foo="http://servicemix.org/demo/pipeline/">
<!-- the JBI container and its components -->
- <sm:container id="jbi">
+ <sm:container id="jbi" embedded="true">
<sm:activationSpecs>
<sm:activationSpec componentName="myJmsReceiver" service="foo:myJmsReceiver" destinationService="foo:transformer">
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/publish.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/publish.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/publish.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/publish.xml Wed Dec 28 04:24:38 2005
@@ -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>
<!-- START SNIPPET: xslt -->
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/router-example.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/router-example.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/router-example.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/router-example.xml Wed Dec 28 04:24:38 2005
@@ -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>
<!-- START SNIPPET: xslt -->
Modified: incubator/servicemix/trunk/servicemix-core/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/pom.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-core/pom.xml Wed Dec 28 04:24:38 2005
@@ -104,7 +104,11 @@
<dependency>
<groupId>springframework</groupId>
- <artifactId>spring</artifactId>
+ <artifactId>spring-beans</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>springframework</groupId>
+ <artifactId>spring-context</artifactId>
</dependency>
<dependency>
@@ -176,10 +180,6 @@
<artifactId>stax-utils</artifactId>
</dependency>
<dependency>
- <groupId>lingo</groupId>
- <artifactId>lingo</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
@@ -198,6 +198,11 @@
<artifactId>xbean</artifactId>
<version>2.0.0</version>
</dependency>
+
+ <dependency>
+ <groupId>lingo</groupId>
+ <artifactId>lingo</artifactId>
+ </dependency>
<dependency>
<groupId>annogen</groupId>
@@ -305,8 +310,8 @@
<path refid="maven.dependency.classpath"></path>
</classpath>
</taskdef>
- <mapping destFile="target/servicemix.xsd" namespace="http://servicemix.org/config/1.0"
- srcdir="src/main/java" metaInfDir="target/generated/"/>
+ <mapping destFile="${basedir}/target/servicemix.xsd" namespace="http://servicemix.org/config/1.0"
+ srcdir="${basedir}/src/main/java" metaInfDir="${basedir}/target/generated/"/>
</tasks>
</configuration>
<goals>
Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/tck/MessageList.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/tck/MessageList.java?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/tck/MessageList.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/tck/MessageList.java Wed Dec 28 04:24:38 2005
@@ -18,6 +18,9 @@
import javax.jbi.messaging.MessagingException;
import javax.jbi.messaging.NormalizedMessage;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import java.util.ArrayList;
import java.util.List;
@@ -29,6 +32,9 @@
* @version $Revision$
*/
public class MessageList extends Assert {
+
+ private static final Log log = LogFactory.getLog(MessageList.class);
+
private List messages = new ArrayList();
private Object semaphore;
@@ -79,7 +85,7 @@
public void waitForMessagesToArrive(int messageCount) {
- System.out.println("Waiting for message to arrive");
+ log.info("Waiting for message to arrive");
long start = System.currentTimeMillis();
@@ -93,12 +99,12 @@
}
}
catch (InterruptedException e) {
- System.out.println("Caught: " + e);
+ log.info("Caught: " + e);
}
}
long end = System.currentTimeMillis() - start;
- System.out.println("End of wait for " + end + " millis");
+ log.info("End of wait for " + end + " millis");
}
Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/tck/SpringTestSupport.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/tck/SpringTestSupport.java?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/tck/SpringTestSupport.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/tck/SpringTestSupport.java Wed Dec 28 04:24:38 2005
@@ -61,7 +61,7 @@
protected void tearDown() throws Exception {
if (context != null) {
- System.out.println("Closing down the spring context");
+ log.info("Closing down the spring context");
context.destroy();
}
}
Modified: incubator/servicemix/trunk/servicemix-http/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-http/pom.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-http/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-http/pom.xml Wed Dec 28 04:24:38 2005
@@ -150,8 +150,8 @@
<path refid="maven.dependency.classpath"></path>
</classpath>
</taskdef>
- <mapping destFile="target/servicemix-http-${version}.xsd" namespace="http://servicemix.org/http/1.0"
- srcdir="src/main/java" metaInfDir="target/generated/"/>
+ <mapping destFile="${basedir}/target/servicemix-http-${version}.xsd" namespace="http://servicemix.org/http/1.0"
+ srcdir="${basedir}/src/main/java" metaInfDir="${basedir}/target/generated/"/>
</tasks>
</configuration>
<goals>
Modified: incubator/servicemix/trunk/servicemix-jsr181/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jsr181/pom.xml?rev=359493&r1=359492&r2=359493&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jsr181/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-jsr181/pom.xml Wed Dec 28 04:24:38 2005
@@ -218,7 +218,7 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <phase>process-classes</phase>
+ <phase>generate-resources</phase>
<configuration>
<tasks>
<taskdef classname="org.xbean.spring.generator.MappingGeneratorTask" name="mapping">
@@ -227,8 +227,8 @@
<path refid="maven.dependency.classpath"></path>
</classpath>
</taskdef>
- <mapping destFile="target/servicemix-jsr181-${version}.xsd" namespace="http://servicemix.org/jsr181/1.0"
- srcdir="src/main/java" metaInfDir="target/generated/"/>
+ <mapping destFile="${basedir}/target/servicemix-jsr181-${version}.xsd" namespace="http://servicemix.org/jsr181/1.0"
+ srcdir="${basedir}/src/main/java" metaInfDir="${basedir}/target/generated/"/>
</tasks>
</configuration>
<goals>