root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

This commit is contained in:
Andy Wilkinson 2016-09-29 13:12:24 +01:00
parent 8b6d7eedc0 cd45ce9104
commit 3e058e038f
8 changed files with 14 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spring-boot-cli/samples/jms.groovy
View File

@ -1,9 +1,8 @@
package org.test package org.test
@Grab("spring-boot-starter-hornetq") @Grab("spring-boot-starter-artemis")
@Grab("hornetq-jms-server") @Grab("artemis-jms-server")
import java.util.concurrent.CountDownLatch import java.util.concurrent.CountDownLatch
import org.hornetq.jms.server.config.impl.JMSQueueConfigurationImpl
@Log @Log
@Configuration @Configuration
@ -17,7 +16,7 @@ class JmsExample implements CommandLineRunner {
void run(String... args) { void run(String... args) {
def messageCreator = { session -> def messageCreator = { session ->
session.createObjectMessage("Greetings from Spring Boot via HornetQ") session.createObjectMessage("Greetings from Spring Boot via Artemis")
} as MessageCreator } as MessageCreator
log.info "Sending JMS message..." log.info "Sending JMS message..."
jmsTemplate.send("spring-boot", messageCreator) jmsTemplate.send("spring-boot", messageCreator)
@ -31,8 +30,4 @@ class JmsExample implements CommandLineRunner {
latch.countDown() latch.countDown()
} }
@Bean JMSQueueConfigurationImpl springBootQueue() {
new JMSQueueConfigurationImpl('spring-boot', null, false)
}
} }

2
spring-boot-cli/src/test/java/org/springframework/boot/cli/SampleIntegrationTests.java
View File

@ -145,7 +145,7 @@ public class SampleIntegrationTests {
@Test @Test
public void jmsSample() throws Exception { public void jmsSample() throws Exception {
String output = this.cli.run("jms.groovy"); String output = this.cli.run("jms.groovy");
assertThat(output).contains("Received Greetings from Spring Boot via HornetQ"); assertThat(output).contains("Received Greetings from Spring Boot via Artemis");
} }
@Test @Test

6
spring-boot-samples/spring-boot-sample-jta-atomikos/pom.xml
View File

@ -33,11 +33,11 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-hornetq</artifactId> <artifactId>spring-boot-starter-artemis</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hornetq</groupId> <groupId>org.apache.activemq</groupId>
<artifactId>hornetq-jms-server</artifactId> <artifactId>artemis-jms-server</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.h2database</groupId> <groupId>com.h2database</groupId>

6
spring-boot-samples/spring-boot-sample-jta-atomikos/src/main/resources/application.properties
View File

@ -1,5 +1 @@
spring.hornetq.mode=embedded logging.level.com.atomikos=WARN
spring.hornetq.embedded.enabled=true
spring.hornetq.embedded.queues=accounts
logging.level.com.atomikos=WARN

6
spring-boot-samples/spring-boot-sample-jta-bitronix/pom.xml
View File

@ -33,11 +33,11 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-hornetq</artifactId> <artifactId>spring-boot-starter-artemis</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hornetq</groupId> <groupId>org.apache.activemq</groupId>
<artifactId>hornetq-jms-server</artifactId> <artifactId>artemis-jms-server</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.h2database</groupId> <groupId>com.h2database</groupId>

3
spring-boot-samples/spring-boot-sample-jta-bitronix/src/main/resources/application.properties
View File

@ -1,3 +0,0 @@
spring.hornetq.mode=embedded
spring.hornetq.embedded.enabled=true
spring.hornetq.embedded.queues=accounts

6
spring-boot-samples/spring-boot-sample-jta-narayana/pom.xml
View File

@ -28,11 +28,11 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-hornetq</artifactId> <artifactId>spring-boot-starter-artemis</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hornetq</groupId> <groupId>org.apache.activemq</groupId>
<artifactId>hornetq-jms-server</artifactId> <artifactId>artemis-jms-server</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.h2database</groupId> <groupId>com.h2database</groupId>

4
spring-boot-samples/spring-boot-sample-jta-narayana/src/main/resources/application.properties
View File

@ -1,5 +1 @@
spring.hornetq.mode=embedded
spring.hornetq.embedded.enabled=true
spring.hornetq.embedded.queues=accounts
logging.level.com.arjuna=INFO logging.level.com.arjuna=INFO