diff --git a/applications/cafe/README.md b/applications/cafe/README.md index b37998df..c63b4ef6 100644 --- a/applications/cafe/README.md +++ b/applications/cafe/README.md @@ -1,36 +1,39 @@ -Cafe Sample Application +Café Sample Application ======================= -The Cafe sample emulates a simple operation of the Coffee shop when modeled using Enterprise Integration Patterns (EIP). It is inspired by one of the samples featured in Gregor Hohpe's Ramblings (see Starbucks Does Not Use Two-Phase Commit: http://www.eaipatterns.com/ramblings/18_starbucks.html). The domain is that of a Cafe, and the basic flow is depicted in the following diagram: +## Overview + +The *Café Sample* emulates the simple operation of a coffee shop that is modeled using *[Enterprise Integration Patterns][]* (EIP). The sample is inspired by one of the samples featured in [Gregor Hohpe][]'s ramblings. For more details, please see: *[Starbucks Does Not Use Two-Phase Commit][]*. The domain is that of a [café][], and the basic flow is depicted in the following diagram: Barista - hotDrinks ____________________ + hotDrinks ____________________ |==========| -->| | orders drinks / | prepareHotDrink() | Place Order ->Cafe->|======|->OrderSplitter->|======|->DrinkRouter | | \ coldDrinks | prepareColdDrink() | |==========| -->| | |____________________| - - Legend: |====| - channels - + + Legend: |====| - channels + -The Order object may contain multiple OrderItems. Once the order is placed, a **Splitter** will break the composite order message into a single message per drink. Each of these is then processed by a **Router** that determines whether the drink is hot or cold (checking the OrderItem object's 'isIced' property). The Barista prepares each drink, but hot and cold drink preparation are handled by two distinct methods: +The *Order* object may contain multiple *OrderItems*. Once the order is placed, a **Splitter** will break the composite order message into a single message per drink. Each of these is then processed by a **Router** that determines whether the drink is hot or cold (checking the *OrderItem* object's 'isIced' property). The *Barista* prepares each drink, but hot and cold drink preparation are handled by two distinct methods: * prepareHotDrink * prepareColdDrink -The prepared drinks are then sent to the Waiter where they are aggregated into a Delivery object. +The prepared drinks are then sent to the *Waiter* where they are aggregated into a *Delivery* object. -## Cafe Sample Implementations -There are currently three implementations of the cafe sample: +## Café Sample Implementations -1. Using Spring Integration channels and components -2. Using AMQP/RabbitMQ to demonstrate a distributed architecture -3. Using JMS/ActiveMQ to demonstrate jms-backed queues and a distributed architecture +There are currently three implementations of the *Café Sample* that use: -All three implementations follow the same flow described above. See each one's README.md file for more details about the respective implementations. +1. Spring Integration channels and components +2. [AMQP][] ([RabbitMQ][]) to demonstrate a distributed architecture +3. [JMS][] ([ActiveMQ][]) to demonstrate JMS-backed queues and a distributed architecture + +All three implementations follow the same flow described above. See each one's **README.md** file for more details regarding the respective implementations. Upon running any of the alternatives, you should see the output similar to this: @@ -55,4 +58,13 @@ Upon running any of the alternatives, you should see the output similar to this: Iced MOCHA, 3 shots. Hot LATTE, 2 shots. -Happy integration :-) \ No newline at end of file +Happy integration :-) + +[ActiveMQ]: http://activemq.apache.org/ +[AMQP]: http://en.wikipedia.org/wiki/Advanced_Message_Queuing_Protocol +[café]: http://en.wikipedia.org/wiki/Caf%C3%A9 +[Enterprise Integration Patterns]: http://www.eaipatterns.com/eaipatterns.html +[Gregor Hohpe]: http://www.eaipatterns.com/gregor.html +[JMS]: http://en.wikipedia.org/wiki/Java_Message_Service +[RabbitMQ]: http://www.rabbitmq.com/ +[Starbucks Does Not Use Two-Phase Commit]: http://www.eaipatterns.com/ramblings/18_starbucks.html diff --git a/applications/cafe/cafe-amqp/README.md b/applications/cafe/cafe-amqp/README.md index d035e3f1..bdc2a03c 100644 --- a/applications/cafe/cafe-amqp/README.md +++ b/applications/cafe/cafe-amqp/README.md @@ -1,11 +1,11 @@ -Cafe Sample Application - AMQP Implementation -======================= +Café Sample Application - AMQP Implementation +============================================= See the parent-level README.md for more details, but the flow of the implementation should follow this diagram: Barista - hotDrinks ____________________ + hotDrinks ____________________ |==========| -->| | orders drinks / | prepareHotDrink() | Place Order ->Cafe->|======|->OrderSplitter->|======|->DrinkRouter | | @@ -13,17 +13,17 @@ See the parent-level README.md for more details, but the flow of the implementat |==========| -->| | |____________________| - Legend: |====| - channels + Legend: |====| - channels ## Instructions for running the CafeDemo AMQP sample ### Distributed components To run this alternative configuration of the sample, be sure to have a RabbitMQ broker started on localhost:5672 configured with the default guest|guest client credentials on the / vHost, then execute the following test classes in order: - + 1. **cafeDemoAppBaristaColdAmqp** - starts the Cold Drink Barista 2. **cafeDemoAppBaristaHotAmqp** - starts the Hot Drink Barista 3. **cafeDemoAppAmqp** - starts the Cafe Storefront (Places 100 orders on the orders queue) 4. **cafeDemoAppOperationsAmqp** - starts the Cafe Operations (OrderSplitter, DrinkRouter, PreparedDrinkAggregator) - + **Note**: All AMQP exchanges, queues, and bindings needed for this sample are defined within the different xml config files that support the above test classes. diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 1256ba8f..6b3fb242 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -1,35 +1,35 @@ - 4.0.0 - - cafe - org.springframework.integration.samples - 2.1.0.BUILD-SNAPSHOT - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + cafe + org.springframework.integration.samples + 2.1.0.BUILD-SNAPSHOT + - cafe-amqp + cafe-amqp - Cafe - With AMQP Message Broker - - This module implements the cafe sample using spring-integration components backed - by an AMQP message broker for message persistence and component distribution. This - sample uses RabbitMQ broker, but any AMQP message broker can be used. For an example - using JMS, see the JMS implemenation of the cafe sample. - + Cafe - With AMQP Message Broker + + This module implements the cafe sample using spring-integration components backed + by an AMQP message broker for message persistence and component distribution. This + sample uses RabbitMQ broker, but any AMQP message broker can be used. For an example + using JMS, see the JMS implementation of the cafe sample. + - - - ${project.parent.groupId} - cafe-si - ${project.parent.version} - + + + ${project.parent.groupId} + cafe-si + ${project.parent.version} + org.springframework.integration spring-integration-amqp ${spring.integration.version} - + - \ No newline at end of file + diff --git a/applications/cafe/cafe-amqp/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppAmqp.java b/applications/cafe/cafe-amqp/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppAmqp.java index 58bced01..9ad82701 100644 --- a/applications/cafe/cafe-amqp/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppAmqp.java +++ b/applications/cafe/cafe-amqp/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppAmqp.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,23 +22,23 @@ import org.springframework.integration.samples.cafe.DrinkType; import org.springframework.integration.samples.cafe.Order; /** - * Provides the 'main' method for running the Cafe Demo store front - * application using AMQP. Before running, be sure to have a - * RabbitMQ broker started on localhost:5672 configured with the default - * guest | guest client credentials on the / vHost. When an order is + * Provides the 'main' method for running the Cafe Demo store front + * application using AMQP. Before running, be sure to have a + * RabbitMQ broker started on localhost:5672 configured with the default + * guest | guest client credentials on the / vHost. When an order is * placed, the Cafe store front will publish that order on the cafe-orders * exchange to be processed. *

* The relevant components are defined within the configuration files: - * ("cafeDemo-amqp-xml.xml", "cafeDemo-amqp-config-xml.xml"). + * ("cafeDemo-amqp-xml.xml", "cafeDemo-amqp-config-xml.xml"). *

* If deploying in SpringSource dmServer, the relevant ApplicationContext * configuration is in the META-INF/spring directory instead. - * + * * @author Tom McCuch */ -public class CafeDemoAppAmqp { - +public class CafeDemoAppAmqp { + /** * place some orders * @param context spring context @@ -55,9 +55,9 @@ public class CafeDemoAppAmqp { } public static void main(String[] args) { - AbstractApplicationContext context = + AbstractApplicationContext context = CafeDemoAppUtilities.loadProfileContext( - "/META-INF/spring/integration/amqp/cafeDemo-amqp-xml.xml", + "/META-INF/spring/integration/amqp/cafeDemo-amqp-xml.xml", CafeDemoAppAmqp.class,CafeDemoAppUtilities.DEV); order(context, 100); context.close(); diff --git a/applications/cafe/cafe-amqp/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppBaristaColdAmqp.java b/applications/cafe/cafe-amqp/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppBaristaColdAmqp.java index 168c5542..12263196 100644 --- a/applications/cafe/cafe-amqp/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppBaristaColdAmqp.java +++ b/applications/cafe/cafe-amqp/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppBaristaColdAmqp.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,10 +21,10 @@ import java.io.IOException; import org.springframework.context.support.AbstractApplicationContext; /** - * Provides the 'main' method for running the Cafe Demo Cold Drink - * Barista application using AMQP. Before running, be sure to have a - * RabbitMQ broker started on localhost:5672 configured with the default - * guest | guest client credentials on the / vHost. When a drink order + * Provides the 'main' method for running the Cafe Demo Cold Drink + * Barista application using AMQP. Before running, be sure to have a + * RabbitMQ broker started on localhost:5672 configured with the default + * guest | guest client credentials on the / vHost. When a drink order * is placed on the cold-drinks queue, the Barista will prepare the drink * and reply to the reply-to queue set by the sender. *

@@ -33,23 +33,26 @@ import org.springframework.context.support.AbstractApplicationContext; *

* If deploying in SpringSource dmServer, the relevant ApplicationContext * configuration is in the META-INF/spring directory instead. - * + * * @author Tom McCuch */ public class CafeDemoAppBaristaColdAmqp { public static void main(String[] args) { - AbstractApplicationContext context = + AbstractApplicationContext context = CafeDemoAppUtilities.loadProfileContext( - "/META-INF/spring/integration/amqp/cafeDemo-amqp-baristaCold-xml.xml", - CafeDemoAppBaristaColdAmqp.class,CafeDemoAppUtilities.DEV); - + "/META-INF/spring/integration/amqp/cafeDemo-amqp-baristaCold-xml.xml", + CafeDemoAppBaristaColdAmqp.class,CafeDemoAppUtilities.DEV); + System.out.println("Press Enter/Return in the console to exit the Barista Cold App"); + try { System.in.read(); - } catch (IOException e) { + } + catch (IOException e) { context.close(); } + context.close(); } } diff --git a/applications/cafe/cafe-amqp/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppBaristaHotAmqp.java b/applications/cafe/cafe-amqp/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppBaristaHotAmqp.java index 6ca6935e..5cb28717 100644 --- a/applications/cafe/cafe-amqp/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppBaristaHotAmqp.java +++ b/applications/cafe/cafe-amqp/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppBaristaHotAmqp.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,10 +21,10 @@ import java.io.IOException; import org.springframework.context.support.AbstractApplicationContext; /** - * Provides the 'main' method for running the Cafe Demo Hot Drink - * Barista application using AMQP. Before running, be sure to have a - * RabbitMQ broker started on localhost:5672 configured with the default - * guest | guest client credentials on the / vHost. When a drink order + * Provides the 'main' method for running the Cafe Demo Hot Drink + * Barista application using AMQP. Before running, be sure to have a + * RabbitMQ broker started on localhost:5672 configured with the default + * guest | guest client credentials on the / vHost. When a drink order * is placed on the hot-drinks queue, the Barista will prepare the drink * and reply to the reply-to queue set by the sender. *

@@ -33,21 +33,23 @@ import org.springframework.context.support.AbstractApplicationContext; *

* If deploying in SpringSource dmServer, the relevant ApplicationContext * configuration is in the META-INF/spring directory instead. - * + * * @author Tom McCuch */ public class CafeDemoAppBaristaHotAmqp { public static void main(String[] args) { - AbstractApplicationContext context = + AbstractApplicationContext context = CafeDemoAppUtilities.loadProfileContext( - "/META-INF/spring/integration/amqp/cafeDemo-amqp-baristaHot-xml.xml", + "/META-INF/spring/integration/amqp/cafeDemo-amqp-baristaHot-xml.xml", CafeDemoAppBaristaHotAmqp.class,CafeDemoAppUtilities.DEV); - + System.out.println("Press Enter/Return in the console to exit the Barista Hot App"); + try { System.in.read(); - } catch (IOException e) { + } + catch (IOException e) { context.close(); } context.close(); diff --git a/applications/cafe/cafe-amqp/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppOperationsAmqp.java b/applications/cafe/cafe-amqp/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppOperationsAmqp.java index 87f736c9..d6df0642 100644 --- a/applications/cafe/cafe-amqp/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppOperationsAmqp.java +++ b/applications/cafe/cafe-amqp/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppOperationsAmqp.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,10 +21,10 @@ import java.io.IOException; import org.springframework.context.support.AbstractApplicationContext; /** - * Provides the 'main' method for running the Cafe Demo Operations - * application using AMQP. Before running, be sure to have a RabbitMQ - * broker started on localhost:5672 configured with the default - * guest | guest client credentials on the / vHost. When an order is + * Provides the 'main' method for running the Cafe Demo Operations + * application using AMQP. Before running, be sure to have a RabbitMQ + * broker started on localhost:5672 configured with the default + * guest | guest client credentials on the / vHost. When an order is * placed on the new-orders queue, the Cafe Operations app will split * the order into order line items, route them to either the coldDrink * or hotDrink Barista, aggregate the prepared drinks returned from the @@ -32,28 +32,29 @@ import org.springframework.context.support.AbstractApplicationContext; * cafe-deliveries exchange. *

* The relevant components are defined within the configuration files: - * ("cafeDemo-amqp-operations-xml.xml", "cafeDemo-amqp-config-xml.xml"). + * ("cafeDemo-amqp-operations-xml.xml", "cafeDemo-amqp-config-xml.xml"). *

* Before starting this app, be sure to start the CafeDemoAppBaristaCold * and CafeDemoAppBaristaHot apps first. - * + * * If deploying in SpringSource dmServer, the relevant ApplicationContext * configuration is in the META-INF/spring directory instead. - * + * * @author Tom McCuch */ public class CafeDemoAppOperationsAmqp { public static void main(String[] args) { - AbstractApplicationContext context = + AbstractApplicationContext context = CafeDemoAppUtilities.loadProfileContext( - "/META-INF/spring/integration/amqp/cafeDemo-amqp-operations-xml.xml", + "/META-INF/spring/integration/amqp/cafeDemo-amqp-operations-xml.xml", CafeDemoAppOperationsAmqp.class,CafeDemoAppUtilities.DEV); - System.out.println("Press Enter/Return in the console to exit the Cafe Operations App"); + try { System.in.read(); - } catch (IOException e) { + } + catch (IOException e) { context.close(); } context.close(); diff --git a/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-baristaCold-xml.xml b/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-baristaCold-xml.xml index cd745a9d..d376353d 100644 --- a/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-baristaCold-xml.xml +++ b/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-baristaCold-xml.xml @@ -1,20 +1,20 @@ @@ -24,10 +24,10 @@ - @@ -38,15 +38,15 @@ - + - - - + + + diff --git a/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-baristaHot-xml.xml b/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-baristaHot-xml.xml index 81d84541..8893a8b6 100644 --- a/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-baristaHot-xml.xml +++ b/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-baristaHot-xml.xml @@ -1,20 +1,20 @@ @@ -24,10 +24,10 @@ - @@ -45,8 +45,8 @@ - - - + + + \ No newline at end of file diff --git a/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-config-xml.xml b/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-config-xml.xml index 652882a2..f20a517b 100644 --- a/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-config-xml.xml +++ b/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-config-xml.xml @@ -1,39 +1,36 @@ - - + + - - + + - - - - - - + - - - - - - - - + + + + + + + + + + + + + diff --git a/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-operations-xml.xml b/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-operations-xml.xml index 6725f790..63e4623e 100644 --- a/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-operations-xml.xml +++ b/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-operations-xml.xml @@ -1,20 +1,20 @@ @@ -23,12 +23,12 @@ - + - - + + - + @@ -47,36 +47,36 @@ - + - - + - - + - + - - - + + + @@ -87,7 +87,7 @@ - + - + - - + + - - + + + \ No newline at end of file diff --git a/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-xml.xml b/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-xml.xml index c4ad9717..9675b997 100644 --- a/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-xml.xml +++ b/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-xml.xml @@ -1,20 +1,20 @@ @@ -24,7 +24,7 @@ - + @@ -32,16 +32,16 @@ - + - + - - + exchange-name="cafe-orders" + routing-key-expression="'order.'+headers.NUMBER" + amqp-template="amqpTemplate" /> + @@ -49,8 +49,8 @@ - - - + + + \ No newline at end of file diff --git a/applications/cafe/cafe-jms/README.md b/applications/cafe/cafe-jms/README.md index d891cfe2..86444fb8 100644 --- a/applications/cafe/cafe-jms/README.md +++ b/applications/cafe/cafe-jms/README.md @@ -1,19 +1,19 @@ -Cafe Sample Application - JMS Implementation -======================= +Café Sample Application - JMS Implementation +============================================ -See the parent-level README.md for more details, but the flow of the implementation should follow this diagram: +See the parent-level **README.md** for more details, but the flow of the implementation should follow this diagram: Barista - hotDrinks ____________________ + hotDrinks ____________________ |==========| -->| | orders drinks / | prepareHotDrink() | Place Order ->Cafe->|======|->OrderSplitter->|======|->DrinkRouter | | \ coldDrinks | prepareColdDrink() | |==========| -->| | |____________________| - - Legend: |====| - channels + + Legend: |====| - channels ## Instructions for running the CafeDemo JMS sample diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 2bacad05..3c90b291 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -1,48 +1,47 @@ - 4.0.0 - - org.springframework.integration.samples - cafe - 2.1.0.BUILD-SNAPSHOT - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.springframework.integration.samples + cafe + 2.1.0.BUILD-SNAPSHOT + - cafe-jms + cafe-jms + Cafe - With JMS Message Broker - Cafe - With JMS Message Broker - - This module implements the cafe sample using spring-integration components backed - by a JMS broker for persistent messaging as well as component distribution. This - sample uses ActiveMQ as the JMS broker, but any JMS-compliant broker can be - used. For an example using AMQP, see the AMQP implementation of the cafe sample. - + + This module implements the cafe sample using spring-integration components backed + by a JMS broker for persistent messaging as well as component distribution. This + sample uses ActiveMQ as the JMS broker, but any JMS-compliant broker can be + used. For an example using AMQP, see the AMQP implementation of the cafe sample. + - - 5.4.3 - - - - org.apache.activemq - activemq-all - ${activemq.version} - - - org.apache.xbean - xbean-spring - 3.9 - - + + 5.6.0 + + + + org.apache.activemq + activemq-all + ${activemq.version} + + + org.apache.xbean + xbean-spring + 3.11.1 + + org.springframework.integration spring-integration-jms ${spring.integration.version} - - ${project.parent.groupId} - cafe-si - ${project.parent.version} - - - - \ No newline at end of file + + ${project.parent.groupId} + cafe-si + ${project.parent.version} + + + diff --git a/applications/cafe/cafe-jms/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoActiveMQBackedChannels.java b/applications/cafe/cafe-jms/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoActiveMQBackedChannels.java index 8ae29da1..0520fe26 100644 --- a/applications/cafe/cafe-jms/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoActiveMQBackedChannels.java +++ b/applications/cafe/cafe-jms/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoActiveMQBackedChannels.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2012 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.integration.samples.cafe.xml; import org.springframework.context.support.AbstractApplicationContext; @@ -13,14 +28,15 @@ import java.io.IOException; * is running, simply press or any other key to end the application. To fully experience the * benefits of this solution, try halting/exiting the program in the middle of running it, comment out the * call to place new orders (the order() function call) and watch that the processing still continues - * where it left off when you halted it. This is because the messages are persisted in the ActiveMQ queues + * where it left off when you halted it. This is because the messages are persisted in the ActiveMQ queues. * - * @author ceposta + * @author Christian Posta */ public class CafeDemoActiveMQBackedChannels { /** - * place some orders + * Place some orders. + * * @param context spring context * @param count the number of standard orders */ @@ -35,13 +51,14 @@ public class CafeDemoActiveMQBackedChannels { } public static void main(String[] args) throws InterruptedException, IOException { - AbstractApplicationContext context = new ClassPathXmlApplicationContext("/META-INF/spring/integration/activemq/cafeDemo-amq-config.xml", - "/META-INF/spring/integration/activemq/cafeDemo-amq-jms-backed.xml"); + AbstractApplicationContext context = new ClassPathXmlApplicationContext( + "/META-INF/spring/integration/activemq/cafeDemo-amq-config.xml", + "/META-INF/spring/integration/activemq/cafeDemo-amq-jms-backed.xml"); - // comment this out to run the sample without placing any new orders on the queue - order(context, 25); + // comment this out to run the sample without placing any new orders on the queue + order(context, 25); - System.in.read(); - context.close(); - } + System.in.read(); + context.close(); + } } diff --git a/applications/cafe/cafe-jms/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppActiveMQ.java b/applications/cafe/cafe-jms/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppActiveMQ.java index f181a49a..7171ceb3 100644 --- a/applications/cafe/cafe-jms/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppActiveMQ.java +++ b/applications/cafe/cafe-jms/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppActiveMQ.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2012 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.integration.samples.cafe.xml; import org.springframework.context.support.AbstractApplicationContext; @@ -11,14 +26,15 @@ import java.io.IOException; /** * Main class for sending orders that will be handled in separate, distributed * processes. See the README.md file for more information on the order in which - * to start the processes + * to start the processes. * - * @author ceposta + * @author Christian Posta */ public class CafeDemoAppActiveMQ { /** - * place some orders + * Place some orders. + * * @param context spring context * @param count the number of standard orders */ @@ -33,9 +49,10 @@ public class CafeDemoAppActiveMQ { } public static void main(String[] args) throws InterruptedException, IOException { - AbstractApplicationContext context = new ClassPathXmlApplicationContext("/META-INF/spring/integration/activemq/cafeDemo-amq-config.xml", - "/META-INF/spring/integration/activemq/cafeDemo-amq-xml.xml"); - order(context, 25); - context.close(); - } + AbstractApplicationContext context = new ClassPathXmlApplicationContext( + "/META-INF/spring/integration/activemq/cafeDemo-amq-config.xml", + "/META-INF/spring/integration/activemq/cafeDemo-amq-xml.xml"); + order(context, 25); + context.close(); + } } diff --git a/applications/cafe/cafe-jms/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppBaristaColdActiveMQ.java b/applications/cafe/cafe-jms/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppBaristaColdActiveMQ.java index 63f80771..bb00404a 100644 --- a/applications/cafe/cafe-jms/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppBaristaColdActiveMQ.java +++ b/applications/cafe/cafe-jms/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppBaristaColdActiveMQ.java @@ -1,29 +1,43 @@ +/* + * Copyright 2002-2012 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.integration.samples.cafe.xml; +import java.io.IOException; + import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.samples.cafe.Cafe; -import org.springframework.integration.samples.cafe.DrinkType; -import org.springframework.integration.samples.cafe.Order; - -import java.io.IOException; /** * Main class for starting up the distributed task of handling/creating the Cold * beverages. See the README.md file for more information on the order in which - * to start the processes + * to start the processes. * - * @author ceposta + * @author Christian Posta */ public class CafeDemoAppBaristaColdActiveMQ { public static void main(String[] args) throws InterruptedException, IOException { - AbstractApplicationContext context = new ClassPathXmlApplicationContext("/META-INF/spring/integration/activemq/cafeDemo-amq-config.xml", - "/META-INF/spring/integration/activemq/cafeDemo-amq-baristaCold-xml.xml"); + AbstractApplicationContext context = new ClassPathXmlApplicationContext( + "/META-INF/spring/integration/activemq/cafeDemo-amq-config.xml", + "/META-INF/spring/integration/activemq/cafeDemo-amq-baristaCold-xml.xml"); + + System.out.println("Press Enter/Return to exit"); + System.in.read(); + context.close(); + } - System.out.println("Press Enter/Return to exit"); - System.in.read(); - context.close(); - } } diff --git a/applications/cafe/cafe-jms/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppBaristaHotActiveMQ.java b/applications/cafe/cafe-jms/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppBaristaHotActiveMQ.java index 3a44d913..3f1d15a3 100644 --- a/applications/cafe/cafe-jms/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppBaristaHotActiveMQ.java +++ b/applications/cafe/cafe-jms/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppBaristaHotActiveMQ.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2012 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.integration.samples.cafe.xml; import org.springframework.context.support.AbstractApplicationContext; @@ -8,19 +23,20 @@ import java.io.IOException; /** * Main class for starting up the distributed task of handling/creating the Hot¡ * beverages. See the README.md file for more information on the order in which - * to start the processes + * to start the processes. * - * @author ceposta + * @author Christian Posta */ public class CafeDemoAppBaristaHotActiveMQ { public static void main(String[] args) throws InterruptedException, IOException { - AbstractApplicationContext context = new ClassPathXmlApplicationContext("/META-INF/spring/integration/activemq/cafeDemo-amq-config.xml", - "/META-INF/spring/integration/activemq/cafeDemo-amq-baristaHot-xml.xml"); + AbstractApplicationContext context = new ClassPathXmlApplicationContext( + "/META-INF/spring/integration/activemq/cafeDemo-amq-config.xml", + "/META-INF/spring/integration/activemq/cafeDemo-amq-baristaHot-xml.xml"); - System.out.println("Press Enter/Return to exit"); - System.in.read(); - context.close(); - } + System.out.println("Press Enter/Return to exit"); + System.in.read(); + context.close(); + } } diff --git a/applications/cafe/cafe-jms/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppOperationsActiveMQ.java b/applications/cafe/cafe-jms/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppOperationsActiveMQ.java index fc7e935a..57d3f274 100644 --- a/applications/cafe/cafe-jms/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppOperationsActiveMQ.java +++ b/applications/cafe/cafe-jms/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppOperationsActiveMQ.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2012 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.integration.samples.cafe.xml; import org.springframework.context.support.AbstractApplicationContext; @@ -11,19 +26,20 @@ import java.io.IOException; * and delivering them to the waiters. * * See the README.md file for more information on the order in which - * to start the processes + * to start the processes. * - * @author ceposta + * @author Christian Posta */ public class CafeDemoAppOperationsActiveMQ { public static void main(String[] args) throws InterruptedException, IOException { - AbstractApplicationContext context = new ClassPathXmlApplicationContext("/META-INF/spring/integration/activemq/cafeDemo-amq-config.xml", - "/META-INF/spring/integration/activemq/cafeDemo-amq-operations.xml"); + AbstractApplicationContext context = new ClassPathXmlApplicationContext( + "/META-INF/spring/integration/activemq/cafeDemo-amq-config.xml", + "/META-INF/spring/integration/activemq/cafeDemo-amq-operations.xml"); - System.out.println("Press Enter/Return to exit"); - System.in.read(); - context.close(); - } + System.out.println("Press Enter/Return to exit"); + System.in.read(); + context.close(); + } } diff --git a/applications/cafe/cafe-jms/src/main/resources/META-INF/spring/integration/activemq/cafeDemo-amq-baristaCold-xml.xml b/applications/cafe/cafe-jms/src/main/resources/META-INF/spring/integration/activemq/cafeDemo-amq-baristaCold-xml.xml index 5a765109..6498125e 100644 --- a/applications/cafe/cafe-jms/src/main/resources/META-INF/spring/integration/activemq/cafeDemo-amq-baristaCold-xml.xml +++ b/applications/cafe/cafe-jms/src/main/resources/META-INF/spring/integration/activemq/cafeDemo-amq-baristaCold-xml.xml @@ -1,25 +1,28 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:int="http://www.springframework.org/schema/integration" + xmlns:int-jms="http://www.springframework.org/schema/integration/jms" + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd + http://www.springframework.org/schema/integration/jms http://www.springframework.org/schema/integration/jms/spring-integration-jms.xsd"> - - + + - - - + + + - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/applications/cafe/cafe-jms/src/main/resources/META-INF/spring/integration/activemq/cafeDemo-amq-baristaHot-xml.xml b/applications/cafe/cafe-jms/src/main/resources/META-INF/spring/integration/activemq/cafeDemo-amq-baristaHot-xml.xml index b8bf1b9d..c3b22739 100644 --- a/applications/cafe/cafe-jms/src/main/resources/META-INF/spring/integration/activemq/cafeDemo-amq-baristaHot-xml.xml +++ b/applications/cafe/cafe-jms/src/main/resources/META-INF/spring/integration/activemq/cafeDemo-amq-baristaHot-xml.xml @@ -1,26 +1,29 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:int="http://www.springframework.org/schema/integration" + xmlns:int-jms="http://www.springframework.org/schema/integration/jms" + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd + http://www.springframework.org/schema/integration/jms http://www.springframework.org/schema/integration/jms/spring-integration-jms.xsd"> - - + + - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + diff --git a/applications/cafe/cafe-jms/src/main/resources/META-INF/spring/integration/activemq/cafeDemo-amq-config.xml b/applications/cafe/cafe-jms/src/main/resources/META-INF/spring/integration/activemq/cafeDemo-amq-config.xml index c5f4e3a2..69cf4070 100644 --- a/applications/cafe/cafe-jms/src/main/resources/META-INF/spring/integration/activemq/cafeDemo-amq-config.xml +++ b/applications/cafe/cafe-jms/src/main/resources/META-INF/spring/integration/activemq/cafeDemo-amq-config.xml @@ -1,20 +1,19 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd "> + + + + + + + + + + - - - - - - - - - - - - \ No newline at end of file + diff --git a/applications/cafe/cafe-jms/src/main/resources/META-INF/spring/integration/activemq/cafeDemo-amq-jms-backed.xml b/applications/cafe/cafe-jms/src/main/resources/META-INF/spring/integration/activemq/cafeDemo-amq-jms-backed.xml index 2aacb63d..922a2496 100644 --- a/applications/cafe/cafe-jms/src/main/resources/META-INF/spring/integration/activemq/cafeDemo-amq-jms-backed.xml +++ b/applications/cafe/cafe-jms/src/main/resources/META-INF/spring/integration/activemq/cafeDemo-amq-jms-backed.xml @@ -1,68 +1,69 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:int="http://www.springframework.org/schema/integration" + xmlns:int-stream="http://www.springframework.org/schema/integration/stream" + xmlns:int-jms="http://www.springframework.org/schema/integration/jms" + xmlns:amq="http://activemq.apache.org/schema/core" + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd + http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd + http://www.springframework.org/schema/integration/jms http://www.springframework.org/schema/integration/jms/spring-integration-jms.xsd + http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.4.2.xsd"> - - - - - - + + + + + + - - + + - + - + - - + + - - + + - - - - - + + + + + - + - \ No newline at end of file + diff --git a/applications/cafe/cafe-jms/src/main/resources/META-INF/spring/integration/activemq/cafeDemo-amq-operations.xml b/applications/cafe/cafe-jms/src/main/resources/META-INF/spring/integration/activemq/cafeDemo-amq-operations.xml index d6f8faaf..3492443a 100644 --- a/applications/cafe/cafe-jms/src/main/resources/META-INF/spring/integration/activemq/cafeDemo-amq-operations.xml +++ b/applications/cafe/cafe-jms/src/main/resources/META-INF/spring/integration/activemq/cafeDemo-amq-operations.xml @@ -1,80 +1,83 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:int="http://www.springframework.org/schema/integration" + xmlns:int-stream="http://www.springframework.org/schema/integration/stream" + xmlns:int-jms="http://www.springframework.org/schema/integration/jms" + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd + http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd + http://www.springframework.org/schema/integration/jms http://www.springframework.org/schema/integration/jms/spring-integration-jms.xsd"> - - + + - - + + - - - - - - - - - + + + + + + + + + - - + + - - - + + + - + - + + - + + - - + - - - - - - - - - + - - + + + + + + + + + + + - \ No newline at end of file + diff --git a/applications/cafe/cafe-jms/src/main/resources/META-INF/spring/integration/activemq/cafeDemo-amq-xml.xml b/applications/cafe/cafe-jms/src/main/resources/META-INF/spring/integration/activemq/cafeDemo-amq-xml.xml index 7705a68d..f2c00d5c 100644 --- a/applications/cafe/cafe-jms/src/main/resources/META-INF/spring/integration/activemq/cafeDemo-amq-xml.xml +++ b/applications/cafe/cafe-jms/src/main/resources/META-INF/spring/integration/activemq/cafeDemo-amq-xml.xml @@ -1,33 +1,34 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:int="http://www.springframework.org/schema/integration" + xmlns:int-stream="http://www.springframework.org/schema/integration/stream" + xmlns:int-jms="http://www.springframework.org/schema/integration/jms" + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd + http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd + http://www.springframework.org/schema/integration/jms http://www.springframework.org/schema/integration/jms/spring-integration-jms.xsd"> - - + + - - - - - - + + + + + + - + - - + + - + - \ No newline at end of file + diff --git a/applications/cafe/cafe-jms/src/main/resources/log4j.xml b/applications/cafe/cafe-jms/src/main/resources/log4j.xml index bbcbcf15..317bd182 100644 --- a/applications/cafe/cafe-jms/src/main/resources/log4j.xml +++ b/applications/cafe/cafe-jms/src/main/resources/log4j.xml @@ -6,7 +6,7 @@ - + diff --git a/applications/cafe/cafe-si/README.md b/applications/cafe/cafe-si/README.md index a593331f..900f5116 100644 --- a/applications/cafe/cafe-si/README.md +++ b/applications/cafe/cafe-si/README.md @@ -1,20 +1,19 @@ -Cafe Sample Application - Pure SI Implementation -======================= +Café Sample Application - Pure SI Implementation +================================================ -See the parent-level README.md for more details, but the flow of the implementation should follow this diagram: +See the parent-level **README.md** for more details, but the flow of the implementation should follow this diagram: Barista - hotDrinks ____________________ + hotDrinks ____________________ |==========| -->| | orders drinks / | prepareHotDrink() | Place Order ->Cafe->|======|->OrderSplitter->|======|->DrinkRouter | | \ coldDrinks | prepareColdDrink() | |==========| -->| | |____________________| - - Legend: |====| - channels - + + Legend: |====| - channels ## Instructions for running the CafeDemo sample diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index c4b640f4..d5bf1639 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -1,24 +1,24 @@ - 4.0.0 - - cafe - org.springframework.integration.samples - 2.1.0.BUILD-SNAPSHOT - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + cafe + org.springframework.integration.samples + 2.1.0.BUILD-SNAPSHOT + - cafe-si - jar + cafe-si + jar - Cafe - Pure Spring Integration - - This module implements the cafe sample using spring-integration components. - The channels that are used are in-memory channels and there is no distribution of - the processes (i.e., all of the processing happens within the same JVM and there - is no message broker). To see the cafe sample with a message broker to help distribute - the components, see the AMQP or the JMS sample. - + Cafe - Pure Spring Integration + + This module implements the cafe sample using spring-integration components. + The channels that are used are in-memory channels and there is no distribution of + the processes (i.e., all of the processing happens within the same JVM and there + is no message broker). To see the cafe sample with a message broker to help distribute + the components, see the AMQP or the JMS sample. + - \ No newline at end of file + diff --git a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/Cafe.java b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/Cafe.java index 66363ca8..7f7cb7da 100644 --- a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/Cafe.java +++ b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/Cafe.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,16 +19,16 @@ package org.springframework.integration.samples.cafe; import org.springframework.integration.annotation.Gateway; /** - * The entry point for Cafe Demo. The demo's main() method invokes the + * The entry point for the Cafe Demo. The demo's main() method invokes the * 'placeOrder' method on a generated MessagingGateway proxy. * The gateway then passes the {@link Order} as the payload of a * {@link org.springframework.integration.Message} to the * configured requestChannel. The channel ('orders') is * defined in the 'cafeDemo.xml' file. - * + * * @author Mark Fisher */ -public interface Cafe { +public interface Cafe { @Gateway(requestChannel="orders") void placeOrder(Order order); diff --git a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/Delivery.java b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/Delivery.java index 44894f13..edd34f60 100644 --- a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/Delivery.java +++ b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/Delivery.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,12 +22,15 @@ import java.util.List; /** * @author Marius Bogoevici * @author Tom McCuch + * @author Gunnar Hillert */ public class Delivery implements Serializable{ + private static final long serialVersionUID = 1L; + private static final String SEPARATOR = "-----------------------"; - private List deliveredDrinks; + private List deliveredDrinks; private int orderNumber; @@ -36,27 +39,27 @@ public class Delivery implements Serializable{ public Delivery(List deliveredDrinks) { assert(deliveredDrinks.size() > 0); - this.deliveredDrinks = deliveredDrinks; + this.deliveredDrinks = deliveredDrinks; this.orderNumber = deliveredDrinks.get(0).getOrderNumber(); - } + } - public int getOrderNumber() { + public int getOrderNumber() { return orderNumber; } - public void setOrderNumber(int orderNumber) { - this.orderNumber = orderNumber; - } - + public void setOrderNumber(int orderNumber) { + this.orderNumber = orderNumber; + } + public List getDeliveredDrinks() { - return deliveredDrinks; - } + return deliveredDrinks; + } public void setDeliveredDrinks(List deliveredDrinks) { this.deliveredDrinks = deliveredDrinks; } - + @Override public String toString() { StringBuffer buffer = new StringBuffer(SEPARATOR + "\n"); diff --git a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/Drink.java b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/Drink.java index 95ee3166..5cb194b4 100644 --- a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/Drink.java +++ b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/Drink.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,27 +21,29 @@ import java.io.Serializable; /** * @author Marius Bogoevici * @author Tom McCuch + * @author Gunnar Hillert */ public class Drink implements Serializable{ - private boolean iced; + private static final long serialVersionUID = 1L; - private int shots; + private boolean iced; - private DrinkType drinkType; + private int shots; + + private DrinkType drinkType; private int orderNumber; - // Default constructor required by Jackson Java JSON-processor public Drink() {} public Drink(int orderNumber, DrinkType drinkType, boolean iced, int shots) { - this.orderNumber = orderNumber; - this.drinkType = drinkType; - this.iced = iced; - this.shots = shots; - } + this.orderNumber = orderNumber; + this.drinkType = drinkType; + this.iced = iced; + this.shots = shots; + } public int getOrderNumber() { @@ -75,10 +77,10 @@ public class Drink implements Serializable{ public void setShots(int shots) { this.shots = shots; } - + @Override - public String toString() { - return (iced?"Iced":"Hot") + " " + drinkType.toString() + ", " + shots + " shots."; - } + public String toString() { + return (iced?"Iced":"Hot") + " " + drinkType.toString() + ", " + shots + " shots."; + } } diff --git a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/DrinkType.java b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/DrinkType.java index eef25991..bcca836f 100644 --- a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/DrinkType.java +++ b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/DrinkType.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/Order.java b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/Order.java index af970c23..ee00c577 100644 --- a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/Order.java +++ b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/Order.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,9 +24,12 @@ import java.util.List; * @author Mark Fisher * @author Marius Bogoevici * @author Tom McCuch + * @author Gunnar Hillert */ public class Order implements Serializable{ + private static final long serialVersionUID = 1L; + private List orderItems = new ArrayList(); /** the order number used for tracking */ @@ -50,7 +53,7 @@ public class Order implements Serializable{ public void setNumber(int number) { this.number = number; } - + public List getItems() { return this.orderItems; } diff --git a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/OrderItem.java b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/OrderItem.java index 2e34b5b1..a3b7cb8a 100644 --- a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/OrderItem.java +++ b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/OrderItem.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,27 +22,30 @@ import java.io.Serializable; * @author Mark Fisher * @author Marius Bogoevici * @author Tom McCuch + * @author Gunnar Hillert */ public class OrderItem implements Serializable { - private DrinkType type; + private static final long serialVersionUID = 1L; - private int shots = 1; + private DrinkType type; - private boolean iced = false; + private int shots = 1; - /** the order this item is tied to */ + private boolean iced = false; + + /** the order this item is tied to */ private int orderNumber; // Default constructor required by Jackson Java JSON-processor public OrderItem() {} public OrderItem(int orderNumber, DrinkType type, int shots, boolean iced) { - this.orderNumber = orderNumber; + this.orderNumber = orderNumber; this.type = type; - this.shots = shots; - this.iced = iced; - } + this.shots = shots; + this.iced = iced; + } public int getOrderNumber() { return this.orderNumber; @@ -51,33 +54,33 @@ public class OrderItem implements Serializable { public void setOrderNumber(int orderNumber) { this.orderNumber = orderNumber; } - + public boolean isIced() { - return this.iced; - } + return this.iced; + } public void setIced(boolean iced) { this.iced = iced; } - + public int getShots() { - return shots; - } + return shots; + } public void setShots(int shots) { this.shots = shots; } public DrinkType getDrinkType() { - return this.type; - } + return this.type; + } public void setDrinkType(DrinkType type) { this.type = type; } public String toString() { - return ((this.iced) ? "iced " : "hot ") + this.shots + " shot " + this.type; - } + return ((this.iced) ? "iced " : "hot ") + this.shots + " shot " + this.type; + } } diff --git a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/annotation/Barista.java b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/annotation/Barista.java index 434b1870..0fac9cce 100644 --- a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/annotation/Barista.java +++ b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/annotation/Barista.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/annotation/CafeDemoApp.java b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/annotation/CafeDemoApp.java index 460943f3..64c91cf6 100644 --- a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/annotation/CafeDemoApp.java +++ b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/annotation/CafeDemoApp.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,16 +28,16 @@ import org.springframework.integration.samples.cafe.Order; * The channels are defined within the configuration file ("cafeDemo.xml"), * and the relevant components are configured with annotations (such as the * OrderSplitter, DrinkRouter, and Barista classes). - * + * * @author Mark Fisher * @author Marius Bogoevici */ public class CafeDemoApp { public static void main(String[] args) { - AbstractApplicationContext context = + AbstractApplicationContext context = new ClassPathXmlApplicationContext("/META-INF/spring/integration/cafeDemo-annotation.xml", CafeDemoApp.class); - + Cafe cafe = (Cafe) context.getBean("cafe"); for (int i = 1; i <= 100; i++) { Order order = new Order(i); diff --git a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/annotation/DrinkRouter.java b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/annotation/DrinkRouter.java index 5c675b20..4bc0a9a3 100644 --- a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/annotation/DrinkRouter.java +++ b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/annotation/DrinkRouter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/annotation/OrderSplitter.java b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/annotation/OrderSplitter.java index 3fec59eb..3709ce4e 100644 --- a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/annotation/OrderSplitter.java +++ b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/annotation/OrderSplitter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/annotation/Waiter.java b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/annotation/Waiter.java index 1b8bbd1a..681e1f4d 100644 --- a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/annotation/Waiter.java +++ b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/annotation/Waiter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,14 +30,14 @@ import org.springframework.integration.annotation.MessageEndpoint; @MessageEndpoint public class Waiter { - @Aggregator(inputChannel = "preparedDrinks", outputChannel = "deliveries") - public Delivery prepareDelivery(List drinks) { - return new Delivery(drinks); - } - - @CorrelationStrategy - public int correlateByOrderNumber(Drink drink) { - return drink.getOrderNumber(); - } - + @Aggregator(inputChannel = "preparedDrinks", outputChannel = "deliveries") + public Delivery prepareDelivery(List drinks) { + return new Delivery(drinks); + } + + @CorrelationStrategy + public int correlateByOrderNumber(Drink drink) { + return drink.getOrderNumber(); + } + } diff --git a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/xml/Barista.java b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/xml/Barista.java index 71728264..5466e093 100644 --- a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/xml/Barista.java +++ b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/xml/Barista.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoApp.java b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoApp.java index b1d555a5..4f7d0f45 100644 --- a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoApp.java +++ b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoApp.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,7 +30,7 @@ import org.springframework.integration.samples.cafe.Order; *

* If deploying in SpringSource dmServer, the relevant ApplicationContext * configuration is in the META-INF/spring directory instead. - * + * * @author Mark Fisher * @author Marius Bogoevici * @author Oleg Zhurakousky @@ -38,9 +38,9 @@ import org.springframework.integration.samples.cafe.Order; public class CafeDemoApp { public static void main(String[] args) { - AbstractApplicationContext context = + AbstractApplicationContext context = new ClassPathXmlApplicationContext("/META-INF/spring/integration/cafeDemo-xml.xml", CafeDemoApp.class); - + Cafe cafe = (Cafe) context.getBean("cafe"); for (int i = 1; i <= 100; i++) { Order order = new Order(i); diff --git a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppUtilities.java b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppUtilities.java index 4abccda3..4901e7a2 100644 --- a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppUtilities.java +++ b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppUtilities.java @@ -1,8 +1,28 @@ +/* + * Copyright 2002-2012 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.integration.samples.cafe.xml; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.GenericXmlApplicationContext; +/** + * + * @author Gunnar Hillert + * + */ public class CafeDemoAppUtilities { /** spring profile for running locally */ @@ -10,15 +30,14 @@ public class CafeDemoAppUtilities { /** spring profile for running in cloud foundry */ public static final String CLOUD = "cloud"; - /** - * + * * @param path path to the file * @param targetClass the class who's classloader we will use to laod the context file * @param profile a profile name * @return the spring context */ - public static AbstractApplicationContext loadProfileContext(String path, Class targetClass, String profile) { + public static AbstractApplicationContext loadProfileContext(String path, Class targetClass, String profile) { GenericXmlApplicationContext ctx = new GenericXmlApplicationContext(); ctx.getEnvironment().setActiveProfiles(profile); ctx.setClassLoader(targetClass.getClassLoader()); @@ -26,8 +45,5 @@ public class CafeDemoAppUtilities { ctx.refresh(); return ctx; } - - - } diff --git a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/xml/Waiter.java b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/xml/Waiter.java index e9de2d5a..ec8fcc9d 100644 --- a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/xml/Waiter.java +++ b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/xml/Waiter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,8 +26,8 @@ import org.springframework.integration.samples.cafe.Drink; */ public class Waiter { - public Delivery prepareDelivery(List drinks) { - return new Delivery(drinks); - } + public Delivery prepareDelivery(List drinks) { + return new Delivery(drinks); + } } diff --git a/applications/cafe/cafe-si/src/main/resources/META-INF/spring/integration/cafeDemo-annotation.xml b/applications/cafe/cafe-si/src/main/resources/META-INF/spring/integration/cafeDemo-annotation.xml index 103bd5d4..841ae18c 100644 --- a/applications/cafe/cafe-si/src/main/resources/META-INF/spring/integration/cafeDemo-annotation.xml +++ b/applications/cafe/cafe-si/src/main/resources/META-INF/spring/integration/cafeDemo-annotation.xml @@ -1,40 +1,40 @@ - + http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/context + http://www.springframework.org/schema/context/spring-context.xsd + http://www.springframework.org/schema/integration + http://www.springframework.org/schema/integration/spring-integration.xsd + http://www.springframework.org/schema/integration/stream + http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd"> - + - + - - - - - - - + + + + + + + - - - + + + - - - + + + + + - - diff --git a/applications/cafe/cafe-si/src/main/resources/META-INF/spring/integration/cafeDemo-xml.xml b/applications/cafe/cafe-si/src/main/resources/META-INF/spring/integration/cafeDemo-xml.xml index 7e89c821..0a750b08 100644 --- a/applications/cafe/cafe-si/src/main/resources/META-INF/spring/integration/cafeDemo-xml.xml +++ b/applications/cafe/cafe-si/src/main/resources/META-INF/spring/integration/cafeDemo-xml.xml @@ -1,47 +1,47 @@ - + http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/integration + http://www.springframework.org/schema/integration/spring-integration.xsd + http://www.springframework.org/schema/integration/stream + http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd"> - + - - + + - - + + - - - - + + + + - - - - + + + + - - - - + + + + - + - + diff --git a/applications/cafe/cafe-si/src/main/resources/log4j.xml b/applications/cafe/cafe-si/src/main/resources/log4j.xml index bbcbcf15..317bd182 100644 --- a/applications/cafe/cafe-si/src/main/resources/log4j.xml +++ b/applications/cafe/cafe-si/src/main/resources/log4j.xml @@ -6,7 +6,7 @@ - + diff --git a/applications/cafe/pom.xml b/applications/cafe/pom.xml index cc7c3743..25f106e6 100644 --- a/applications/cafe/pom.xml +++ b/applications/cafe/pom.xml @@ -4,32 +4,39 @@ 4.0.0 org.springframework.integration.samples cafe - pom - 2.1.0.BUILD-SNAPSHOT - - cafe-jms - cafe-si - cafe-amqp - - Samples (Applications) - Cafe Sample + pom + 2.1.0.BUILD-SNAPSHOT + + + 2.2.1 + + + + cafe-jms + cafe-si + cafe-amqp + + + Samples (Applications) - Cafe Sample + - UTF-8 + UTF-8 2.1.0.RELEASE - 3.1.0.RELEASE + 3.1.0.RELEASE 1.2.16 4.10 - - org.springframework - spring-tx - ${spring.core.version} - - - org.springframework - spring-context - ${spring.core.version} - + + org.springframework + spring-tx + ${spring.core.version} + + + org.springframework + spring-context + ${spring.core.version} + org.springframework.integration spring-integration-stream @@ -37,14 +44,14 @@ - org.codehaus.jackson - jackson-core-asl - 1.9.2 + org.codehaus.jackson + jackson-core-asl + 1.9.2 - org.codehaus.jackson - jackson-mapper-asl - 1.9.2 + org.codehaus.jackson + jackson-mapper-asl + 1.9.2 log4j @@ -69,7 +76,7 @@ 1.5 -Xlint:all true - false + true