From 6315509165c48a51eeeab90aee71d54711be6327 Mon Sep 17 00:00:00 2001 From: jvalkeal Date: Thu, 15 Feb 2018 17:54:07 +0200 Subject: [PATCH] Rename spring-statemachine-boot - spring-statemachine-boot is now spring-statemachine-autoconfigure - Fixes #507 --- build.gradle | 6 +++--- docs/src/reference/asciidoc/getting-started.adoc | 2 +- docs/src/reference/asciidoc/sm-examples.adoc | 4 ++-- docs/src/reference/asciidoc/sm.adoc | 2 +- docs/src/reference/asciidoc/whatsnew.adoc | 1 + settings.gradle | 2 +- .../statemachine/boot/StateMachineProperties.java | 0 .../boot/actuate/InMemoryStateMachineTraceRepository.java | 0 .../statemachine/boot/actuate/StateMachineTrace.java | 0 .../boot/actuate/StateMachineTraceEndpoint.java | 0 .../boot/actuate/StateMachineTraceRepository.java | 0 .../boot/autoconfigure/StateMachineAutoConfiguration.java | 0 .../StateMachineJpaRepositoriesAutoConfiguration.java | 0 .../StateMachineMongoDbRepositoriesAutoConfiguration.java | 0 .../StateMachineRedisRepositoriesAutoConfiguration.java | 0 .../statemachine/boot/support/BootStateMachineMonitor.java | 0 .../src/main/resources/META-INF/spring.factories | 0 .../boot/StateMachineAutoConfigurationTests.java | 0 .../StateMachineJpaRepositoriesAutoConfigurationTests.java | 0 ...ateMachineMongoDbRepositoriesAutoConfigurationTests.java | 0 ...StateMachineRedisRepositoriesAutoConfigurationTests.java | 0 .../statemachine/boot/TestAutoConfigurationPackage.java | 0 .../boot/TestAutoConfigurationPackageRegistrar.java | 0 .../org/springframework/statemachine/boot/TestUtils.java | 0 spring-statemachine-samples/build.gradle | 6 +++--- 25 files changed, 12 insertions(+), 11 deletions(-) rename {spring-statemachine-boot => spring-statemachine-autoconfigure}/src/main/java/org/springframework/statemachine/boot/StateMachineProperties.java (100%) rename {spring-statemachine-boot => spring-statemachine-autoconfigure}/src/main/java/org/springframework/statemachine/boot/actuate/InMemoryStateMachineTraceRepository.java (100%) rename {spring-statemachine-boot => spring-statemachine-autoconfigure}/src/main/java/org/springframework/statemachine/boot/actuate/StateMachineTrace.java (100%) rename {spring-statemachine-boot => spring-statemachine-autoconfigure}/src/main/java/org/springframework/statemachine/boot/actuate/StateMachineTraceEndpoint.java (100%) rename {spring-statemachine-boot => spring-statemachine-autoconfigure}/src/main/java/org/springframework/statemachine/boot/actuate/StateMachineTraceRepository.java (100%) rename {spring-statemachine-boot => spring-statemachine-autoconfigure}/src/main/java/org/springframework/statemachine/boot/autoconfigure/StateMachineAutoConfiguration.java (100%) rename {spring-statemachine-boot => spring-statemachine-autoconfigure}/src/main/java/org/springframework/statemachine/boot/autoconfigure/StateMachineJpaRepositoriesAutoConfiguration.java (100%) rename {spring-statemachine-boot => spring-statemachine-autoconfigure}/src/main/java/org/springframework/statemachine/boot/autoconfigure/StateMachineMongoDbRepositoriesAutoConfiguration.java (100%) rename {spring-statemachine-boot => spring-statemachine-autoconfigure}/src/main/java/org/springframework/statemachine/boot/autoconfigure/StateMachineRedisRepositoriesAutoConfiguration.java (100%) rename {spring-statemachine-boot => spring-statemachine-autoconfigure}/src/main/java/org/springframework/statemachine/boot/support/BootStateMachineMonitor.java (100%) rename {spring-statemachine-boot => spring-statemachine-autoconfigure}/src/main/resources/META-INF/spring.factories (100%) rename {spring-statemachine-boot => spring-statemachine-autoconfigure}/src/test/java/org/springframework/statemachine/boot/StateMachineAutoConfigurationTests.java (100%) rename {spring-statemachine-boot => spring-statemachine-autoconfigure}/src/test/java/org/springframework/statemachine/boot/StateMachineJpaRepositoriesAutoConfigurationTests.java (100%) rename {spring-statemachine-boot => spring-statemachine-autoconfigure}/src/test/java/org/springframework/statemachine/boot/StateMachineMongoDbRepositoriesAutoConfigurationTests.java (100%) rename {spring-statemachine-boot => spring-statemachine-autoconfigure}/src/test/java/org/springframework/statemachine/boot/StateMachineRedisRepositoriesAutoConfigurationTests.java (100%) rename {spring-statemachine-boot => spring-statemachine-autoconfigure}/src/test/java/org/springframework/statemachine/boot/TestAutoConfigurationPackage.java (100%) rename {spring-statemachine-boot => spring-statemachine-autoconfigure}/src/test/java/org/springframework/statemachine/boot/TestAutoConfigurationPackageRegistrar.java (100%) rename {spring-statemachine-boot => spring-statemachine-autoconfigure}/src/test/java/org/springframework/statemachine/boot/TestUtils.java (100%) diff --git a/build.gradle b/build.gradle index eca37552..c84895cf 100644 --- a/build.gradle +++ b/build.gradle @@ -189,8 +189,8 @@ project('spring-statemachine-core') { } } -project('spring-statemachine-boot') { - description = "Spring State Machine Boot" +project('spring-statemachine-autoconfigure') { + description = "Spring State Machine Boot Autoconfigure" dependencies { compile project(":spring-statemachine-core") @@ -453,7 +453,7 @@ project('spring-statemachine-bom') { project('spring-statemachine-starter') { description = "Spring Statemachine Starter" dependencies { - compile project(":spring-statemachine-boot") + compile project(":spring-statemachine-autoconfigure") compile "org.springframework.boot:spring-boot-starter" } diff --git a/docs/src/reference/asciidoc/getting-started.adoc b/docs/src/reference/asciidoc/getting-started.adoc index cd1b3b0e..4b93054a 100644 --- a/docs/src/reference/asciidoc/getting-started.adoc +++ b/docs/src/reference/asciidoc/getting-started.adoc @@ -62,7 +62,7 @@ framework. |spring-statemachine-uml |Support module for UI uml modeling with Eclipse Papyrus. -|spring-statemachine-boot +|spring-statemachine-autoconfigure |Support module for `Spring Boot`. |spring-statemachine-bom diff --git a/docs/src/reference/asciidoc/sm-examples.adoc b/docs/src/reference/asciidoc/sm-examples.adoc index f6b5db7c..39dbcaa2 100644 --- a/docs/src/reference/asciidoc/sm-examples.adoc +++ b/docs/src/reference/asciidoc/sm-examples.adoc @@ -1438,7 +1438,7 @@ with a machine configuration kept in a database. This sample is using embedded _H2_ database with a _H2 Console_ to ease playing with a database. -This sample uses `spring-statemachine-boot` which on default +This sample uses `spring-statemachine-autoconfigure` which on default auto-configures repositories and entity classes needed for JPA. Thus only `@SpringBootApplication` is needed. @@ -1504,7 +1504,7 @@ with persisting machine in a database. This sample is using embedded _H2_ database with a _H2 Console_ to ease playing with a database. -This sample uses `spring-statemachine-boot` which on default +This sample uses `spring-statemachine-autoconfigure` which on default auto-configures repositories and entity classes needed for JPA. Thus only `@SpringBootApplication` is needed. diff --git a/docs/src/reference/asciidoc/sm.adoc b/docs/src/reference/asciidoc/sm.adoc index c0fcd1d7..203b5037 100644 --- a/docs/src/reference/asciidoc/sm.adoc +++ b/docs/src/reference/asciidoc/sm.adoc @@ -1949,7 +1949,7 @@ Check sample <> for detailed usage. [[sm-boot]] == Spring Boot Support -Auto-configuration module `spring-statemachine-boot` contains all +Auto-configuration module `spring-statemachine-autoconfigure` contains all integration logic with _Spring Boot_ providing functionality i.e. for auto-config and actuators. All what is needed is to have _State Machine_ as part of a boot application together with this library. diff --git a/docs/src/reference/asciidoc/whatsnew.adoc b/docs/src/reference/asciidoc/whatsnew.adoc index 3ff40558..17de4db6 100644 --- a/docs/src/reference/asciidoc/whatsnew.adoc +++ b/docs/src/reference/asciidoc/whatsnew.adoc @@ -54,4 +54,5 @@ _Spring Statemachine 2.0_ is focusing on _Spring Boot 2.x_ support. === In 2.0.0 * Format of monitoring and trancing has beenn changed <> +* Module `spring-statemachine-boot` has been renamed to `spring-statemachine-autoconfigure` diff --git a/settings.gradle b/settings.gradle index a76af063..a20b621a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -9,7 +9,7 @@ include 'spring-statemachine-cluster' include 'spring-statemachine-uml' include 'spring-statemachine-build-tests' include 'spring-statemachine-recipes' -include 'spring-statemachine-boot' +include 'spring-statemachine-autoconfigure' include 'spring-statemachine-bom' include 'spring-statemachine-starter' diff --git a/spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/StateMachineProperties.java b/spring-statemachine-autoconfigure/src/main/java/org/springframework/statemachine/boot/StateMachineProperties.java similarity index 100% rename from spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/StateMachineProperties.java rename to spring-statemachine-autoconfigure/src/main/java/org/springframework/statemachine/boot/StateMachineProperties.java diff --git a/spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/actuate/InMemoryStateMachineTraceRepository.java b/spring-statemachine-autoconfigure/src/main/java/org/springframework/statemachine/boot/actuate/InMemoryStateMachineTraceRepository.java similarity index 100% rename from spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/actuate/InMemoryStateMachineTraceRepository.java rename to spring-statemachine-autoconfigure/src/main/java/org/springframework/statemachine/boot/actuate/InMemoryStateMachineTraceRepository.java diff --git a/spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/actuate/StateMachineTrace.java b/spring-statemachine-autoconfigure/src/main/java/org/springframework/statemachine/boot/actuate/StateMachineTrace.java similarity index 100% rename from spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/actuate/StateMachineTrace.java rename to spring-statemachine-autoconfigure/src/main/java/org/springframework/statemachine/boot/actuate/StateMachineTrace.java diff --git a/spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/actuate/StateMachineTraceEndpoint.java b/spring-statemachine-autoconfigure/src/main/java/org/springframework/statemachine/boot/actuate/StateMachineTraceEndpoint.java similarity index 100% rename from spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/actuate/StateMachineTraceEndpoint.java rename to spring-statemachine-autoconfigure/src/main/java/org/springframework/statemachine/boot/actuate/StateMachineTraceEndpoint.java diff --git a/spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/actuate/StateMachineTraceRepository.java b/spring-statemachine-autoconfigure/src/main/java/org/springframework/statemachine/boot/actuate/StateMachineTraceRepository.java similarity index 100% rename from spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/actuate/StateMachineTraceRepository.java rename to spring-statemachine-autoconfigure/src/main/java/org/springframework/statemachine/boot/actuate/StateMachineTraceRepository.java diff --git a/spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/autoconfigure/StateMachineAutoConfiguration.java b/spring-statemachine-autoconfigure/src/main/java/org/springframework/statemachine/boot/autoconfigure/StateMachineAutoConfiguration.java similarity index 100% rename from spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/autoconfigure/StateMachineAutoConfiguration.java rename to spring-statemachine-autoconfigure/src/main/java/org/springframework/statemachine/boot/autoconfigure/StateMachineAutoConfiguration.java diff --git a/spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/autoconfigure/StateMachineJpaRepositoriesAutoConfiguration.java b/spring-statemachine-autoconfigure/src/main/java/org/springframework/statemachine/boot/autoconfigure/StateMachineJpaRepositoriesAutoConfiguration.java similarity index 100% rename from spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/autoconfigure/StateMachineJpaRepositoriesAutoConfiguration.java rename to spring-statemachine-autoconfigure/src/main/java/org/springframework/statemachine/boot/autoconfigure/StateMachineJpaRepositoriesAutoConfiguration.java diff --git a/spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/autoconfigure/StateMachineMongoDbRepositoriesAutoConfiguration.java b/spring-statemachine-autoconfigure/src/main/java/org/springframework/statemachine/boot/autoconfigure/StateMachineMongoDbRepositoriesAutoConfiguration.java similarity index 100% rename from spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/autoconfigure/StateMachineMongoDbRepositoriesAutoConfiguration.java rename to spring-statemachine-autoconfigure/src/main/java/org/springframework/statemachine/boot/autoconfigure/StateMachineMongoDbRepositoriesAutoConfiguration.java diff --git a/spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/autoconfigure/StateMachineRedisRepositoriesAutoConfiguration.java b/spring-statemachine-autoconfigure/src/main/java/org/springframework/statemachine/boot/autoconfigure/StateMachineRedisRepositoriesAutoConfiguration.java similarity index 100% rename from spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/autoconfigure/StateMachineRedisRepositoriesAutoConfiguration.java rename to spring-statemachine-autoconfigure/src/main/java/org/springframework/statemachine/boot/autoconfigure/StateMachineRedisRepositoriesAutoConfiguration.java diff --git a/spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/support/BootStateMachineMonitor.java b/spring-statemachine-autoconfigure/src/main/java/org/springframework/statemachine/boot/support/BootStateMachineMonitor.java similarity index 100% rename from spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/support/BootStateMachineMonitor.java rename to spring-statemachine-autoconfigure/src/main/java/org/springframework/statemachine/boot/support/BootStateMachineMonitor.java diff --git a/spring-statemachine-boot/src/main/resources/META-INF/spring.factories b/spring-statemachine-autoconfigure/src/main/resources/META-INF/spring.factories similarity index 100% rename from spring-statemachine-boot/src/main/resources/META-INF/spring.factories rename to spring-statemachine-autoconfigure/src/main/resources/META-INF/spring.factories diff --git a/spring-statemachine-boot/src/test/java/org/springframework/statemachine/boot/StateMachineAutoConfigurationTests.java b/spring-statemachine-autoconfigure/src/test/java/org/springframework/statemachine/boot/StateMachineAutoConfigurationTests.java similarity index 100% rename from spring-statemachine-boot/src/test/java/org/springframework/statemachine/boot/StateMachineAutoConfigurationTests.java rename to spring-statemachine-autoconfigure/src/test/java/org/springframework/statemachine/boot/StateMachineAutoConfigurationTests.java diff --git a/spring-statemachine-boot/src/test/java/org/springframework/statemachine/boot/StateMachineJpaRepositoriesAutoConfigurationTests.java b/spring-statemachine-autoconfigure/src/test/java/org/springframework/statemachine/boot/StateMachineJpaRepositoriesAutoConfigurationTests.java similarity index 100% rename from spring-statemachine-boot/src/test/java/org/springframework/statemachine/boot/StateMachineJpaRepositoriesAutoConfigurationTests.java rename to spring-statemachine-autoconfigure/src/test/java/org/springframework/statemachine/boot/StateMachineJpaRepositoriesAutoConfigurationTests.java diff --git a/spring-statemachine-boot/src/test/java/org/springframework/statemachine/boot/StateMachineMongoDbRepositoriesAutoConfigurationTests.java b/spring-statemachine-autoconfigure/src/test/java/org/springframework/statemachine/boot/StateMachineMongoDbRepositoriesAutoConfigurationTests.java similarity index 100% rename from spring-statemachine-boot/src/test/java/org/springframework/statemachine/boot/StateMachineMongoDbRepositoriesAutoConfigurationTests.java rename to spring-statemachine-autoconfigure/src/test/java/org/springframework/statemachine/boot/StateMachineMongoDbRepositoriesAutoConfigurationTests.java diff --git a/spring-statemachine-boot/src/test/java/org/springframework/statemachine/boot/StateMachineRedisRepositoriesAutoConfigurationTests.java b/spring-statemachine-autoconfigure/src/test/java/org/springframework/statemachine/boot/StateMachineRedisRepositoriesAutoConfigurationTests.java similarity index 100% rename from spring-statemachine-boot/src/test/java/org/springframework/statemachine/boot/StateMachineRedisRepositoriesAutoConfigurationTests.java rename to spring-statemachine-autoconfigure/src/test/java/org/springframework/statemachine/boot/StateMachineRedisRepositoriesAutoConfigurationTests.java diff --git a/spring-statemachine-boot/src/test/java/org/springframework/statemachine/boot/TestAutoConfigurationPackage.java b/spring-statemachine-autoconfigure/src/test/java/org/springframework/statemachine/boot/TestAutoConfigurationPackage.java similarity index 100% rename from spring-statemachine-boot/src/test/java/org/springframework/statemachine/boot/TestAutoConfigurationPackage.java rename to spring-statemachine-autoconfigure/src/test/java/org/springframework/statemachine/boot/TestAutoConfigurationPackage.java diff --git a/spring-statemachine-boot/src/test/java/org/springframework/statemachine/boot/TestAutoConfigurationPackageRegistrar.java b/spring-statemachine-autoconfigure/src/test/java/org/springframework/statemachine/boot/TestAutoConfigurationPackageRegistrar.java similarity index 100% rename from spring-statemachine-boot/src/test/java/org/springframework/statemachine/boot/TestAutoConfigurationPackageRegistrar.java rename to spring-statemachine-autoconfigure/src/test/java/org/springframework/statemachine/boot/TestAutoConfigurationPackageRegistrar.java diff --git a/spring-statemachine-boot/src/test/java/org/springframework/statemachine/boot/TestUtils.java b/spring-statemachine-autoconfigure/src/test/java/org/springframework/statemachine/boot/TestUtils.java similarity index 100% rename from spring-statemachine-boot/src/test/java/org/springframework/statemachine/boot/TestUtils.java rename to spring-statemachine-autoconfigure/src/test/java/org/springframework/statemachine/boot/TestUtils.java diff --git a/spring-statemachine-samples/build.gradle b/spring-statemachine-samples/build.gradle index 58c7d23c..4becdbe6 100644 --- a/spring-statemachine-samples/build.gradle +++ b/spring-statemachine-samples/build.gradle @@ -117,7 +117,7 @@ project('spring-statemachine-samples-ordershipping') { project('spring-statemachine-samples-datajpa') { description = 'Spring State Machine Data Jpa Sample' dependencies { - compile project(":spring-statemachine-boot") + compile project(":spring-statemachine-autoconfigure") compile project(":spring-statemachine-data-common:spring-statemachine-data-jpa") compile("org.springframework.boot:spring-boot-starter-web") compile("org.springframework.boot:spring-boot-starter-thymeleaf") @@ -130,7 +130,7 @@ project('spring-statemachine-samples-datajpa') { project('spring-statemachine-samples-datajpapersist') { description = 'Spring State Machine Data Jpa Persist Sample' dependencies { - compile project(":spring-statemachine-boot") + compile project(":spring-statemachine-autoconfigure") compile project(":spring-statemachine-data-common:spring-statemachine-data-jpa") compile("org.springframework.boot:spring-boot-starter-web") compile("org.springframework.boot:spring-boot-starter-thymeleaf") @@ -143,7 +143,7 @@ project('spring-statemachine-samples-datajpapersist') { project('spring-statemachine-samples-monitoring') { description = 'Spring State Machine Monitoring Sample' dependencies { - compile project(":spring-statemachine-boot") + compile project(":spring-statemachine-autoconfigure") compile("org.springframework.boot:spring-boot-starter-actuator") compile("org.springframework.boot:spring-boot-starter-web") compile("org.springframework.boot:spring-boot-starter-thymeleaf")