SpringCloud/spring-cloud-cli
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to latest dataflow bits

Browse Source
This commit is contained in:
Dave Syer
2016-10-03 15:00:55 +01:00
parent f2fc5c8a67
commit eb1896e509
4 changed files with 5 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-launcher/pom.xml
View File

@@ -30,7 +30,7 @@
</modules>
<properties>
<spring-cloud-dataflow.version>1.0.1.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
<spring-cloud-dataflow.version>1.0.2.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
<spring-cloud-deployer.version>1.0.3.BUILD-SNAPSHOT</spring-cloud-deployer.version>
</properties>

14
spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml
View File

@@ -31,19 +31,7 @@
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-task-batch</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-deployer-local</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-core</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-core</artifactId>
<artifactId>spring-cloud-starter-dataflow-server-local</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>

36
spring-cloud-launcher/spring-cloud-launcher-dataflow/src/main/java/org/springframework/cloud/launcher/dataflow/DataFlowApplication.java
View File

@@ -16,17 +16,10 @@
package org.springframework.cloud.launcher.dataflow;
import javax.sql.DataSource;
import org.springframework.batch.core.repository.support.JobRepositoryFactoryBean;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.batch.BatchDatabaseInitializer;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.dataflow.server.EnableDataFlowServer;
import org.springframework.cloud.task.repository.support.TaskRepositoryInitializer;
import org.springframework.context.annotation.Bean;
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
/**
* @author Spencer Gibb
@@ -35,36 +28,9 @@ import org.springframework.jdbc.datasource.DataSourceTransactionManager;
@EnableDiscoveryClient
@SpringBootApplication
public class DataFlowApplication {
public static void main(String[] args) {
SpringApplication.run(DataFlowApplication.class, args);
}
@Bean
public JobRepositoryFactoryBean jobRepositoryFactoryBeanForServer(
DataSource dataSource,
DataSourceTransactionManager dataSourceTransactionManager) {
JobRepositoryFactoryBean repositoryFactoryBean = new JobRepositoryFactoryBean();
repositoryFactoryBean.setDataSource(dataSource);
repositoryFactoryBean.setTransactionManager(dataSourceTransactionManager);
return repositoryFactoryBean;
}
@Bean
public DataSourceTransactionManager transactionManagerForServer(
DataSource dataSource) {
return new DataSourceTransactionManager(dataSource);
}
@Bean
public BatchDatabaseInitializer batchRepositoryInitializerForDefaultDBForServer() {
return new BatchDatabaseInitializer();
}
@Bean
public TaskRepositoryInitializer taskRepositoryInitializerForDefaultDB(
DataSource dataSource) {
TaskRepositoryInitializer taskRepositoryInitializer = new TaskRepositoryInitializer();
taskRepositoryInitializer.setDataSource(dataSource);
return taskRepositoryInitializer;
}
}

4
spring-cloud-launcher/spring-cloud-launcher-dataflow/src/main/resources/application.yml
View File

@@ -3,7 +3,7 @@ server:
eureka:
instance:
status-page-url-path: /admin-ui #allows you to click on the link in eureka dashboard
status-page-url-path: /dashboard #allows you to click on the link in eureka dashboard
info:
artifactId: "@project.artifactId@"
@@ -17,4 +17,4 @@ security:
management:
context-path: /admin
security:
enabled: false
enabled: false