servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r359213 - in /incubator/servicemix/trunk: ./ servicemix-components/ servicemix-components/src/main/resources/META-INF/ servicemix-components/src/main/resources/META-INF/services/org/mule/providers/ servicemix-components/src/test/java/org/ap...
Date Tue, 27 Dec 2005 14:39:50 GMT
Author: gnodet
Date: Tue Dec 27 06:39:22 2005
New Revision: 359213

URL: http://svn.apache.org/viewcvs?rev=359213&view=rev
Log:
Fix servicemix-components tests

Modified:
    incubator/servicemix/trunk/pom.xml
    incubator/servicemix/trunk/servicemix-components/pom.xml
    incubator/servicemix/trunk/servicemix-components/src/main/resources/META-INF/drools-servicemix.conf
    incubator/servicemix/trunk/servicemix-components/src/main/resources/META-INF/services/org/mule/providers/jbi
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/file/FileTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/xfire/XFireBindingTest.java
    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/jabber/activemqAsServer.xml
    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/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/broker.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/saaj/response.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/wsif/example.xml
    incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/wsif/service.wsdl
    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/publish.xsl
    incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/router-example.xml
    incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/router.xsl
    incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/split.xml
    incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/split.xsl
    incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/components/util/PollingComponentSupport.java

Modified: incubator/servicemix/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/pom.xml?rev=359213&r1=359212&r2=359213&view=diff
==============================================================================
--- incubator/servicemix/trunk/pom.xml (original)
+++ incubator/servicemix/trunk/pom.xml Tue Dec 27 06:39:22 2005
@@ -629,6 +629,11 @@
       </dependency>
       <dependency>
         <groupId>geronimo</groupId>
+        <artifactId>geronimo-activation</artifactId>
+        <version>1.0-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>geronimo</groupId>
         <artifactId>geronimo-common</artifactId>
         <version>1.0-SNAPSHOT</version>
       </dependency>

Modified: incubator/servicemix/trunk/servicemix-components/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/pom.xml?rev=359213&r1=359212&r2=359213&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/pom.xml Tue Dec 27 06:39:22 2005
@@ -146,6 +146,10 @@
       <artifactId>geronimo-connector</artifactId>
     </dependency>
     <dependency>
+      <groupId>geronimo</groupId>
+      <artifactId>geronimo-activation</artifactId>
+    </dependency>
+    <dependency>
       <groupId>geronimo-spec</groupId>
       <artifactId>geronimo-spec-j2ee-management</artifactId>
     </dependency>
@@ -366,4 +370,32 @@
       <artifactId>xstream</artifactId>
     </dependency>
   </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>**/*Test*</include>
+                    </includes>
+                    <excludes>
+                        <!--  exclude abstract tests -->
+                        <exclude>**/Abstract*Test.*</exclude>
+                        
+                        <!--  Need external resources -->
+                        <exclude>**/Jabber*.*</exclude>
+                        <exclude>**/FTP*.*</exclude>
+                        
+                        <!--  These ones can not work, need rewrite -->
+                        <exclude>**/JmsOverJcaWithFullXATest.*</exclude>
+                        
+                        <!-- enable when geronimo has support for attachments -->
+                        <exclude>**/HttpSoapAttachmentsTest.*</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Modified: incubator/servicemix/trunk/servicemix-components/src/main/resources/META-INF/drools-servicemix.conf
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/main/resources/META-INF/drools-servicemix.conf?rev=359213&r1=359212&r2=359213&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/main/resources/META-INF/drools-servicemix.conf
(original)
+++ incubator/servicemix/trunk/servicemix-components/src/main/resources/META-INF/drools-servicemix.conf
Tue Dec 27 06:39:22 2005
@@ -2,6 +2,6 @@
 
 ImportEntry(import)      : org.drools.semantics.base.BaseImportEntryFactory
 ObjectType(class)        : org.drools.semantics.base.ClassObjectTypeFactory
-Condition(condition)     : org.servicemix.components.drools.dsl.JaxenConditionFactory
-Consequence(invoke)     : org.servicemix.components.drools.dsl.InvokeConsequenceFactory
-Consequence(forward)     : org.servicemix.components.drools.dsl.ForwardConsequenceFactory
+Condition(condition)     : org.apache.servicemix.components.drools.dsl.JaxenConditionFactory
+Consequence(invoke)      : org.apache.servicemix.components.drools.dsl.InvokeConsequenceFactory
+Consequence(forward)     : org.apache.servicemix.components.drools.dsl.ForwardConsequenceFactory

Modified: incubator/servicemix/trunk/servicemix-components/src/main/resources/META-INF/services/org/mule/providers/jbi
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/main/resources/META-INF/services/org/mule/providers/jbi?rev=359213&r1=359212&r2=359213&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/main/resources/META-INF/services/org/mule/providers/jbi
(original)
+++ incubator/servicemix/trunk/servicemix-components/src/main/resources/META-INF/services/org/mule/providers/jbi
Tue Dec 27 06:39:22 2005
@@ -1,4 +1,4 @@
-connector=org.servicemix.components.mule.JBIConnector
+connector=org.apache.servicemix.components.mule.JBIConnector
 dispatcher.factory=org.mule.providers.jbi.JBIMessageDispatcherFactory
 message.receiver=org.mule.providers.jbi.JBIMessageReceiver
 message.adapter=org.mule.providers.jbi.JBIMessageAdapter

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/file/FileTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/file/FileTest.java?rev=359213&r1=359212&r2=359213&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/file/FileTest.java
(original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/file/FileTest.java
Tue Dec 27 06:39:22 2005
@@ -30,8 +30,8 @@
 public class FileTest extends TestSupport {
 
 	protected void setUp() throws Exception {
-		super.setUp();
 		FileUtil.deleteFile(new File("target/test-data/file"));
+		super.setUp();
 	}
 	
     public void testSendMessagesToFileSystemThenPoollThem() throws Exception {

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/xfire/XFireBindingTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/xfire/XFireBindingTest.java?rev=359213&r1=359212&r2=359213&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/xfire/XFireBindingTest.java
(original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/xfire/XFireBindingTest.java
Tue Dec 27 06:39:22 2005
@@ -26,7 +26,7 @@
 
     public void testSendingAndReceivingMessagesUsingSpring() throws Exception {
         Object answer = requestServiceWithFileRequest(new QName("http://xfire.components.servicemix.org",
"Echo"),
-                "/org/servicemix/components/xfire/echo.xml");
+                "/org/apache/servicemix/components/xfire/echo.xml");
         assertTrue("Shoud return a DOM Node: " + answer, answer instanceof Node);
         Node node = (Node) answer;
         System.out.println(transformer.toString(node));

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=359213&r1=359212&r2=359213&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
Tue Dec 27 06:39:22 2005
@@ -10,7 +10,7 @@
       <sm:activationSpec componentName="droolsRouter" 
       					 service="foo:droolsRouter">
       	<sm:component><bean class="org.apache.servicemix.components.drools.DroolsComponent">
-        	<property name="ruleBaseResource" value="classpath:org/servicemix/components/drools/rulebase.xml"
/>
+        	<property name="ruleBaseResource" value="classpath:org/apache/servicemix/components/drools/rulebase.xml"
/>
         </bean></sm:component>
       </sm:activationSpec>
       <!-- END 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=359213&r1=359212&r2=359213&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
Tue Dec 27 06:39:22 2005
@@ -10,7 +10,7 @@
       <sm:activationSpec componentName="droolsRouter" 
       					 service="foo:droolsRouter">
       	<sm:component><bean class="org.apache.servicemix.components.drools.DroolsComponent">
-          <property name="ruleBaseResource" value="classpath:org/servicemix/components/drools/jbi-rules-forward.xml"
/>
+          <property name="ruleBaseResource" value="classpath:org/apache/servicemix/components/drools/jbi-rules-forward.xml"
/>
         </bean></sm:component>
       </sm:activationSpec>
       <!-- END 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=359213&r1=359212&r2=359213&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
Tue Dec 27 06:39:22 2005
@@ -10,7 +10,7 @@
       <sm:activationSpec componentName="droolsRouter" 
       					 service="foo:droolsRouter">
       	<sm:component><bean class="org.apache.servicemix.components.drools.DroolsComponent">
-          <property name="ruleBaseResource" value="classpath:org/servicemix/components/drools/jbi-rules.xml"
/>
+          <property name="ruleBaseResource" value="classpath:org/apache/servicemix/components/drools/jbi-rules.xml"
/>
         </bean></sm:component>
       </sm:activationSpec>
       <!-- END SNIPPET: drools -->

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=359213&r1=359212&r2=359213&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
Tue Dec 27 06:39:22 2005
@@ -3,8 +3,8 @@
 	   xmlns:foo="http://servicemix.org/cheese/">
 
   <!-- lets run an embedded broker -->
-  <bean id="broker" class="org.activemq.spring.BrokerFactoryBean">
-    <property name="config" value="classpath:org/servicemix/components/jabber/broker.xml"/>
+  <bean id="broker" class="org.activemq.xbean.BrokerFactoryBean">
+    <property name="config" value="classpath:org/apache/servicemix/components/jabber/broker.xml"/>
   </bean>
 
   <!-- the JBI container -->

Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/broker.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/broker.xml?rev=359213&r1=359212&r2=359213&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/broker.xml
(original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/broker.xml
Tue Dec 27 06:39:22 2005
@@ -1,26 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC  "-//ACTIVEMQ//DTD//EN" "http://activemq.org/dtd/activemq.dtd">
-<beans>
+<beans xmlns="http://activemq.org/config/1.0">
 
-  <!-- ==================================================================== -->
-  <!-- ActiveMQ Broker Configuration -->
-  <!-- ==================================================================== -->
-  <broker>
-    <connector>
-      <serverTransport uri="jabber://localhost:6222"/>
-    </connector>
+  <broker persistent="false">
 
-    <persistence>
-      <!-- you can point this to a different datasource -->
-      <jdbcPersistence dataSourceRef="axion-ds"/>
-    </persistence>
-  </broker>
+    <transportConnectors>
+      <transportConnector uri="tcp://localhost:6222" />
+    </transportConnectors>
 
-  <!-- A simple in memory Axion Datasource for testing -->
+  </broker>
 
-  <bean name="axion-ds" class="org.axiondb.jdbc.AxionDataSource" autowire="constructor">
-    <constructor-arg>
-      <value>jdbc:axiondb:activemq-ramdb</value>
-    </constructor-arg>
-  </bean>
 </beans>

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=359213&r1=359212&r2=359213&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
Tue Dec 27 06:39:22 2005
@@ -3,8 +3,8 @@
 	   xmlns:foo="http://servicemix.org/cheese/">
 
   <!-- lets run an embedded broker -->
-  <bean id="broker" class="org.activemq.spring.BrokerFactoryBean">
-    <property name="config" value="classpath:org/servicemix/components/jabber/broker.xml"/>
+  <bean id="broker" class="org.activemq.xbean.BrokerFactoryBean">
+    <property name="config" value="classpath:org/apache/servicemix/components/jabber/broker.xml"/>
   </bean>
 
   <!-- the JBI container -->

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=359213&r1=359212&r2=359213&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
Tue Dec 27 06:39:22 2005
@@ -3,8 +3,8 @@
 	   xmlns:foo="http://servicemix.org/cheese/">
 
   <!-- lets run an embedded broker -->
-  <bean id="broker" class="org.activemq.spring.BrokerFactoryBean">
-    <property name="config" value="classpath:org/servicemix/components/jabber/broker.xml"/>
+  <bean id="broker" class="org.activemq.xbean.BrokerFactoryBean">
+    <property name="config" value="classpath:org/apache/servicemix/components/jabber/broker.xml"/>
   </bean>
 
   <!-- the JBI container -->

Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jca/broker.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jca/broker.xml?rev=359213&r1=359212&r2=359213&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jca/broker.xml
(original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jca/broker.xml
Tue Dec 27 06:39:22 2005
@@ -1,26 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC  "-//ACTIVEMQ//DTD//EN" "http://activemq.org/dtd/activemq.dtd">
-<beans>
+<beans xmlns="http://activemq.org/config/1.0">
 
-  <!-- ==================================================================== -->
-  <!-- ActiveMQ Broker Configuration -->
-  <!-- ==================================================================== -->
-  <broker>
-    <connector>
-      <tcpServerTransport uri="tcp://localhost:61626" backlog="1000" useAsyncSend="true"
maxOutstandingMessages="50"/>
-    </connector>
+  <broker persistent="false">
 
-    <persistence>
-      <!-- you can point this to a different datasource -->
-      <jdbcPersistence dataSourceRef="axion-ds"/>
-    </persistence>
-  </broker>
+    <transportConnectors>
+      <transportConnector uri="tcp://localhost:61626" />
+    </transportConnectors>
 
-  <!-- A simple in memory Axion Datasource for testing -->
+  </broker>
 
-  <bean name="axion-ds" class="org.axiondb.jdbc.AxionDataSource" autowire="constructor">
-    <constructor-arg>
-      <value>jdbc:axiondb:activemq-ramdb</value>
-    </constructor-arg>
-  </bean>
 </beans>

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=359213&r1=359212&r2=359213&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
Tue Dec 27 06:39:22 2005
@@ -6,8 +6,8 @@
   <!--
   || ActiveMQ Broker
   -->
-  <bean id="broker" class="org.activemq.spring.BrokerFactoryBean" singleton="true">
-    <property name="config" value="classpath:org/servicemix/components/jca/broker.xml"/>
+  <bean id="broker" class="org.activemq.xbean.BrokerFactoryBean" singleton="true">
+    <property name="config" value="classpath:org/apache/servicemix/components/jca/broker.xml"/>
   </bean>
 
   <!-- START SNIPPET: jca -->

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=359213&r1=359212&r2=359213&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
Tue Dec 27 06:39:22 2005
@@ -5,8 +5,8 @@
   <!--
   || ActiveMQ Broker
   -->
-  <bean id="broker" class="org.activemq.spring.BrokerFactoryBean" singleton="true">
-    <property name="config" value="classpath:org/servicemix/components/jca/broker.xml"/>
+  <bean id="broker" class="org.activemq.xbean.BrokerFactoryBean" singleton="true">
+    <property name="config" value="classpath:org/apache/servicemix/components/jca/broker.xml"/>
   </bean>
 
   <!-- START SNIPPET: jca -->

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=359213&r1=359212&r2=359213&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
Tue Dec 27 06:39:22 2005
@@ -5,8 +5,8 @@
   <!--
   || ActiveMQ Broker
   -->
-  <bean id="broker" class="org.activemq.spring.BrokerFactoryBean" singleton="true">
-    <property name="config" value="classpath:org/servicemix/components/jca/broker.xml"/>
+  <bean id="broker" class="org.activemq.xbean.BrokerFactoryBean" singleton="true">
+    <property name="config" value="classpath:org/apache/servicemix/components/jca/broker.xml"/>
   </bean>
 
   <!-- START SNIPPET: jca -->

Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/saaj/response.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/saaj/response.xml?rev=359213&r1=359212&r2=359213&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/saaj/response.xml
(original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/saaj/response.xml
Tue Dec 27 06:39:22 2005
@@ -1,5 +1,5 @@
-<!-- START SNIPPET: example -->
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- START SNIPPET: example -->
 <n:getQuoteResponse xmlns:n="urn:xmethods-delayed-quotes" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <Result xsi:type="xsd:float">3.67</Result>
 </n:getQuoteResponse>

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=359213&r1=359212&r2=359213&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
Tue Dec 27 06:39:22 2005
@@ -2,7 +2,7 @@
 <beans xmlns:sm="http://servicemix.org/config/1.0" 
 	   xmlns:foo="http://servicemix.org/cheese/">
 
-  <sm:container id="jbi">
+  <sm:container id="jbi" flowName="st">
     <sm:activationSpecs>
 
       <sm:activationSpec componentName="sender" service="foo:sender" endpoint="sender"

@@ -21,7 +21,7 @@
 
 System.out.println """
 Groovy script evaluated with the following variables
-context: context
+context: $context
 deliveryChannel: $deliveryChannel
 exchange: $exchange
 inMessage: inMessage

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=359213&r1=359212&r2=359213&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
Tue Dec 27 06:39:22 2005
@@ -9,7 +9,7 @@
       <!-- START SNIPPET: example -->
       <sm:activationSpec componentName="myService" service="foo:myService" endpoint="myService"
destinationService="foo:myServiceImpl">
         <sm:component><bean class="org.apache.servicemix.components.validation.ValidateComponent">
-          <property name="schemaResource" value="classpath:org/servicemix/components/validation/schema.xsd"/>
+          <property name="schemaResource" value="classpath:org/apache/servicemix/components/validation/schema.xsd"/>
         </bean></sm:component>
       </sm:activationSpec>
       <!-- END SNIPPET: example -->

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=359213&r1=359212&r2=359213&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
Tue Dec 27 06:39:22 2005
@@ -4,7 +4,7 @@
 
   <!-- ActiveMQ message broker -->
   <bean id="broker" class="org.activemq.xbean.BrokerFactoryBean">
-    <property name="config" value="classpath:org/servicemix/components/wsif/broker.xml"/>
+    <property name="config" value="classpath:org/apache/servicemix/components/wsif/broker.xml"/>
   </bean>
 
   <!-- JCA container -->
@@ -32,7 +32,7 @@
       <!-- START SNIPPET: wsif -->
       <sm:activationSpec componentName="checkAvailability" service="foo:checkAvailability">
         <sm:component><bean class="org.apache.servicemix.components.wsif.WSIFBinding">
-          <property name="definitionResource" value="classpath:org/servicemix/components/wsif/service.wsdl"/>
+          <property name="definitionResource" value="classpath:org/apache/servicemix/components/wsif/service.wsdl"/>
         </bean></sm:component>
       </sm:activationSpec>
       <!-- END SNIPPET: wsif -->

Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/wsif/service.wsdl
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/wsif/service.wsdl?rev=359213&r1=359212&r2=359213&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/wsif/service.wsdl
(original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/wsif/service.wsdl
Tue Dec 27 06:39:22 2005
@@ -47,7 +47,7 @@
 
       <!-- ActiveMQ configuration -->
       <jms:address destinationStyle="queue"
-        jndiDestinationName="dynamicQueues/test.org.servicemix.example.wsif"
+        jndiDestinationName="dynamicQueues/test.org.apache.servicemix.example.wsif"
         jndiConnectionFactoryName="ConnectionFactory"
         initialContextFactory="org.activemq.jndi.ActiveMQInitialContextFactory"
         jndiProviderURL="tcp://localhost:61626"/>

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=359213&r1=359212&r2=359213&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
Tue Dec 27 06:39:22 2005
@@ -40,7 +40,7 @@
   </bean>
   
   <bean name="OneWayService" class="org.codehaus.xfire.spring.ServiceBean">
-    <property name="service" ref="xfireReceiverService"/>
+    <property name="serviceBean" ref="xfireReceiverService"/>
     <property name="serviceFactory" ref="messageServiceFactory"/>
     <property name="xfire" ref="xfire"/>
   </bean>

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=359213&r1=359212&r2=359213&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
Tue Dec 27 06:39:22 2005
@@ -42,7 +42,7 @@
       <!-- START SNIPPET: xslt -->
       <sm:activationSpec componentName="transformer" service="foo:transformer" destinationService="foo:transformedSender">
         <sm:component><bean class="org.apache.servicemix.components.xslt.XsltComponent">
-          <property name="xsltResource" value="classpath:org/servicemix/components/xslt/transform.xsl"/>
+          <property name="xsltResource" value="classpath:org/apache/servicemix/components/xslt/transform.xsl"/>
         </bean></sm:component>
       </sm:activationSpec>
       <!-- END SNIPPET: xslt -->
@@ -113,7 +113,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="vm://localhost?broker.persistent=false"/>
       </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=359213&r1=359212&r2=359213&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
Tue Dec 27 06:39:22 2005
@@ -23,7 +23,7 @@
 
       <sm:activationSpec componentName="transformer" service="foo:transformer" destinationService="foo:transformedSender">
         <sm:component><bean class="org.apache.servicemix.components.xslt.XsltComponent">
-          <property name="xsltResource" value="classpath:org/servicemix/components/xslt/transform.xsl"/>
+          <property name="xsltResource" value="classpath:org/apache/servicemix/components/xslt/transform.xsl"/>
         </bean></sm:component>
       </sm:activationSpec>
 
@@ -47,7 +47,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="vm://localhost?broker.persistent=false"/>
       </bean>
     </property>
   </bean>

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=359213&r1=359212&r2=359213&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
Tue Dec 27 06:39:22 2005
@@ -9,7 +9,7 @@
       <!-- START SNIPPET: xslt -->
       <sm:activationSpec componentName="transformer" service="foo:transformer">
         <sm:component><bean class="org.apache.servicemix.components.xslt.XsltComponent">
-          <property name="xsltResource" value="classpath:org/servicemix/components/xslt/publish.xsl"/>
+          <property name="xsltResource" value="classpath:org/apache/servicemix/components/xslt/publish.xsl"/>
 
           <!-- lets disable automatic output of the result of the transform; only if we
perform
               an invoke in the XSLT will we invoke another endpoint -->

Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/publish.xsl
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/publish.xsl?rev=359213&r1=359212&r2=359213&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/publish.xsl
(original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/publish.xsl
Tue Dec 27 06:39:22 2005
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!-- START SNIPPET: route -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:jbi="xalan://org.servicemix.components.xslt.XalanExtension"
+                xmlns:jbi="xalan://org.apache.servicemix.components.xslt.XalanExtension"
                 extension-element-prefixes="jbi"
 
                 xmlns:foo="http://servicemix.org/cheese/"

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=359213&r1=359212&r2=359213&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
Tue Dec 27 06:39:22 2005
@@ -9,7 +9,7 @@
       <!-- START SNIPPET: xslt -->
       <sm:activationSpec componentName="transformer" service="foo:transformer">
         <sm:component><bean class="org.apache.servicemix.components.xslt.XsltComponent">
-          <property name="xsltResource" value="classpath:org/servicemix/components/xslt/router.xsl"/>
+          <property name="xsltResource" value="classpath:org/apache/servicemix/components/xslt/router.xsl"/>
 
           <!-- lets disable automatic output of the result of the transform; only if we
perform
               an invoke in the XSLT will we invoke another endpoint -->

Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/router.xsl
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/router.xsl?rev=359213&r1=359212&r2=359213&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/router.xsl
(original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/router.xsl
Tue Dec 27 06:39:22 2005
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!-- START SNIPPET: route -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:jbi="xalan://org.servicemix.components.xslt.XalanExtension"
+  xmlns:jbi="xalan://org.apache.servicemix.components.xslt.XalanExtension"
   extension-element-prefixes="jbi"
 
   xmlns:foo="http://servicemix.org/cheese/"

Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/split.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/split.xml?rev=359213&r1=359212&r2=359213&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/split.xml
(original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/split.xml
Tue Dec 27 06:39:22 2005
@@ -9,7 +9,7 @@
       <!-- START SNIPPET: xslt -->
       <sm:activationSpec componentName="transformer" service="foo:transformer">
         <sm:component><bean class="org.apache.servicemix.components.xslt.XsltComponent">
-          <property name="xsltResource" value="classpath:org/servicemix/components/xslt/split.xsl"/>
+          <property name="xsltResource" value="classpath:org/apache/servicemix/components/xslt/split.xsl"/>
 
           <!-- lets disable automatic output of the result of the transform; only if we
perform
               an invoke in the XSLT will we invoke another endpoint -->

Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/split.xsl
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/split.xsl?rev=359213&r1=359212&r2=359213&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/split.xsl
(original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/split.xsl
Tue Dec 27 06:39:22 2005
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!-- START SNIPPET: example -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:jbi="xalan://org.servicemix.components.xslt.XalanExtension"
+                xmlns:jbi="xalan://org.apache.servicemix.components.xslt.XalanExtension"
                 extension-element-prefixes="jbi"
                 xmlns:foo="http://servicemix.org/cheese/" version="1.0">
 

Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/components/util/PollingComponentSupport.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/components/util/PollingComponentSupport.java?rev=359213&r1=359212&r2=359213&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/components/util/PollingComponentSupport.java
(original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/components/util/PollingComponentSupport.java
Tue Dec 27 06:39:22 2005
@@ -157,7 +157,7 @@
 	        try {
 	            // lets run the work inside the JCA worker pools to ensure
 	            // the threads are setup correctly when we actually do stuff
-	            getWorkManager().scheduleWork(PollingComponentSupport.this);
+	            getWorkManager().doWork(PollingComponentSupport.this);
 	        }
 	        catch (Throwable e) {
 	            log.error("Failed to schedule work: " + e, e);



Mime
View raw message