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

16
intermediate/stored-procedures-postgresql/pom.xml
View File

@@ -56,7 +56,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -65,12 +65,6 @@
<version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.2.5.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
@@ -80,9 +74,15 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-jdbc</artifactId>
<version>4.3.0.M1</version>
<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>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>

2
intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/model/CoffeeBeverage.java → intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/model/CoffeeBeverage.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;
/**
*

4
intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java
View File

@@ -22,8 +22,8 @@ import org.apache.log4j.Logger;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.integration.samples.storedprocedure.model.CoffeeBeverage;
import org.springframework.integration.samples.storedprocedure.service.CoffeeService;
import org.springframework.integration.model.CoffeeBeverage;
import org.springframework.integration.service.CoffeeService;
/**

2
intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/support/CoffeBeverageMapper.java
View File

@@ -15,7 +15,7 @@ package org.springframework.integration.samples.storedprocedure.support;
import java.sql.ResultSet;
import java.sql.SQLException;
import org.springframework.integration.samples.storedprocedure.model.CoffeeBeverage;
import org.springframework.integration.model.CoffeeBeverage;
import org.springframework.jdbc.core.RowMapper;
/**

4
intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/service/CoffeeService.java → intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/service/CoffeeService.java
View File

@@ -14,11 +14,11 @@
* limitations under the License.
*/
package org.springframework.integration.samples.storedprocedure.service;
package org.springframework.integration.service;
import java.util.List;
import org.springframework.integration.samples.storedprocedure.model.CoffeeBeverage;
import org.springframework.integration.model.CoffeeBeverage;
import org.springframework.messaging.handler.annotation.Payload;
import org.springframework.transaction.annotation.Transactional;

2
intermediate/stored-procedures-postgresql/src/main/resources/META-INF/spring/integration/spring-integration-context.xml
View File

@@ -27,7 +27,7 @@
<int:gateway id="gateway" default-request-timeout="4000"
default-reply-timeout="4000"
service-interface="org.springframework.integration.samples.storedprocedure.service.CoffeeService">
service-interface="org.springframework.integration.service.CoffeeService">
<int:method name="findCoffeeBeverage" request-channel="findCoffeeProcedureRequestChannel" />
<int:method name="findAllCoffeeBeverages" request-channel="findAllProcedureRequestChannel" />
</int:gateway>