| Commit in servicemix/base/src/main on MAIN | |||
| java/org/servicemix/components/jms/JmsServiceComponent.java | +10 | -3 | 1.3 -> 1.4 |
| release/examples/bpel/message.soap | +233 | -237 | 1.1 -> 1.2 |
| /activemq.xml | -69 | 1.1 removed | |
| +243 | -309 | ||
fixed the BPEL demo - yay!
servicemix/base/src/main/java/org/servicemix/components/jms
diff -u -r1.3 -r1.4 --- JmsServiceComponent.java 2 Aug 2005 19:55:16 -0000 1.3 +++ JmsServiceComponent.java 5 Aug 2005 10:48:49 -0000 1.4 @@ -1,4 +1,4 @@
-/**
+/**
* * Copyright RAJD Consultanct Ltd *
@@ -45,7 +45,7 @@
* container for processing, and send back the result to the JMS requestor - used for the TopipcRequestor and * QueueRequestor pattern *
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class JmsServiceComponent extends ComponentSupport implements MessageListener, InitializingBean, DisposableBean {
private static final Log log = LogFactory.getLog(JmsServiceComponent.class);
@@ -153,7 +153,7 @@
marshaler.toNMS(inMessage, jmsMessage);
messageExchange.setInMessage(inMessage);
if (getDeliveryChannel().sendSync(messageExchange)) {
- Destination destination = destinationChooser.chooseDestination(messageExchange);
+ Destination destination = getReplyToDestination(jmsMessage, messageExchange);
try {
template.send(destination, new MessageCreator() {
public Message createMessage(Session session) throws JMSException {
@@ -186,6 +186,13 @@
catch (MessagingException e) {
log.error("Failed to process inbound JMS Message: " + jmsMessage, e);
}
+ }
+
+ protected Destination getReplyToDestination(Message jmsMessage, final InOut messageExchange) throws JMSException {
+ if (destinationChooser == null) {
+ return jmsMessage.getJMSReplyTo();
+ }
+ return destinationChooser.chooseDestination(messageExchange);
}
/**
servicemix/base/src/main/release/examples/bpel
diff -u -r1.1 -r1.2 --- message.soap 1 Aug 2005 07:13:29 -0000 1.1 +++ message.soap 5 Aug 2005 10:48:53 -0000 1.2 @@ -1,238 +1,234 @@
<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"> - <SOAP-ENV:Body> - <AllOrders xmlns="uri:com.bptest.types"> - <Order > - <OrderId>$sequence$</OrderId> - <OrderType>BookOrder</OrderType> - <OrderDetails> - <BookOrder> - <id>$sequence$</id> - <author>John Doe</author> - <isbn>abc</isbn> - <title>The World of John Doe</title> - <pages>10</pages> - <price>25</price> - <level>advanced</level> - <publisher>Kaufmann Books and Papers</publisher> - <reviewer>Joe Doe</reviewer> - <coauthor>Mary Doe</coauthor> - <foreword>This is a gripping book $string$</foreword> - <summary>An autobiographical book about John Doe</summary> - <binding>Hardbound</binding> - <copyright>John Doe and Kaufmann Publishers</copyright> - <webvisible>http://www.example.com/johndoe</webvisible> - <legacy>no</legacy> - <specialorder>no</specialorder> - <printingtype>ondemand</printingtype> - <inktype>black toner</inktype> - </BookOrder> - </OrderDetails> - <TrackingNumber/> - </Order> - - <Order> - <OrderId>$sequence$</OrderId> - <OrderType>PaperOrder</OrderType> - <OrderDetails> - <PaperOrder> - <id>$sequence$</id> - <author>John Doe</author> - <isbn>BOOK</isbn> - <title>The World of John Doe</title> - <pages>10</pages> - <price>25</price> - <level>advanced</level> - <publisher>Kaufmann Books and Papers</publisher> - <reviewer>Joe Doe</reviewer> - <coauthor>Mary Doe</coauthor> - <foreword>This is a gripping book</foreword> - <summary>An autobiographical book about John Doe</summary> - <binding>Hardbound</binding> - <copyright>John Doe and Kaufmann Publishers</copyright> - <webvisible>http://www.example.com/johndoe</webvisible> - <legacy>no</legacy> - <specialorder>no</specialorder> - <printingtype>ondemand</printingtype> - <inktype>black toner</inktype> - </PaperOrder> - </OrderDetails> - <TrackingNumber/> - </Order> - - <Order> - <OrderId>$sequence$</OrderId> - <OrderType>BookOrder</OrderType> - <OrderDetails> - <BookOrder> - <id>$sequence$</id> - <author>John Doe</author> - <isbn>BOOK</isbn> - <title>The World of John Doe</title> - <pages>10</pages> - <price>25</price> - <level>advanced</level> - <publisher>Kaufmann Books and Papers</publisher> - <reviewer>Joe Doe</reviewer> - <coauthor>Mary Doe</coauthor> - <foreword>This is a gripping book</foreword> - <summary>An autobiographical book about John Doe</summary> - <binding>Hardbound</binding> - <copyright>John Doe and Kaufmann Publishers</copyright> - <webvisible>http://www.example.com/johndoe</webvisible> - <legacy>no</legacy> - <specialorder>no</specialorder> - <printingtype>ondemand</printingtype> - <inktype>black toner</inktype> - </BookOrder> - </OrderDetails> - <TrackingNumber/> - </Order> - - <Order> - <OrderId>$sequence$</OrderId> - <OrderType>PaperOrder</OrderType> - <OrderDetails> - <PaperOrder> - <id>$sequence$</id> - <author>John Doe</author> - <isbn>BOOK</isbn> - <title>The World of John Doe</title> - <pages>10</pages> - <price>25</price> - <level>advanced</level> - <publisher>Kaufmann Books and Papers</publisher> - <reviewer>Joe Doe</reviewer> - <coauthor>Mary Doe</coauthor> - <foreword>This is a gripping book</foreword> - <summary>An autobiographical book about John Doe</summary> - <binding>Hardbound</binding> - <copyright>John Doe and Kaufmann Publishers</copyright> - <webvisible>http://www.example.com/johndoe</webvisible> - <legacy>no</legacy> - <specialorder>no</specialorder> - <printingtype>ondemand</printingtype> - <inktype>black toner</inktype> - </PaperOrder> - </OrderDetails> - <TrackingNumber/> - </Order> - - <Order> - <OrderId>$sequence$</OrderId> - <OrderType>BookOrder</OrderType> - <OrderDetails> - <BookOrder> - <id>$sequence$</id> - <author>John Doe</author> - <isbn>$rowid$-BOOK-$rowid$</isbn> - <title>The World of John Doe</title> - <pages>30</pages> - <price>25</price> - <level>advanced</level> - <publisher>Kaufmann Books and Papers</publisher> - <reviewer>Joe Doe</reviewer> - <coauthor>Mary Doe</coauthor> - <foreword>This is a gripping book $string$</foreword> - <summary>An autobiographical book about John Doe</summary> - <binding>Hardbound</binding> - <copyright>John Doe and Kaufmann Publishers</copyright> - <webvisible>http://www.example.com/johndoe</webvisible> - <legacy>no</legacy> - <specialorder>no</specialorder> - <printingtype>ondemand</printingtype> - <inktype>black toner</inktype> - </BookOrder> - </OrderDetails> - <TrackingNumber/> - </Order> - - <Order> - <OrderId>$sequence$</OrderId> - <OrderType>PaperOrder</OrderType> - <OrderDetails> - <PaperOrder> - <id>$sequence$</id> - <author>John Doe</author> - <isbn>BOOK</isbn> - <title>The World of John Doe</title> - <pages>900</pages> - <price>25</price> - <level>advanced</level> - <publisher>Kaufmann Books and Papers</publisher> - <reviewer>Joe Doe</reviewer> - <coauthor>Mary Doe</coauthor> - <foreword>This is a gripping book</foreword> - <summary>An autobiographical book about John Doe</summary> - <binding>Hardbound</binding> - <copyright>John Doe and Kaufmann Publishers</copyright> - <webvisible>http://www.example.com/johndoe</webvisible> - <legacy>no</legacy> - <specialorder>no</specialorder> - <printingtype>ondemand</printingtype> - <inktype>black toner</inktype> - </PaperOrder> - </OrderDetails> - <TrackingNumber/> - </Order> - - <Order> - <OrderId>$sequence$</OrderId> - <OrderType>BookOrder</OrderType> - <OrderDetails> - <BookOrder> - <id>$sequence$</id> - <author>John Doe</author> - <isbn>BOOK</isbn> - <title>The World of John Doe</title> - <pages>15</pages> - <price>25</price> - <level>advanced</level> - <publisher>Kaufmann Books and Papers</publisher> - <reviewer>Joe Doe</reviewer> - <coauthor>Mary Doe</coauthor> - <foreword>This is a gripping book</foreword> - <summary>An autobiographical book about John Doe</summary> - <binding>Hardbound</binding> - <copyright>John Doe and Kaufmann Publishers</copyright> - <webvisible>http://www.example.com/johndoe</webvisible> - <legacy>no</legacy> - <specialorder>no</specialorder> - <printingtype>ondemand</printingtype> - <inktype>black toner</inktype> - </BookOrder> - </OrderDetails> - <TrackingNumber/> - </Order> - - <Order> - <OrderId>$sequence$</OrderId> - <OrderType>PaperOrder</OrderType> - <OrderDetails> - <PaperOrder> - <id>$sequence$</id> - <author>John Doe</author> - <isbn>BOOK</isbn> - <title>The World of John Doe</title> - <pages>900</pages> - <price>25</price> - <level>advanced</level> - <publisher>Kaufmann Books and Papers</publisher> - <reviewer>Joe Doe</reviewer> - <coauthor>Mary Doe</coauthor> - <foreword>This is a gripping book</foreword> - <summary>An autobiographical book about John Doe</summary> - <binding>Hardbound</binding> - <copyright>John Doe and Kaufmann Publishers</copyright> - <webvisible>http://www.example.com/johndoe</webvisible> - <legacy>no</legacy> - <specialorder>no</specialorder> - <printingtype>ondemand</printingtype> - <inktype>black toner</inktype> - </PaperOrder> - </OrderDetails> - <TrackingNumber/> - </Order> - </AllOrders> - </SOAP-ENV:Body> -</SOAP-ENV:Envelope>
+<AllOrders xmlns="uri:com.bptest.types"> + <Order> + <OrderId>$sequence$</OrderId> + <OrderType>BookOrder</OrderType> + <OrderDetails> + <BookOrder> + <id>$sequence$</id> + <author>John Doe</author> + <isbn>abc</isbn> + <title>The World of John Doe</title> + <pages>10</pages> + <price>25</price> + <level>advanced</level> + <publisher>Kaufmann Books and Papers</publisher> + <reviewer>Joe Doe</reviewer> + <coauthor>Mary Doe</coauthor> + <foreword>This is a gripping book $string$</foreword> + <summary>An autobiographical book about John Doe</summary> + <binding>Hardbound</binding> + <copyright>John Doe and Kaufmann Publishers</copyright> + <webvisible>http://www.example.com/johndoe</webvisible> + <legacy>no</legacy> + <specialorder>no</specialorder> + <printingtype>ondemand</printingtype> + <inktype>black toner</inktype> + </BookOrder> + </OrderDetails> + <TrackingNumber/> + </Order> + + <Order> + <OrderId>$sequence$</OrderId> + <OrderType>PaperOrder</OrderType> + <OrderDetails> + <PaperOrder> + <id>$sequence$</id> + <author>John Doe</author> + <isbn>BOOK</isbn> + <title>The World of John Doe</title> + <pages>10</pages> + <price>25</price> + <level>advanced</level> + <publisher>Kaufmann Books and Papers</publisher> + <reviewer>Joe Doe</reviewer> + <coauthor>Mary Doe</coauthor> + <foreword>This is a gripping book</foreword> + <summary>An autobiographical book about John Doe</summary> + <binding>Hardbound</binding> + <copyright>John Doe and Kaufmann Publishers</copyright> + <webvisible>http://www.example.com/johndoe</webvisible> + <legacy>no</legacy> + <specialorder>no</specialorder> + <printingtype>ondemand</printingtype> + <inktype>black toner</inktype> + </PaperOrder> + </OrderDetails> + <TrackingNumber/> + </Order> + + <Order> + <OrderId>$sequence$</OrderId> + <OrderType>BookOrder</OrderType> + <OrderDetails> + <BookOrder> + <id>$sequence$</id> + <author>John Doe</author> + <isbn>BOOK</isbn> + <title>The World of John Doe</title> + <pages>10</pages> + <price>25</price> + <level>advanced</level> + <publisher>Kaufmann Books and Papers</publisher> + <reviewer>Joe Doe</reviewer> + <coauthor>Mary Doe</coauthor> + <foreword>This is a gripping book</foreword> + <summary>An autobiographical book about John Doe</summary> + <binding>Hardbound</binding> + <copyright>John Doe and Kaufmann Publishers</copyright> + <webvisible>http://www.example.com/johndoe</webvisible> + <legacy>no</legacy> + <specialorder>no</specialorder> + <printingtype>ondemand</printingtype> + <inktype>black toner</inktype> + </BookOrder> + </OrderDetails> + <TrackingNumber/> + </Order> + + <Order> + <OrderId>$sequence$</OrderId> + <OrderType>PaperOrder</OrderType> + <OrderDetails> + <PaperOrder> + <id>$sequence$</id> + <author>John Doe</author> + <isbn>BOOK</isbn> + <title>The World of John Doe</title> + <pages>10</pages> + <price>25</price> + <level>advanced</level> + <publisher>Kaufmann Books and Papers</publisher> + <reviewer>Joe Doe</reviewer> + <coauthor>Mary Doe</coauthor> + <foreword>This is a gripping book</foreword> + <summary>An autobiographical book about John Doe</summary> + <binding>Hardbound</binding> + <copyright>John Doe and Kaufmann Publishers</copyright> + <webvisible>http://www.example.com/johndoe</webvisible> + <legacy>no</legacy> + <specialorder>no</specialorder> + <printingtype>ondemand</printingtype> + <inktype>black toner</inktype> + </PaperOrder> + </OrderDetails> + <TrackingNumber/> + </Order> + + <Order> + <OrderId>$sequence$</OrderId> + <OrderType>BookOrder</OrderType> + <OrderDetails> + <BookOrder> + <id>$sequence$</id> + <author>John Doe</author> + <isbn>$rowid$-BOOK-$rowid$</isbn> + <title>The World of John Doe</title> + <pages>30</pages> + <price>25</price> + <level>advanced</level> + <publisher>Kaufmann Books and Papers</publisher> + <reviewer>Joe Doe</reviewer> + <coauthor>Mary Doe</coauthor> + <foreword>This is a gripping book $string$</foreword> + <summary>An autobiographical book about John Doe</summary> + <binding>Hardbound</binding> + <copyright>John Doe and Kaufmann Publishers</copyright> + <webvisible>http://www.example.com/johndoe</webvisible> + <legacy>no</legacy> + <specialorder>no</specialorder> + <printingtype>ondemand</printingtype> + <inktype>black toner</inktype> + </BookOrder> + </OrderDetails> + <TrackingNumber/> + </Order> + + <Order> + <OrderId>$sequence$</OrderId> + <OrderType>PaperOrder</OrderType> + <OrderDetails> + <PaperOrder> + <id>$sequence$</id> + <author>John Doe</author> + <isbn>BOOK</isbn> + <title>The World of John Doe</title> + <pages>900</pages> + <price>25</price> + <level>advanced</level> + <publisher>Kaufmann Books and Papers</publisher> + <reviewer>Joe Doe</reviewer> + <coauthor>Mary Doe</coauthor> + <foreword>This is a gripping book</foreword> + <summary>An autobiographical book about John Doe</summary> + <binding>Hardbound</binding> + <copyright>John Doe and Kaufmann Publishers</copyright> + <webvisible>http://www.example.com/johndoe</webvisible> + <legacy>no</legacy> + <specialorder>no</specialorder> + <printingtype>ondemand</printingtype> + <inktype>black toner</inktype> + </PaperOrder> + </OrderDetails> + <TrackingNumber/> + </Order> + + <Order> + <OrderId>$sequence$</OrderId> + <OrderType>BookOrder</OrderType> + <OrderDetails> + <BookOrder> + <id>$sequence$</id> + <author>John Doe</author> + <isbn>BOOK</isbn> + <title>The World of John Doe</title> + <pages>15</pages> + <price>25</price> + <level>advanced</level> + <publisher>Kaufmann Books and Papers</publisher> + <reviewer>Joe Doe</reviewer> + <coauthor>Mary Doe</coauthor> + <foreword>This is a gripping book</foreword> + <summary>An autobiographical book about John Doe</summary> + <binding>Hardbound</binding> + <copyright>John Doe and Kaufmann Publishers</copyright> + <webvisible>http://www.example.com/johndoe</webvisible> + <legacy>no</legacy> + <specialorder>no</specialorder> + <printingtype>ondemand</printingtype> + <inktype>black toner</inktype> + </BookOrder> + </OrderDetails> + <TrackingNumber/> + </Order> + + <Order> + <OrderId>$sequence$</OrderId> + <OrderType>PaperOrder</OrderType> + <OrderDetails> + <PaperOrder> + <id>$sequence$</id> + <author>John Doe</author> + <isbn>BOOK</isbn> + <title>The World of John Doe</title> + <pages>900</pages> + <price>25</price> + <level>advanced</level> + <publisher>Kaufmann Books and Papers</publisher> + <reviewer>Joe Doe</reviewer> + <coauthor>Mary Doe</coauthor> + <foreword>This is a gripping book</foreword> + <summary>An autobiographical book about John Doe</summary> + <binding>Hardbound</binding> + <copyright>John Doe and Kaufmann Publishers</copyright> + <webvisible>http://www.example.com/johndoe</webvisible> + <legacy>no</legacy> + <specialorder>no</specialorder> + <printingtype>ondemand</printingtype> + <inktype>black toner</inktype> + </PaperOrder> + </OrderDetails> + <TrackingNumber/> + </Order> +</AllOrders>
servicemix/base/src/main/release/examples/bpel
activemq.xml removed after 1.1
diff -N activemq.xml --- activemq.xml 1 Aug 2005 07:13:29 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE beans PUBLIC "-//ACTIVEMQ//DTD//EN" "http://activemq.org/dtd/activemq.dtd"> -<beans> - - <!-- ==================================================================== --> - <!-- ActiveMQ Broker Configuration --> - <!-- ==================================================================== --> - <broker> - <connector> - <tcpServerTransport uri="tcp://localhost:61616" backlog="1000" useAsyncSend="true" maxOutstandingMessages="50"/> - </connector> - - <persistence> - <cachePersistence> - <journalPersistence directory="../var/journal"> - <jdbcPersistence dataSourceRef="derby-ds"/> - </journalPersistence> - </cachePersistence> - </persistence> - </broker> - - <!-- ==================================================================== --> - <!-- JDBC DataSource Configurations --> - <!-- ==================================================================== --> - - <!-- The Derby Datasource that will be used by the Broker --> - <bean id="derby-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close"> - <property name="driverClassName"> - <value>org.apache.derby.jdbc.EmbeddedDriver</value> - </property> - <property name="url"> - <!-- Use a URL like 'jdbc:hsqldb:hsql://localhost:9001' if you want to connect to a remote hsqldb --> - <value>jdbc:derby:derbydb;create=true</value> - </property> - <property name="username"> - <value></value> - </property> - <property name="password"> - <value></value> - </property> - <property name="poolPreparedStatements"> - <value>true</value> - </property> - </bean> - - <!-- The MYSQL Datasource that will be used by the Broker --> - <bean id="mysql-ds" - class="org.apache.commons.dbcp.BasicDataSource" - destroy-method="close"> - <property name="driverClassName"> - <value>com.mysql.jdbc.Driver</value> - </property> - <property name="url"> - <value>jdbc:mysql://localhost/activemq</value> - </property> - <property name="username"> - <value>myname</value> - </property> - <property name="password"> - <value>mypassword</value> - </property> - <property name="poolPreparedStatements"> - <value>true</value> - </property> - </bean> - - -</beans> -
