Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: christian-posta/spring-integration-samples
base: 20b840811b
...
head fork: christian-posta/spring-integration-samples
compare: c065aaf975
  • 2 commits
  • 7 files changed
  • 0 commit comments
  • 1 contributor
View
5 applications/cafe/cafe-amqp/pom.xml
@@ -25,6 +25,11 @@
<artifactId>cafe-si</artifactId>
<version>${project.parent.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework.integration</groupId>
+ <artifactId>spring-integration-amqp</artifactId>
+ <version>${spring.integration.version}</version>
+ </dependency>
</dependencies>
</project>
View
18 applications/cafe/cafe-jms/pom.xml
@@ -19,8 +19,26 @@
used. For an example using AMQP, see the AMQP implementation of the cafe sample.
</description>
+ <properties>
+ <activemq.version>5.4.3</activemq.version>
+ </properties>
<dependencies>
<dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-all</artifactId>
+ <version>${activemq.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-spring</artifactId>
+ <version>3.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.integration</groupId>
+ <artifactId>spring-integration-jms</artifactId>
+ <version>${spring.integration.version}</version>
+ </dependency>
+ <dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>cafe-si</artifactId>
<version>${project.parent.version}</version>
View
2  ...s/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppActiveMQ.java
@@ -36,8 +36,6 @@ 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);
-
- System.in.read();
context.close();
}
}
View
1  ...java/org/springframework/integration/samples/cafe/xml/CafeDemoAppBaristaColdActiveMQ.java
@@ -22,6 +22,7 @@ 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");
+ System.out.println("Press Enter/Return to exit");
System.in.read();
context.close();
}
View
1  .../java/org/springframework/integration/samples/cafe/xml/CafeDemoAppBaristaHotActiveMQ.java
@@ -19,6 +19,7 @@ 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");
+ System.out.println("Press Enter/Return to exit");
System.in.read();
context.close();
}
View
1  .../java/org/springframework/integration/samples/cafe/xml/CafeDemoAppOperationsActiveMQ.java
@@ -22,6 +22,7 @@ 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");
+ System.out.println("Press Enter/Return to exit");
System.in.read();
context.close();
}
View
22 applications/cafe/pom.xml
@@ -18,21 +18,9 @@
<spring.core.version>3.1.0.RELEASE</spring.core.version>
<log4j.version>1.2.16</log4j.version>
<junit.version>4.10</junit.version>
- <activemq.version>5.4.3</activemq.version>
</properties>
<dependencies>
<dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-all</artifactId>
- <version>${activemq.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-spring</artifactId>
- <version>3.9</version>
- </dependency>
-
- <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>${spring.core.version}</version>
@@ -44,16 +32,6 @@
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-amqp</artifactId>
- <version>${spring.integration.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-jms</artifactId>
- <version>${spring.integration.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-stream</artifactId>
<version>${spring.integration.version}</version>
</dependency>

No commit comments for this range

Something went wrong with that request. Please try again.