Spring/spring-integration-samples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compatibility with Boot-1.4 and fresh POMs

Browse Source
This commit is contained in:
Artem Bilan
2016-05-13 11:47:32 -04:00
parent 32fc46161a
commit b6f872664d
101 changed files with 941 additions and 897 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
intermediate/monitoring/pom.xml
View File

@@ -53,9 +53,9 @@
</scm>
<dependencies>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.2.5.RELEASE</version>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-twitter</artifactId>
<version>4.3.0.RC1</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -67,7 +67,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -78,28 +78,28 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.2.5.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-twitter</artifactId>
<version>4.3.0.M1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-groovy</artifactId>
<version>4.3.0.M1</version>
<artifactId>spring-webmvc</artifactId>
<version>4.3.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-jmx</artifactId>
<version>4.3.0.M1</version>
<version>4.3.0.RC1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-groovy</artifactId>
<version>4.3.0.RC1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.3.0.RC2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>

2
intermediate/monitoring/src/main/java/org/springframework/integration/samples/storedprocedure/model/TwitterMessage.java → intermediate/monitoring/src/main/java/org/springframework/integration/model/TwitterMessage.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.integration.samples.storedprocedure.model;
package org.springframework.integration.model;
import java.util.Date;

2
intermediate/monitoring/src/main/java/org/springframework/integration/mvc/controller/HomeController.java
View File

@@ -21,7 +21,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.integration.samples.storedprocedure.model.TwitterMessage;
import org.springframework.integration.model.TwitterMessage;
import org.springframework.integration.service.TwitterService;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;

4
intermediate/monitoring/src/main/java/org/springframework/integration/samples/storedprocedure/service/TwitterService.java → intermediate/monitoring/src/main/java/org/springframework/integration/service/TwitterService.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2016 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.
@@ -17,7 +17,7 @@ package org.springframework.integration.service;
import java.util.Collection;
import org.springframework.integration.samples.storedprocedure.model.TwitterMessage;
import org.springframework.integration.model.TwitterMessage;
/**

4
intermediate/monitoring/src/main/java/org/springframework/integration/samples/storedprocedure/service/impl/DummyTwitter.java → intermediate/monitoring/src/main/java/org/springframework/integration/service/impl/DummyTwitter.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2016 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,6 +28,8 @@ public class DummyTwitter {
private long id;
@SuppressWarnings("deprecation")
public Tweet getTweet() {
Tweet tweet = new Tweet(++this.id, "" + this.id,
"Spring Integration is the coolest Enterprise Integration project",

2
intermediate/monitoring/src/main/java/org/springintegration/service/impl/DefaultTwitterService.java
View File

@@ -22,7 +22,7 @@ import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.integration.endpoint.SourcePollingChannelAdapter;
import org.springframework.integration.samples.storedprocedure.model.TwitterMessage;
import org.springframework.integration.model.TwitterMessage;
import org.springframework.integration.monitor.IntegrationMBeanExporter;
import org.springframework.integration.service.TwitterService;
import org.springframework.integration.support.MessageBuilder;