diff --git a/pom.xml b/pom.xml index 278ee3c9c..45b7d9207 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ - 2.2.2-SNAPSHOT + 2.2.3-SNAPSHOT spring-batch-lightmin-core @@ -48,6 +48,7 @@ spring-batch-lightmin-embedded spring-batch-lightmin-validation spring-batch-lightmin-metrics + spring-batch-lightmin-bom diff --git a/spring-batch-lightmin-api/pom.xml b/spring-batch-lightmin-api/pom.xml index 809302b05..95dfda037 100644 --- a/spring-batch-lightmin-api/pom.xml +++ b/spring-batch-lightmin-api/pom.xml @@ -5,7 +5,7 @@ spring-batch-lightmin org.tuxdevelop - 2.2.2-SNAPSHOT + 2.2.3-SNAPSHOT 4.0.0 diff --git a/spring-batch-lightmin-bom/pom.xml b/spring-batch-lightmin-bom/pom.xml index 794d518a4..d3d4e20ca 100644 --- a/spring-batch-lightmin-bom/pom.xml +++ b/spring-batch-lightmin-bom/pom.xml @@ -6,7 +6,7 @@ org.tuxdevelop spring-batch-lightmin-bom - 2.2.2-SNAPSHOT + 2.2.3-SNAPSHOT pom Spring Batch Lightmin BOM diff --git a/spring-batch-lightmin-client/pom.xml b/spring-batch-lightmin-client/pom.xml index 9f3c3ae0d..41ec03809 100644 --- a/spring-batch-lightmin-client/pom.xml +++ b/spring-batch-lightmin-client/pom.xml @@ -5,7 +5,7 @@ spring-batch-lightmin org.tuxdevelop - 2.2.2-SNAPSHOT + 2.2.3-SNAPSHOT 4.0.0 diff --git a/spring-batch-lightmin-client/spring-batch-lightmin-client-classic/pom.xml b/spring-batch-lightmin-client/spring-batch-lightmin-client-classic/pom.xml index 6de34bc93..a96795e9e 100644 --- a/spring-batch-lightmin-client/spring-batch-lightmin-client-classic/pom.xml +++ b/spring-batch-lightmin-client/spring-batch-lightmin-client-classic/pom.xml @@ -5,7 +5,7 @@ spring-batch-lightmin-client org.tuxdevelop - 2.2.2-SNAPSHOT + 2.2.3-SNAPSHOT 4.0.0 diff --git a/spring-batch-lightmin-client/spring-batch-lightmin-client-classic/src/main/java/org/tuxdevelop/spring/batch/lightmin/client/classic/configuration/ClassicLightminClientConfiguration.java b/spring-batch-lightmin-client/spring-batch-lightmin-client-classic/src/main/java/org/tuxdevelop/spring/batch/lightmin/client/classic/configuration/ClassicLightminClientConfiguration.java index 3cf7033bf..af8b6c832 100644 --- a/spring-batch-lightmin-client/spring-batch-lightmin-client-classic/src/main/java/org/tuxdevelop/spring/batch/lightmin/client/classic/configuration/ClassicLightminClientConfiguration.java +++ b/spring-batch-lightmin-client/spring-batch-lightmin-client-classic/src/main/java/org/tuxdevelop/spring/batch/lightmin/client/classic/configuration/ClassicLightminClientConfiguration.java @@ -6,6 +6,7 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; import org.springframework.web.client.RestTemplate; import org.tuxdevelop.spring.batch.lightmin.client.annotation.EnableLightminClientCore; import org.tuxdevelop.spring.batch.lightmin.client.classic.event.OnClientApplicationReadyEventListener; @@ -14,12 +15,14 @@ import org.tuxdevelop.spring.batch.lightmin.client.classic.service.LightminClientRegistratorService; import org.tuxdevelop.spring.batch.lightmin.client.classic.service.UrlLightminServerLocatorService; import org.tuxdevelop.spring.batch.lightmin.client.configuration.LightminClientProperties; +import org.tuxdevelop.spring.batch.lightmin.client.configuration.LightminClientPublishEventsConfiguration; import org.tuxdevelop.spring.batch.lightmin.client.service.LightminServerLocatorService; @Configuration @EnableLightminClientCore @EnableConfigurationProperties( value = {LightminClientClassicConfigurationProperties.class}) +@Import(LightminClientPublishEventsConfiguration.class) public class ClassicLightminClientConfiguration { @Bean diff --git a/spring-batch-lightmin-client/spring-batch-lightmin-client-classic/src/test/resources/application.yml b/spring-batch-lightmin-client/spring-batch-lightmin-client-classic/src/test/resources/application.yml index ed7215b83..9ebb0e29f 100644 --- a/spring-batch-lightmin-client/spring-batch-lightmin-client-classic/src/test/resources/application.yml +++ b/spring-batch-lightmin-client/spring-batch-lightmin-client-classic/src/test/resources/application.yml @@ -1,6 +1,4 @@ spring: - main: - allow-bean-definition-overriding: true application: name: test_application batch: diff --git a/spring-batch-lightmin-client/spring-batch-lightmin-client-core/pom.xml b/spring-batch-lightmin-client/spring-batch-lightmin-client-core/pom.xml index 3a2ae83b0..2a42f0831 100644 --- a/spring-batch-lightmin-client/spring-batch-lightmin-client-core/pom.xml +++ b/spring-batch-lightmin-client/spring-batch-lightmin-client-core/pom.xml @@ -5,7 +5,7 @@ spring-batch-lightmin-client org.tuxdevelop - 2.2.2-SNAPSHOT + 2.2.3-SNAPSHOT 4.0.0 diff --git a/spring-batch-lightmin-client/spring-batch-lightmin-client-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/client/configuration/LightminClientConfiguration.java b/spring-batch-lightmin-client/spring-batch-lightmin-client-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/client/configuration/LightminClientConfiguration.java index 859467164..85441b07f 100644 --- a/spring-batch-lightmin-client/spring-batch-lightmin-client-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/client/configuration/LightminClientConfiguration.java +++ b/spring-batch-lightmin-client/spring-batch-lightmin-client-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/client/configuration/LightminClientConfiguration.java @@ -53,38 +53,6 @@ public RestTemplate serverRestTemplate(final LightminClientProperties lightminCl lightminClientProperties.getServer()); } - @Configuration - @ConditionalOnProperty( - prefix = "spring.batch.lightmin.client", - value = "publish-job-events", - havingValue = "true", - matchIfMissing = true) - public static class LightminClientPublishEventsConfiguration { - - @Bean - @ConditionalOnMissingBean(value = {StepExecutionEventPublisher.class}) - public StepExecutionEventPublisher stepExecutionEventPublisher( - final LightminServerLocatorService lightminServerLocator, - @Qualifier("serverRestTemplate") final RestTemplate restTemplate) { - return new RemoteStepExecutionEventPublisher(restTemplate, lightminServerLocator); - } - - @Bean - @ConditionalOnMissingBean(value = {JobExecutionEventPublisher.class}) - public JobExecutionEventPublisher jobExecutionEventPublisher( - final LightminServerLocatorService lightminServerLocatorService, - @Qualifier("serverRestTemplate") final RestTemplate restTemplate) { - return new RemoteJobExecutionEventPublisher(restTemplate, lightminServerLocatorService); - } - - @Bean - public OnJobExecutionFinishedEventListener onJobExecutionFinishedEventListener( - final JobExecutionEventPublisher jobExecutionEventPublisher, - final StepExecutionEventPublisher stepExecutionEventPublisher) { - return new OnJobExecutionFinishedEventListener(jobExecutionEventPublisher, stepExecutionEventPublisher); - } - } - @Configuration @ConditionalOnProperty( prefix = "spring.batch.lightmin.client", diff --git a/spring-batch-lightmin-client/spring-batch-lightmin-client-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/client/configuration/LightminClientPublishEventsConfiguration.java b/spring-batch-lightmin-client/spring-batch-lightmin-client-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/client/configuration/LightminClientPublishEventsConfiguration.java new file mode 100644 index 000000000..a52342e61 --- /dev/null +++ b/spring-batch-lightmin-client/spring-batch-lightmin-client-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/client/configuration/LightminClientPublishEventsConfiguration.java @@ -0,0 +1,46 @@ +package org.tuxdevelop.spring.batch.lightmin.client.configuration; + +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.client.RestTemplate; +import org.tuxdevelop.spring.batch.lightmin.client.listener.OnJobExecutionFinishedEventListener; +import org.tuxdevelop.spring.batch.lightmin.client.publisher.JobExecutionEventPublisher; +import org.tuxdevelop.spring.batch.lightmin.client.publisher.RemoteJobExecutionEventPublisher; +import org.tuxdevelop.spring.batch.lightmin.client.publisher.RemoteStepExecutionEventPublisher; +import org.tuxdevelop.spring.batch.lightmin.client.publisher.StepExecutionEventPublisher; +import org.tuxdevelop.spring.batch.lightmin.client.service.LightminServerLocatorService; + +@Configuration +@ConditionalOnProperty( + prefix = "spring.batch.lightmin.client", + value = "publish-job-events", + havingValue = "true", + matchIfMissing = true) +public class LightminClientPublishEventsConfiguration { + + @Bean + @ConditionalOnMissingBean(value = {StepExecutionEventPublisher.class}) + public StepExecutionEventPublisher stepExecutionEventPublisher( + final LightminServerLocatorService lightminServerLocator, + @Qualifier("serverRestTemplate") final RestTemplate restTemplate) { + return new RemoteStepExecutionEventPublisher(restTemplate, lightminServerLocator); + } + + @Bean + @ConditionalOnMissingBean(value = {JobExecutionEventPublisher.class}) + public JobExecutionEventPublisher jobExecutionEventPublisher( + final LightminServerLocatorService lightminServerLocatorService, + @Qualifier("serverRestTemplate") final RestTemplate restTemplate) { + return new RemoteJobExecutionEventPublisher(restTemplate, lightminServerLocatorService); + } + + @Bean + public OnJobExecutionFinishedEventListener onJobExecutionFinishedEventListener( + final JobExecutionEventPublisher jobExecutionEventPublisher, + final StepExecutionEventPublisher stepExecutionEventPublisher) { + return new OnJobExecutionFinishedEventListener(jobExecutionEventPublisher, stepExecutionEventPublisher); + } +} diff --git a/spring-batch-lightmin-client/spring-batch-lightmin-client-discovery-consul/pom.xml b/spring-batch-lightmin-client/spring-batch-lightmin-client-discovery-consul/pom.xml index 151f7a398..22f8d31fb 100644 --- a/spring-batch-lightmin-client/spring-batch-lightmin-client-discovery-consul/pom.xml +++ b/spring-batch-lightmin-client/spring-batch-lightmin-client-discovery-consul/pom.xml @@ -5,7 +5,7 @@ spring-batch-lightmin-client org.tuxdevelop - 2.2.2-SNAPSHOT + 2.2.3-SNAPSHOT 4.0.0 diff --git a/spring-batch-lightmin-client/spring-batch-lightmin-client-discovery-consul/src/test/resources/application.yml b/spring-batch-lightmin-client/spring-batch-lightmin-client-discovery-consul/src/test/resources/application.yml index 476d9df0c..607dcf75e 100644 --- a/spring-batch-lightmin-client/spring-batch-lightmin-client-discovery-consul/src/test/resources/application.yml +++ b/spring-batch-lightmin-client/spring-batch-lightmin-client-discovery-consul/src/test/resources/application.yml @@ -1,6 +1,4 @@ spring: - main: - allow-bean-definition-overriding: true application: name: test_application batch: diff --git a/spring-batch-lightmin-client/spring-batch-lightmin-client-discovery-core/pom.xml b/spring-batch-lightmin-client/spring-batch-lightmin-client-discovery-core/pom.xml index 5919449e2..3625b841d 100644 --- a/spring-batch-lightmin-client/spring-batch-lightmin-client-discovery-core/pom.xml +++ b/spring-batch-lightmin-client/spring-batch-lightmin-client-discovery-core/pom.xml @@ -5,7 +5,7 @@ spring-batch-lightmin-client org.tuxdevelop - 2.2.2-SNAPSHOT + 2.2.3-SNAPSHOT 4.0.0 diff --git a/spring-batch-lightmin-client/spring-batch-lightmin-client-discovery-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/client/discovery/configuration/LightminClientDiscoveryConfiguration.java b/spring-batch-lightmin-client/spring-batch-lightmin-client-discovery-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/client/discovery/configuration/LightminClientDiscoveryConfiguration.java index 847803021..4d0c0b061 100644 --- a/spring-batch-lightmin-client/spring-batch-lightmin-client-discovery-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/client/discovery/configuration/LightminClientDiscoveryConfiguration.java +++ b/spring-batch-lightmin-client/spring-batch-lightmin-client-discovery-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/client/discovery/configuration/LightminClientDiscoveryConfiguration.java @@ -1,7 +1,6 @@ package org.tuxdevelop.spring.batch.lightmin.client.discovery.configuration; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.cloud.client.discovery.DiscoveryClient; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; @@ -12,8 +11,6 @@ import org.tuxdevelop.spring.batch.lightmin.client.configuration.LightminClientConfiguration; import org.tuxdevelop.spring.batch.lightmin.client.configuration.LightminClientProperties; import org.tuxdevelop.spring.batch.lightmin.client.discovery.listener.DiscoveryListener; -import org.tuxdevelop.spring.batch.lightmin.client.discovery.metadata.MetaDataExtender; -import org.tuxdevelop.spring.batch.lightmin.client.discovery.metadata.NoOperationMetaDataExtender; import org.tuxdevelop.spring.batch.lightmin.client.discovery.service.DiscoveryLightminServerLocatorService; import org.tuxdevelop.spring.batch.lightmin.client.service.LightminServerLocatorService; @@ -33,12 +30,6 @@ public DiscoveryListener discoveryListener(final LightminClientProperties lightm return new DiscoveryListener(lightminClientProperties); } - @Bean - @ConditionalOnMissingBean(MetaDataExtender.class) - public MetaDataExtender metaDataExtender() { - return new NoOperationMetaDataExtender(); - } - @Bean public LightminServerLocatorService discoveryLightminServerLocator( final LightminClientDiscoveryProperties lightminClientDiscoveryProperties, diff --git a/spring-batch-lightmin-client/spring-batch-lightmin-client-discovery-eureka/pom.xml b/spring-batch-lightmin-client/spring-batch-lightmin-client-discovery-eureka/pom.xml index 25fcf11bc..ff670ce8d 100644 --- a/spring-batch-lightmin-client/spring-batch-lightmin-client-discovery-eureka/pom.xml +++ b/spring-batch-lightmin-client/spring-batch-lightmin-client-discovery-eureka/pom.xml @@ -5,7 +5,7 @@ spring-batch-lightmin-client org.tuxdevelop - 2.2.2-SNAPSHOT + 2.2.3-SNAPSHOT 4.0.0 diff --git a/spring-batch-lightmin-client/spring-batch-lightmin-client-discovery-eureka/src/test/resources/application.yml b/spring-batch-lightmin-client/spring-batch-lightmin-client-discovery-eureka/src/test/resources/application.yml index 476d9df0c..607dcf75e 100644 --- a/spring-batch-lightmin-client/spring-batch-lightmin-client-discovery-eureka/src/test/resources/application.yml +++ b/spring-batch-lightmin-client/spring-batch-lightmin-client-discovery-eureka/src/test/resources/application.yml @@ -1,6 +1,4 @@ spring: - main: - allow-bean-definition-overriding: true application: name: test_application batch: diff --git a/spring-batch-lightmin-core/pom.xml b/spring-batch-lightmin-core/pom.xml index 07cf4f987..5d478e1d6 100644 --- a/spring-batch-lightmin-core/pom.xml +++ b/spring-batch-lightmin-core/pom.xml @@ -8,7 +8,7 @@ spring-batch-lightmin org.tuxdevelop - 2.2.2-SNAPSHOT + 2.2.3-SNAPSHOT spring-batch-lightmin-core diff --git a/spring-batch-lightmin-core/spring-batch-lightmin-core-batch/pom.xml b/spring-batch-lightmin-core/spring-batch-lightmin-core-batch/pom.xml index 2fb1352ad..7b08df3b1 100644 --- a/spring-batch-lightmin-core/spring-batch-lightmin-core-batch/pom.xml +++ b/spring-batch-lightmin-core/spring-batch-lightmin-core-batch/pom.xml @@ -5,7 +5,7 @@ spring-batch-lightmin-core org.tuxdevelop - 2.2.2-SNAPSHOT + 2.2.3-SNAPSHOT 4.0.0 diff --git a/spring-batch-lightmin-core/spring-batch-lightmin-core-batch/src/main/java/org/tuxdevelop/spring/batch/lightmin/batch/configuration/SpringBatchLightminBatchConfiguration.java b/spring-batch-lightmin-core/spring-batch-lightmin-core-batch/src/main/java/org/tuxdevelop/spring/batch/lightmin/batch/configuration/SpringBatchLightminBatchConfiguration.java index 23dcc6533..99a47edd9 100644 --- a/spring-batch-lightmin-core/spring-batch-lightmin-core-batch/src/main/java/org/tuxdevelop/spring/batch/lightmin/batch/configuration/SpringBatchLightminBatchConfiguration.java +++ b/spring-batch-lightmin-core/spring-batch-lightmin-core-batch/src/main/java/org/tuxdevelop/spring/batch/lightmin/batch/configuration/SpringBatchLightminBatchConfiguration.java @@ -21,7 +21,6 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Primary; import org.springframework.core.task.SimpleAsyncTaskExecutor; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.support.incrementer.AbstractDataFieldMaxValueIncrementer; @@ -92,12 +91,6 @@ public JobLauncher defaultAsyncJobLauncher(final JobRepository jobRepository) { return jobLauncher; } - @Primary - @Bean(name = "jobLauncher") - public JobLauncher jobLauncher(final BatchConfigurer batchConfigurer) throws Exception { - return batchConfigurer.getJobLauncher(); - } - @Bean @ConditionalOnMissingBean(value = {JobLauncher.class}) public JobExplorer jobExplorer(final BatchConfigurer batchConfigurer) throws Exception { diff --git a/spring-batch-lightmin-core/spring-batch-lightmin-core-batch/src/test/resources/application.properties b/spring-batch-lightmin-core/spring-batch-lightmin-core-batch/src/test/resources/application.properties index 82cb1cc39..132728afc 100644 --- a/spring-batch-lightmin-core/spring-batch-lightmin-core-batch/src/test/resources/application.properties +++ b/spring-batch-lightmin-core/spring-batch-lightmin-core-batch/src/test/resources/application.properties @@ -1,2 +1 @@ -spring.batch.job.enabled=false -spring.main.allow-bean-definition-overriding=true \ No newline at end of file +spring.batch.job.enabled=false \ No newline at end of file diff --git a/spring-batch-lightmin-core/spring-batch-lightmin-core-configuration/pom.xml b/spring-batch-lightmin-core/spring-batch-lightmin-core-configuration/pom.xml index f066f8a94..9a26e3a8a 100644 --- a/spring-batch-lightmin-core/spring-batch-lightmin-core-configuration/pom.xml +++ b/spring-batch-lightmin-core/spring-batch-lightmin-core-configuration/pom.xml @@ -5,7 +5,7 @@ spring-batch-lightmin-core org.tuxdevelop - 2.2.2-SNAPSHOT + 2.2.3-SNAPSHOT 4.0.0 diff --git a/spring-batch-lightmin-core/spring-batch-lightmin-core-configuration/src/main/java/org/tuxdevelop/spring/batch/lightmin/configuration/SpringBatchLightminCoreConfigurationProperties.java b/spring-batch-lightmin-core/spring-batch-lightmin-core-configuration/src/main/java/org/tuxdevelop/spring/batch/lightmin/configuration/SpringBatchLightminCoreConfigurationProperties.java index 45dc3c57d..5b3023943 100644 --- a/spring-batch-lightmin-core/spring-batch-lightmin-core-configuration/src/main/java/org/tuxdevelop/spring/batch/lightmin/configuration/SpringBatchLightminCoreConfigurationProperties.java +++ b/spring-batch-lightmin-core/spring-batch-lightmin-core-configuration/src/main/java/org/tuxdevelop/spring/batch/lightmin/configuration/SpringBatchLightminCoreConfigurationProperties.java @@ -13,8 +13,6 @@ @ConfigurationProperties(prefix = "spring.batch.lightmin") public class SpringBatchLightminCoreConfigurationProperties { - private static final String DEFAULT_DATA_SOURCE_NAME = "dataSource"; - private final Environment environment; @Autowired diff --git a/spring-batch-lightmin-core/spring-batch-lightmin-core-configuration/src/test/java/org/tuxdevelop/spring/batch/lightmin/util/BeanRegistrarIT.java b/spring-batch-lightmin-core/spring-batch-lightmin-core-configuration/src/test/java/org/tuxdevelop/spring/batch/lightmin/util/BeanRegistrarIT.java index e1155393b..27dd420cc 100644 --- a/spring-batch-lightmin-core/spring-batch-lightmin-core-configuration/src/test/java/org/tuxdevelop/spring/batch/lightmin/util/BeanRegistrarIT.java +++ b/spring-batch-lightmin-core/spring-batch-lightmin-core-configuration/src/test/java/org/tuxdevelop/spring/batch/lightmin/util/BeanRegistrarIT.java @@ -1,6 +1,7 @@ package org.tuxdevelop.spring.batch.lightmin.util; import lombok.extern.slf4j.Slf4j; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.springframework.batch.core.Job; @@ -19,6 +20,7 @@ import java.util.Set; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertFalse; @Slf4j public class BeanRegistrarIT { @@ -28,12 +30,25 @@ public class BeanRegistrarIT { private Job simpleJob; private JobLauncher jobLauncher; + @Test + public void registerUnregisteredBean() { + this.beanRegistrar.registerBean(String.class, "firstBean", null, null, null, null, null); + String registeredBean = (String) this.applicationContext.getBean("firstBean"); + assertThat(registeredBean).isNotNull(); + + this.beanRegistrar.unregisterBean("firstBean"); + assertFalse(this.applicationContext.containsBeanDefinition("firstBean")); + + this.beanRegistrar.registerBean(String.class, "firstBean", null, null, null, null, null); + registeredBean = (String) this.applicationContext.getBean("firstBean"); + assertThat(registeredBean).isNotNull(); + } + @Test public void registerBeanStringIT() { this.beanRegistrar.registerBean(String.class, "sampleString", null, null, null, null, null); final String registeredBean = (String) this.applicationContext.getBean("sampleString"); assertThat(registeredBean).isNotNull(); - this.applicationContext.close(); } @Test @@ -44,7 +59,6 @@ public void registerBeanStringValueIT() { final String registeredBean = (String) this.applicationContext.getBean("sampleString"); assertThat(registeredBean).isNotNull(); assertThat(registeredBean).isEqualTo("Test"); - this.applicationContext.close(); } @Test(expected = NoSuchBeanDefinitionException.class) @@ -58,7 +72,6 @@ public void unregisterBeanStringIT() { this.beanRegistrar.unregisterBean("sampleStringSecond"); final String gotBean = this.applicationContext.getBean("sampleStringSecond", String.class); log.info("got: " + gotBean); - this.applicationContext.close(); } @Test(expected = NoSuchBeanDefinitionException.class) @@ -88,7 +101,6 @@ public void registerPeriodSchedulerIT() { .class); assertThat(periodScheduler).isNotNull(); periodScheduler.schedule(); - this.applicationContext.close(); } @Before @@ -98,4 +110,9 @@ public void init() { this.simpleJob = this.applicationContext.getBean("simpleJob", Job.class); this.jobLauncher = this.applicationContext.getBean("jobLauncher", JobLauncher.class); } + + @After + public void tearDown() { + this.applicationContext.close(); + } } diff --git a/spring-batch-lightmin-core/spring-batch-lightmin-core-configuration/src/test/resources/properties/jdbc.properties b/spring-batch-lightmin-core/spring-batch-lightmin-core-configuration/src/test/resources/properties/jdbc.properties index 776b68c7d..31f3f176b 100644 --- a/spring-batch-lightmin-core/spring-batch-lightmin-core-configuration/src/test/resources/properties/jdbc.properties +++ b/spring-batch-lightmin-core/spring-batch-lightmin-core-configuration/src/test/resources/properties/jdbc.properties @@ -1,4 +1,3 @@ spring.batch.job.enabled=false spring.batch.lightmin.batch.repository-type=jdbc spring.batch.lightmin.application-name=test -spring.main.allow-bean-definition-overriding=true diff --git a/spring-batch-lightmin-core/spring-batch-lightmin-core-configuration/src/test/resources/properties/map.properties b/spring-batch-lightmin-core/spring-batch-lightmin-core-configuration/src/test/resources/properties/map.properties index 146a3583b..71e3b3607 100644 --- a/spring-batch-lightmin-core/spring-batch-lightmin-core-configuration/src/test/resources/properties/map.properties +++ b/spring-batch-lightmin-core/spring-batch-lightmin-core-configuration/src/test/resources/properties/map.properties @@ -1,4 +1,3 @@ spring.batch.job.enabled=false spring.batch.lightmin.batch.repository-type=map spring.batch.lightmin.application-name=test -spring.main.allow-bean-definition-overriding=true diff --git a/spring-batch-lightmin-core/spring-batch-lightmin-core-service/pom.xml b/spring-batch-lightmin-core/spring-batch-lightmin-core-service/pom.xml index b067d94f0..3d5f45f07 100644 --- a/spring-batch-lightmin-core/spring-batch-lightmin-core-service/pom.xml +++ b/spring-batch-lightmin-core/spring-batch-lightmin-core-service/pom.xml @@ -5,7 +5,7 @@ spring-batch-lightmin-core org.tuxdevelop - 2.2.2-SNAPSHOT + 2.2.3-SNAPSHOT 4.0.0 diff --git a/spring-batch-lightmin-core/spring-batch-lightmin-core-service/src/main/java/org/tuxdevelop/spring/batch/lightmin/configuration/SpringBatchLightminRestConfiguration.java b/spring-batch-lightmin-core/spring-batch-lightmin-core-service/src/main/java/org/tuxdevelop/spring/batch/lightmin/configuration/SpringBatchLightminRestConfiguration.java index a8f1467d2..0a94e5e1a 100644 --- a/spring-batch-lightmin-core/spring-batch-lightmin-core-service/src/main/java/org/tuxdevelop/spring/batch/lightmin/configuration/SpringBatchLightminRestConfiguration.java +++ b/spring-batch-lightmin-core/spring-batch-lightmin-core-service/src/main/java/org/tuxdevelop/spring/batch/lightmin/configuration/SpringBatchLightminRestConfiguration.java @@ -1,8 +1,6 @@ package org.tuxdevelop.spring.batch.lightmin.configuration; import org.springframework.batch.core.configuration.JobRegistry; -import org.springframework.batch.core.launch.JobLauncher; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.tuxdevelop.spring.batch.lightmin.client.api.controller.JobConfigurationRestController; @@ -37,13 +35,4 @@ public JobRestController jobRestController(final ServiceEntry serviceEntry) { public JobLauncherRestController jobLauncherRestController(final ServiceEntry serviceEntry) { return new JobLauncherRestController(serviceEntry); } - - @Bean - public JobLauncherBean jobLauncherBean( - @Qualifier("defaultAsyncJobLauncher") final JobLauncher defaultAsyncJobLauncher, - final JobRegistry jobRegistry, - final SpringBatchLightminCoreConfigurationProperties properties) { - return new JobLauncherBean(defaultAsyncJobLauncher, jobRegistry, properties); - } - } diff --git a/spring-batch-lightmin-core/spring-batch-lightmin-core-service/src/main/java/org/tuxdevelop/spring/batch/lightmin/service/DefaultSchedulerService.java b/spring-batch-lightmin-core/spring-batch-lightmin-core-service/src/main/java/org/tuxdevelop/spring/batch/lightmin/service/DefaultSchedulerService.java index afd95da91..8b0e03bcd 100644 --- a/spring-batch-lightmin-core/spring-batch-lightmin-core-service/src/main/java/org/tuxdevelop/spring/batch/lightmin/service/DefaultSchedulerService.java +++ b/spring-batch-lightmin-core/spring-batch-lightmin-core-service/src/main/java/org/tuxdevelop/spring/batch/lightmin/service/DefaultSchedulerService.java @@ -30,12 +30,10 @@ public class DefaultSchedulerService implements SchedulerService { private static final String EXECUTOR_SUFFIX = "_executor"; - - private ApplicationContext applicationContext; - private final BeanRegistrar beanRegistrar; private final JobRepository jobRepository; private final JobRegistry jobRegistry; + private ApplicationContext applicationContext; public DefaultSchedulerService(final BeanRegistrar beanRegistrar, final JobRepository jobRepository, @@ -69,7 +67,9 @@ public String registerSchedulerForJob(final JobConfiguration jobConfiguration) { @Override public void unregisterSchedulerForJob(final String beanName) { + //Unregister Scheduler with corresponding ThreadPoolTaskScheduler this.beanRegistrar.unregisterBean(beanName); + this.beanRegistrar.unregisterBean(beanName + EXECUTOR_SUFFIX); } @Override diff --git a/spring-batch-lightmin-core/spring-batch-lightmin-core-service/src/test/resources/application.yml b/spring-batch-lightmin-core/spring-batch-lightmin-core-service/src/test/resources/application.yml deleted file mode 100644 index 3aefce013..000000000 --- a/spring-batch-lightmin-core/spring-batch-lightmin-core-service/src/test/resources/application.yml +++ /dev/null @@ -1,3 +0,0 @@ -spring: - main: - allow-bean-definition-overriding: true \ No newline at end of file diff --git a/spring-batch-lightmin-core/spring-batch-lightmin-core-starter/pom.xml b/spring-batch-lightmin-core/spring-batch-lightmin-core-starter/pom.xml index 55657c238..e02b42477 100644 --- a/spring-batch-lightmin-core/spring-batch-lightmin-core-starter/pom.xml +++ b/spring-batch-lightmin-core/spring-batch-lightmin-core-starter/pom.xml @@ -5,7 +5,7 @@ spring-batch-lightmin-core org.tuxdevelop - 2.2.2-SNAPSHOT + 2.2.3-SNAPSHOT 4.0.0 diff --git a/spring-batch-lightmin-documentation/pom.xml b/spring-batch-lightmin-documentation/pom.xml index c92b6a4f4..5930b3ccb 100644 --- a/spring-batch-lightmin-documentation/pom.xml +++ b/spring-batch-lightmin-documentation/pom.xml @@ -5,7 +5,7 @@ spring-batch-lightmin org.tuxdevelop - 2.2.2-SNAPSHOT + 2.2.3-SNAPSHOT 4.0.0 diff --git a/spring-batch-lightmin-documentation/src/main/doc/spring_batch_lightmin.html b/spring-batch-lightmin-documentation/src/main/doc/spring_batch_lightmin.html index a167b0ba1..060108882 100644 --- a/spring-batch-lightmin-documentation/src/main/doc/spring_batch_lightmin.html +++ b/spring-batch-lightmin-documentation/src/main/doc/spring_batch_lightmin.html @@ -3360,20 +3360,20 @@
HTTP Response
HTTP/1.1 201 Created
 Content-Type: application/json
 Transfer-Encoding: chunked
-Date: Sat, 16 Jan 2021 18:58:24 GMT
+Date: Thu, 27 May 2021 15:45:40 GMT
 Keep-Alive: timeout=60
 Connection: keep-alive
 Content-Length: 875
 
 {
-  "id" : "b1b4e3f8",
+  "id" : "0a7e2821",
   "name" : "it-application",
-  "managementUrl" : "http://localhost:36963/actuator",
-  "healthUrl" : "http://localhost:36963/actuator/health",
-  "serviceUrl" : "http://localhost:36963",
+  "managementUrl" : "http://localhost:59519/actuator",
+  "healthUrl" : "http://localhost:59519/actuator/health",
+  "serviceUrl" : "http://localhost:59519",
   "lightminClientApplicationStatus" : {
     "status" : "UNKNOWN",
-    "timeInMills" : 1610823505636
+    "timeInMills" : 1622130340114
   },
   "lightminClientInformation" : {
     "supportedSchedulerTypes" : [ "CRON", "PERIOD" ],
@@ -3397,7 +3397,7 @@ 
Unregister

 
Curl

 

 

-
$ curl 'http://localhost/api/applications/b1b4e3f8' -i -X DELETE \
+
$ curl 'http://localhost/api/applications/0a7e2821' -i -X DELETE \
     -H 'Accept: application/json, application/javascript, text/javascript, text/json' \
     -H 'Content-Type: application/json; charset=UTF-8'

 

@@ -3407,7 +3407,7 @@ 
Curl

 
HTTP Request

 

 

-
DELETE /api/applications/b1b4e3f8 HTTP/1.1
+
DELETE /api/applications/0a7e2821 HTTP/1.1
 Accept: application/json, application/javascript, text/javascript, text/json
 Content-Type: application/json; charset=UTF-8
 Host: localhost

@@ -3421,20 +3421,20 @@ 
HTTP Response

 
HTTP/1.1 200 OK
 Content-Type: application/json
 Transfer-Encoding: chunked
-Date: Sat, 16 Jan 2021 18:58:25 GMT
+Date: Thu, 27 May 2021 15:45:40 GMT
 Keep-Alive: timeout=60
 Connection: keep-alive
 Content-Length: 875
 
 {
-  "id" : "b1b4e3f8",
+  "id" : "0a7e2821",
   "name" : "it-application",
-  "managementUrl" : "http://localhost:36963/actuator",
-  "healthUrl" : "http://localhost:36963/actuator/health",
-  "serviceUrl" : "http://localhost:36963",
+  "managementUrl" : "http://localhost:59519/actuator",
+  "healthUrl" : "http://localhost:59519/actuator/health",
+  "serviceUrl" : "http://localhost:59519",
   "lightminClientApplicationStatus" : {
     "status" : "UNKNOWN",
-    "timeInMills" : 1610823505636
+    "timeInMills" : 1622130340114
   },
   "lightminClientInformation" : {
     "supportedSchedulerTypes" : [ "CRON", "PERIOD" ],
@@ -3482,20 +3482,20 @@ 
HTTP Response

 
HTTP/1.1 200 OK
 Content-Type: application/json
 Transfer-Encoding: chunked
-Date: Sat, 16 Jan 2021 18:58:24 GMT
+Date: Thu, 27 May 2021 15:45:40 GMT
 Keep-Alive: timeout=60
 Connection: keep-alive
 Content-Length: 879
 
 [ {
-  "id" : "b1b4e3f8",
+  "id" : "0a7e2821",
   "name" : "it-application",
-  "managementUrl" : "http://localhost:36963/actuator",
-  "healthUrl" : "http://localhost:36963/actuator/health",
-  "serviceUrl" : "http://localhost:36963",
+  "managementUrl" : "http://localhost:59519/actuator",
+  "healthUrl" : "http://localhost:59519/actuator/health",
+  "serviceUrl" : "http://localhost:59519",
   "lightminClientApplicationStatus" : {
     "status" : "UNKNOWN",
-    "timeInMills" : 1610823505636
+    "timeInMills" : 1622130340114
   },
   "lightminClientInformation" : {
     "supportedSchedulerTypes" : [ "CRON", "PERIOD" ],
@@ -3530,8 +3530,8 @@ 
Curl

     "exitCode" : "FAILED",
     "exitDescription" : "failed for test"
   },
-  "startDate" : 1610823504929,
-  "endDate" : 1610823514929
+  "startDate" : 1622130340939,
+  "endDate" : 1622130350939
 }'

 

 

@@ -3554,8 +3554,8 @@ 
HTTP Request

     "exitCode" : "FAILED",
     "exitDescription" : "failed for test"
   },
-  "startDate" : 1610823504929,
-  "endDate" : 1610823514929
+  "startDate" : 1622130340939,
+  "endDate" : 1622130350939
 }
@@ -3565,7 +3565,7 @@
HTTP Response
HTTP/1.1 201 Created
-Date: Sat, 16 Jan 2021 18:58:24 GMT
+Date: Thu, 27 May 2021 15:45:40 GMT
 Keep-Alive: timeout=60
 Connection: keep-alive
@@ -3583,7 +3583,7 @@
Get All Job Executions
Curl
-
$ curl 'http://localhost/api/jobexecutionpages/all?jobinstanceid=24' -i -X GET \
+
$ curl 'http://localhost/api/jobexecutionpages/all?jobinstanceid=16' -i -X GET \
     -H 'Accept: application/json, application/javascript, text/javascript, text/json'
@@ -3592,7 +3592,7 @@
Curl
HTTP Request
-
GET /api/jobexecutionpages/all?jobinstanceid=24 HTTP/1.1
+
GET /api/jobexecutionpages/all?jobinstanceid=16 HTTP/1.1
 Accept: application/json, application/javascript, text/javascript, text/json
 Host: localhost
@@ -3605,7 +3605,7 @@
HTTP Response
HTTP/1.1 200 OK
 Content-Type: application/json;charset=UTF-8
 Transfer-Encoding: chunked
-Date: Sat, 16 Jan 2021 18:58:28 GMT
+Date: Thu, 27 May 2021 15:45:42 GMT
 Keep-Alive: timeout=60
 Connection: keep-alive
 Content-Length: 1549
@@ -3615,27 +3615,27 @@ 
HTTP Response

   "pageSize" : 1,
   "jobName" : "simpleJob",
   "totalJobExecutionCount" : 1,
-  "jobInstanceId" : 24,
+  "jobInstanceId" : 16,
   "jobExecutions" : [ {
-    "id" : 24,
+    "id" : 16,
     "version" : 2,
     "jobParameters" : {
       "parameters" : {
         "date" : {
-          "parameter" : "2021/01/16 19:58:29:065[date]",
+          "parameter" : "2021/05/27 18:45:42:779[date]",
           "parameterType" : "DATE"
         }
       }
     },
     "jobInstance" : {
-      "id" : 24,
+      "id" : 16,
       "version" : 0,
       "jobName" : "simpleJob"
     },
     "stepExecutions" : [ {
-      "id" : 24,
+      "id" : 16,
       "version" : 3,
-      "jobExecutionId" : 24,
+      "jobExecutionId" : 16,
       "stepName" : "simpleStep",
       "status" : "COMPLETED",
       "readCount" : 0,
@@ -3645,9 +3645,9 @@ 
HTTP Response

       "readSkipCount" : 0,
       "processSkipCount" : 0,
       "writeSkipCount" : 0,
-      "startTime" : "2021-01-16T18:58:29.069+00:00",
-      "endTime" : "2021-01-16T18:58:29.070+00:00",
-      "lastUpdated" : "2021-01-16T18:58:29.070+00:00",
+      "startTime" : "2021-05-27T15:45:42.782+00:00",
+      "endTime" : "2021-05-27T15:45:42.784+00:00",
+      "lastUpdated" : "2021-05-27T15:45:42.784+00:00",
       "exitStatus" : {
         "exitCode" : "COMPLETED",
         "exitDescription" : ""
@@ -3657,10 +3657,10 @@ 
HTTP Response

       "failureExceptions" : [ ]
     } ],
     "status" : "COMPLETED",
-    "startTime" : "2021-01-16T18:58:29.067+00:00",
-    "createTime" : "2021-01-16T18:58:29.066+00:00",
-    "endTime" : "2021-01-16T18:58:29.070+00:00",
-    "lastUpdated" : "2021-01-16T18:58:29.084+00:00",
+    "startTime" : "2021-05-27T15:45:42.781+00:00",
+    "createTime" : "2021-05-27T15:45:42.780+00:00",
+    "endTime" : "2021-05-27T15:45:42.784+00:00",
+    "lastUpdated" : "2021-05-27T15:45:42.793+00:00",
     "exitStatus" : {
       "exitCode" : "COMPLETED",
       "exitDescription" : ""
@@ -3679,7 +3679,7 @@ 
Get Job Executions

 
Curl

 

 

-
$ curl 'http://localhost/api/jobexecutionpages?jobinstanceid=23&startindex=0&pagesize=5' -i -X GET \
+
$ curl 'http://localhost/api/jobexecutionpages?jobinstanceid=15&startindex=0&pagesize=5' -i -X GET \
     -H 'Accept: application/json, application/javascript, text/javascript, text/json'

 

 

@@ -3688,7 +3688,7 @@ 
Curl

 
HTTP Request

 

 

-
GET /api/jobexecutionpages?jobinstanceid=23&startindex=0&pagesize=5 HTTP/1.1
+
GET /api/jobexecutionpages?jobinstanceid=15&startindex=0&pagesize=5 HTTP/1.1
 Accept: application/json, application/javascript, text/javascript, text/json
 Host: localhost

 

@@ -3701,7 +3701,7 @@ 
HTTP Response

 
HTTP/1.1 200 OK
 Content-Type: application/json;charset=UTF-8
 Transfer-Encoding: chunked
-Date: Sat, 16 Jan 2021 18:58:28 GMT
+Date: Thu, 27 May 2021 15:45:42 GMT
 Keep-Alive: timeout=60
 Connection: keep-alive
 Content-Length: 883
@@ -3711,35 +3711,35 @@ 
HTTP Response

   "pageSize" : 5,
   "jobName" : "simpleJob",
   "totalJobExecutionCount" : 1,
-  "jobInstanceId" : 23,
+  "jobInstanceId" : 15,
   "jobExecutions" : [ {
-    "id" : 23,
+    "id" : 15,
     "version" : 2,
     "jobParameters" : {
       "parameters" : {
         "date" : {
-          "parameter" : "2021/01/16 19:58:29:009[date]",
+          "parameter" : "2021/05/27 18:45:42:726[date]",
           "parameterType" : "DATE"
         }
       }
     },
     "jobInstance" : {
-      "id" : 23,
+      "id" : 15,
       "version" : 0,
       "jobName" : "simpleJob"
     },
     "stepExecutions" : [ ],
     "status" : "COMPLETED",
-    "startTime" : "2021-01-16T18:58:29.011+00:00",
-    "createTime" : "2021-01-16T18:58:29.011+00:00",
-    "endTime" : "2021-01-16T18:58:29.015+00:00",
-    "lastUpdated" : "2021-01-16T18:58:29.029+00:00",
+    "startTime" : "2021-05-27T15:45:42.728+00:00",
+    "createTime" : "2021-05-27T15:45:42.727+00:00",
+    "endTime" : "2021-05-27T15:45:42.731+00:00",
+    "lastUpdated" : "2021-05-27T15:45:42.745+00:00",
     "exitStatus" : {
       "exitCode" : "COMPLETED",
       "exitDescription" : ""
     },
     "failureExceptions" : [ ],
-    "jobConfigurationName" : "23"
+    "jobConfigurationName" : "15"
   } ]
 }

 

@@ -3752,7 +3752,7 @@ 
Get Job Execution

 
Curl

 

 

-
$ curl 'http://localhost/api/jobexecutions/28' -i -X GET \
+
$ curl 'http://localhost/api/jobexecutions/20' -i -X GET \
     -H 'Accept: application/json, application/javascript, text/javascript, text/json'

 

 

@@ -3761,7 +3761,7 @@ 
Curl

 
HTTP Request

 

 

-
GET /api/jobexecutions/28 HTTP/1.1
+
GET /api/jobexecutions/20 HTTP/1.1
 Accept: application/json, application/javascript, text/javascript, text/json
 Host: localhost

 

@@ -3774,31 +3774,31 @@ 
HTTP Response

 
HTTP/1.1 200 OK
 Content-Type: application/json;charset=UTF-8
 Transfer-Encoding: chunked
-Date: Sat, 16 Jan 2021 18:58:28 GMT
+Date: Thu, 27 May 2021 15:45:42 GMT
 Keep-Alive: timeout=60
 Connection: keep-alive
 Content-Length: 1298
 
 {
-  "id" : 28,
+  "id" : 20,
   "version" : 2,
   "jobParameters" : {
     "parameters" : {
       "date" : {
-        "parameter" : "2021/01/16 19:58:29:213[date]",
+        "parameter" : "2021/05/27 18:45:42:911[date]",
         "parameterType" : "DATE"
       }
     }
   },
   "jobInstance" : {
-    "id" : 27,
+    "id" : 19,
     "version" : 0,
     "jobName" : "simpleJob"
   },
   "stepExecutions" : [ {
-    "id" : 28,
+    "id" : 20,
     "version" : 3,
-    "jobExecutionId" : 28,
+    "jobExecutionId" : 20,
     "stepName" : "simpleStep",
     "status" : "COMPLETED",
     "readCount" : 0,
@@ -3808,9 +3808,9 @@ 
HTTP Response

     "readSkipCount" : 0,
     "processSkipCount" : 0,
     "writeSkipCount" : 0,
-    "startTime" : "2021-01-16T18:58:29.218+00:00",
-    "endTime" : "2021-01-16T18:58:29.219+00:00",
-    "lastUpdated" : "2021-01-16T18:58:29.219+00:00",
+    "startTime" : "2021-05-27T15:45:42.914+00:00",
+    "endTime" : "2021-05-27T15:45:42.915+00:00",
+    "lastUpdated" : "2021-05-27T15:45:42.915+00:00",
     "exitStatus" : {
       "exitCode" : "COMPLETED",
       "exitDescription" : ""
@@ -3820,10 +3820,10 @@ 
HTTP Response

     "failureExceptions" : [ ]
   } ],
   "status" : "COMPLETED",
-  "startTime" : "2021-01-16T18:58:29.216+00:00",
-  "createTime" : "2021-01-16T18:58:29.215+00:00",
-  "endTime" : "2021-01-16T18:58:29.220+00:00",
-  "lastUpdated" : "2021-01-16T18:58:29.232+00:00",
+  "startTime" : "2021-05-27T15:45:42.912+00:00",
+  "createTime" : "2021-05-27T15:45:42.912+00:00",
+  "endTime" : "2021-05-27T15:45:42.916+00:00",
+  "lastUpdated" : "2021-05-27T15:45:42.923+00:00",
   "exitStatus" : {
     "exitCode" : "COMPLETED",
     "exitDescription" : ""
@@ -3846,8 +3846,8 @@ 
Curl

     -H 'Content-Type: application/json; charset=UTF-8' \
     -d '{
   "EXIT_STATUS" : "COMPLETED",
-  "END_DATE" : 1610823608686,
-  "START_DATE" : 1610823408686
+  "END_DATE" : 1622130442469,
+  "START_DATE" : 1622130242469
 }'
@@ -3864,8 +3864,8 @@
HTTP Request
{ "EXIT_STATUS" : "COMPLETED", - "END_DATE" : 1610823608686, - "START_DATE" : 1610823408686 + "END_DATE" : 1622130442469, + "START_DATE" : 1622130242469 }
@@ -3877,18 +3877,18 @@
HTTP Response
HTTP/1.1 200 OK
 Content-Type: application/json;charset=UTF-8
 Transfer-Encoding: chunked
-Date: Sat, 16 Jan 2021 18:58:28 GMT
+Date: Thu, 27 May 2021 15:45:42 GMT
 Keep-Alive: timeout=60
 Connection: keep-alive
-Content-Length: 2714
+Content-Length: 2708
 
 [ {
-  "id" : 18,
+  "id" : 10,
   "version" : 2,
   "jobParameters" : {
     "parameters" : {
       "date" : {
-        "parameter" : "2021/01/16 19:58:28:667[date]",
+        "parameter" : "2021/05/27 18:45:42:449[date]",
         "parameterType" : "DATE"
       }
     }
@@ -3900,23 +3900,23 @@ 
HTTP Response

   },
   "stepExecutions" : [ ],
   "status" : "COMPLETED",
-  "startTime" : "2021-01-16T18:58:28.669+00:00",
-  "createTime" : "2021-01-16T18:58:28.668+00:00",
-  "endTime" : "2021-01-16T18:58:28.672+00:00",
-  "lastUpdated" : "2021-01-16T18:58:28.685+00:00",
+  "startTime" : "2021-05-27T15:45:42.451+00:00",
+  "createTime" : "2021-05-27T15:45:42.451+00:00",
+  "endTime" : "2021-05-27T15:45:42.456+00:00",
+  "lastUpdated" : "2021-05-27T15:45:42.468+00:00",
   "exitStatus" : {
     "exitCode" : "COMPLETED",
     "exitDescription" : ""
   },
   "failureExceptions" : [ ],
-  "jobConfigurationName" : "18"
+  "jobConfigurationName" : "10"
 }, {
-  "id" : 17,
+  "id" : 9,
   "version" : 2,
   "jobParameters" : {
     "parameters" : {
       "date" : {
-        "parameter" : "2021/01/16 19:58:28:667[date]",
+        "parameter" : "2021/05/27 18:45:42:449[date]",
         "parameterType" : "DATE"
       }
     }
@@ -3928,23 +3928,23 @@ 
HTTP Response

   },
   "stepExecutions" : [ ],
   "status" : "COMPLETED",
-  "startTime" : "2021-01-16T18:58:28.612+00:00",
-  "createTime" : "2021-01-16T18:58:28.611+00:00",
-  "endTime" : "2021-01-16T18:58:28.619+00:00",
-  "lastUpdated" : "2021-01-16T18:58:28.632+00:00",
+  "startTime" : "2021-05-27T15:45:42.380+00:00",
+  "createTime" : "2021-05-27T15:45:42.379+00:00",
+  "endTime" : "2021-05-27T15:45:42.386+00:00",
+  "lastUpdated" : "2021-05-27T15:45:42.395+00:00",
   "exitStatus" : {
     "exitCode" : "COMPLETED",
     "exitDescription" : ""
   },
   "failureExceptions" : [ ],
-  "jobConfigurationName" : "17"
+  "jobConfigurationName" : "9"
 }, {
-  "id" : 15,
+  "id" : 7,
   "version" : 2,
   "jobParameters" : {
     "parameters" : {
       "date" : {
-        "parameter" : "2021/01/16 19:58:28:667[date]",
+        "parameter" : "2021/05/27 18:45:42:449[date]",
         "parameterType" : "DATE"
       }
     }
@@ -3956,23 +3956,23 @@ 
HTTP Response

   },
   "stepExecutions" : [ ],
   "status" : "COMPLETED",
-  "startTime" : "2021-01-16T18:58:27.427+00:00",
-  "createTime" : "2021-01-16T18:58:27.423+00:00",
-  "endTime" : "2021-01-16T18:58:27.441+00:00",
-  "lastUpdated" : "2021-01-16T18:58:27.459+00:00",
+  "startTime" : "2021-05-27T15:45:41.093+00:00",
+  "createTime" : "2021-05-27T15:45:41.092+00:00",
+  "endTime" : "2021-05-27T15:45:41.104+00:00",
+  "lastUpdated" : "2021-05-27T15:45:41.114+00:00",
   "exitStatus" : {
     "exitCode" : "COMPLETED",
     "exitDescription" : ""
   },
   "failureExceptions" : [ ],
-  "jobConfigurationName" : "15"
+  "jobConfigurationName" : "7"
 }, {
-  "id" : 14,
+  "id" : 6,
   "version" : 2,
   "jobParameters" : {
     "parameters" : {
       "date" : {
-        "parameter" : "2021/01/16 19:58:28:667[date]",
+        "parameter" : "2021/05/27 18:45:42:449[date]",
         "parameterType" : "DATE"
       }
     }
@@ -3984,16 +3984,16 @@ 
HTTP Response

   },
   "stepExecutions" : [ ],
   "status" : "COMPLETED",
-  "startTime" : "2021-01-16T18:58:27.358+00:00",
-  "createTime" : "2021-01-16T18:58:27.349+00:00",
-  "endTime" : "2021-01-16T18:58:27.387+00:00",
-  "lastUpdated" : "2021-01-16T18:58:27.400+00:00",
+  "startTime" : "2021-05-27T15:45:41.047+00:00",
+  "createTime" : "2021-05-27T15:45:41.043+00:00",
+  "endTime" : "2021-05-27T15:45:41.064+00:00",
+  "lastUpdated" : "2021-05-27T15:45:41.072+00:00",
   "exitStatus" : {
     "exitCode" : "COMPLETED",
     "exitDescription" : ""
   },
   "failureExceptions" : [ ],
-  "jobConfigurationName" : "14"
+  "jobConfigurationName" : "6"
 } ]
@@ -4054,7 +4054,7 @@
HTTP Response
HTTP/1.1 201 Created
-Date: Sat, 16 Jan 2021 18:58:26 GMT
+Date: Thu, 27 May 2021 15:45:40 GMT
 Keep-Alive: timeout=60
 Connection: keep-alive
@@ -4070,7 +4070,7 @@
Get Job Configuration By Id
Curl
-
$ curl 'http://localhost/api/jobconfigurations/jobconfiguration/17' -i -X GET \
+
$ curl 'http://localhost/api/jobconfigurations/jobconfiguration/41' -i -X GET \
     -H 'Accept: application/json, application/javascript, text/javascript, text/json'
@@ -4079,7 +4079,7 @@
Curl
HTTP Request
-
GET /api/jobconfigurations/jobconfiguration/17 HTTP/1.1
+
GET /api/jobconfigurations/jobconfiguration/41 HTTP/1.1
 Accept: application/json, application/javascript, text/javascript, text/json
 Host: localhost
@@ -4092,13 +4092,13 @@
HTTP Response
HTTP/1.1 200 OK
 Content-Type: application/json;charset=UTF-8
 Transfer-Encoding: chunked
-Date: Sat, 16 Jan 2021 18:58:26 GMT
+Date: Thu, 27 May 2021 15:45:43 GMT
 Keep-Alive: timeout=60
 Connection: keep-alive
 Content-Length: 412
 
 {
-  "jobConfigurationId" : 17,
+  "jobConfigurationId" : 41,
   "jobName" : "simpleJob",
   "jobSchedulerConfiguration" : {
     "jobSchedulerType" : "PERIOD",
@@ -4146,14 +4146,14 @@ 
HTTP Response

 
HTTP/1.1 200 OK
 Content-Type: application/json;charset=UTF-8
 Transfer-Encoding: chunked
-Date: Sat, 16 Jan 2021 18:58:26 GMT
+Date: Thu, 27 May 2021 15:45:43 GMT
 Keep-Alive: timeout=60
 Connection: keep-alive
 Content-Length: 951
 
 {
   "jobConfigurations" : [ {
-    "jobConfigurationId" : 24,
+    "jobConfigurationId" : 48,
     "jobName" : "simpleJob",
     "jobSchedulerConfiguration" : {
       "jobSchedulerType" : "PERIOD",
@@ -4169,7 +4169,7 @@ 
HTTP Response

     },
     "jobIncrementer" : "DATE"
   }, {
-    "jobConfigurationId" : 25,
+    "jobConfigurationId" : 49,
     "jobName" : "simpleJob",
     "jobSchedulerConfiguration" : null,
     "jobListenerConfiguration" : {
@@ -4218,14 +4218,14 @@ 
HTTP Response

 
HTTP/1.1 200 OK
 Content-Type: application/json;charset=UTF-8
 Transfer-Encoding: chunked
-Date: Sat, 16 Jan 2021 18:58:26 GMT
+Date: Thu, 27 May 2021 15:45:43 GMT
 Keep-Alive: timeout=60
 Connection: keep-alive
 Content-Length: 951
 
 {
   "jobConfigurations" : [ {
-    "jobConfigurationId" : 19,
+    "jobConfigurationId" : 43,
     "jobName" : "simpleJob",
     "jobSchedulerConfiguration" : {
       "jobSchedulerType" : "PERIOD",
@@ -4241,7 +4241,7 @@ 
HTTP Response

     },
     "jobIncrementer" : "DATE"
   }, {
-    "jobConfigurationId" : 20,
+    "jobConfigurationId" : 44,
     "jobName" : "simpleJob",
     "jobSchedulerConfiguration" : null,
     "jobListenerConfiguration" : {
@@ -4322,7 +4322,7 @@ 
HTTP Response

 

 

 
HTTP/1.1 201 Created
-Date: Sat, 16 Jan 2021 18:58:26 GMT
+Date: Thu, 27 May 2021 15:45:43 GMT
 Keep-Alive: timeout=60
 Connection: keep-alive

 

@@ -4339,7 +4339,7 @@ 
Curl

     -H 'Accept: application/json, application/javascript, text/javascript, text/json' \
     -H 'Content-Type: application/json; charset=UTF-8' \
     -d '{
-  "jobConfigurationId" : 12,
+  "jobConfigurationId" : 36,
   "jobName" : "simpleJob",
   "jobSchedulerConfiguration" : null,
   "jobListenerConfiguration" : {
@@ -4369,7 +4369,7 @@ 
HTTP Request

 Content-Length: 441
 
 {
-  "jobConfigurationId" : 12,
+  "jobConfigurationId" : 36,
   "jobName" : "simpleJob",
   "jobSchedulerConfiguration" : null,
   "jobListenerConfiguration" : {
@@ -4393,7 +4393,7 @@ 
HTTP Response

 

 

 
HTTP/1.1 200 OK
-Date: Sat, 16 Jan 2021 18:58:25 GMT
+Date: Thu, 27 May 2021 15:45:42 GMT
 Keep-Alive: timeout=60
 Connection: keep-alive

 

@@ -4406,7 +4406,7 @@ 
Delete Job Configuration

 
Curl

 

 

-
$ curl 'http://localhost/api/jobconfigurations/jobconfiguration/10' -i -X DELETE \
+
$ curl 'http://localhost/api/jobconfigurations/jobconfiguration/34' -i -X DELETE \
     -H 'Accept: application/json, application/javascript, text/javascript, text/json'

 

 

@@ -4415,7 +4415,7 @@ 
Curl

 
HTTP Request

 

 

-
DELETE /api/jobconfigurations/jobconfiguration/10 HTTP/1.1
+
DELETE /api/jobconfigurations/jobconfiguration/34 HTTP/1.1
 Accept: application/json, application/javascript, text/javascript, text/json
 Host: localhost

 

@@ -4426,7 +4426,7 @@ 
HTTP Response

 

 

 
HTTP/1.1 200 OK
-Date: Sat, 16 Jan 2021 18:58:25 GMT
+Date: Thu, 27 May 2021 15:45:42 GMT
 Keep-Alive: timeout=60
 Connection: keep-alive

 

@@ -4439,7 +4439,7 @@ 
Start Job Configuration

 
Curl

 

 

-
$ curl 'http://localhost/api/jobconfigurations/16/start' -i -X GET \
+
$ curl 'http://localhost/api/jobconfigurations/40/start' -i -X GET \
     -H 'Accept: application/json, application/javascript, text/javascript, text/json'

 

 

@@ -4448,7 +4448,7 @@ 
Curl

 
HTTP Request

 

 

-
GET /api/jobconfigurations/16/start HTTP/1.1
+
GET /api/jobconfigurations/40/start HTTP/1.1
 Accept: application/json, application/javascript, text/javascript, text/json
 Host: localhost

 

@@ -4459,7 +4459,7 @@ 
HTTP Response

 

 

 
HTTP/1.1 200 OK
-Date: Sat, 16 Jan 2021 18:58:25 GMT
+Date: Thu, 27 May 2021 15:45:43 GMT
 Keep-Alive: timeout=60
 Connection: keep-alive

 

@@ -4472,7 +4472,7 @@ 
Stop Job Configuration

 
Curl

 

 

-
$ curl 'http://localhost/api/jobconfigurations/14/stop' -i -X GET \
+
$ curl 'http://localhost/api/jobconfigurations/38/stop' -i -X GET \
     -H 'Accept: application/json, application/javascript, text/javascript, text/json'

 

 

@@ -4481,7 +4481,7 @@ 
Curl

 
HTTP Request

 

 

-
GET /api/jobconfigurations/14/stop HTTP/1.1
+
GET /api/jobconfigurations/38/stop HTTP/1.1
 Accept: application/json, application/javascript, text/javascript, text/json
 Host: localhost

 

@@ -4492,7 +4492,7 @@ 
HTTP Response

 

 

 
HTTP/1.1 200 OK
-Date: Sat, 16 Jan 2021 18:58:25 GMT
+Date: Thu, 27 May 2021 15:45:42 GMT
 Keep-Alive: timeout=60
 Connection: keep-alive

 

@@ -4510,7 +4510,7 @@ 
Remote Repository

 

 
 
diff --git a/spring-batch-lightmin-documentation/src/test/resources/application.yml b/spring-batch-lightmin-documentation/src/test/resources/application.yml
index 259accff9..44218cf55 100644
--- a/spring-batch-lightmin-documentation/src/test/resources/application.yml
+++ b/spring-batch-lightmin-documentation/src/test/resources/application.yml
@@ -3,6 +3,4 @@ spring:
     name: it-application
   batch:
     job:
-      enabled: false
-  main:
-    allow-bean-definition-overriding: true
\ No newline at end of file
+      enabled: false
\ No newline at end of file
diff --git a/spring-batch-lightmin-domain/pom.xml b/spring-batch-lightmin-domain/pom.xml
index 5f723f2ab..9a44a4d2b 100644
--- a/spring-batch-lightmin-domain/pom.xml
+++ b/spring-batch-lightmin-domain/pom.xml
@@ -5,7 +5,7 @@
     
         spring-batch-lightmin
         org.tuxdevelop
-        2.2.2-SNAPSHOT
+        2.2.3-SNAPSHOT
     
     4.0.0
 
diff --git a/spring-batch-lightmin-embedded/pom.xml b/spring-batch-lightmin-embedded/pom.xml
index 99e4ae983..f74877fce 100644
--- a/spring-batch-lightmin-embedded/pom.xml
+++ b/spring-batch-lightmin-embedded/pom.xml
@@ -5,7 +5,7 @@
     
         spring-batch-lightmin
         org.tuxdevelop
-        2.2.2-SNAPSHOT
+        2.2.3-SNAPSHOT
     
     4.0.0
 
@@ -50,6 +50,24 @@
             ${project.version}
             test
         
+        
+            org.tuxdevelop
+            spring-batch-lightmin-server-standalone
+            2.2.3-SNAPSHOT
+            compile
+        
+        
+            org.tuxdevelop
+            spring-batch-lightmin-client-classic
+            2.2.3-SNAPSHOT
+            compile
+        
+        
+            org.tuxdevelop
+            spring-batch-lightmin-client-classic
+            2.2.3-SNAPSHOT
+            compile
+        
 
     
 
diff --git a/spring-batch-lightmin-embedded/src/main/java/org/tuxdevelop/spring/batch/lightmin/annotation/EnableLightminEmbedded.java b/spring-batch-lightmin-embedded/src/main/java/org/tuxdevelop/spring/batch/lightmin/annotation/EnableLightminEmbedded.java
index b65a9385d..553128dc9 100644
--- a/spring-batch-lightmin-embedded/src/main/java/org/tuxdevelop/spring/batch/lightmin/annotation/EnableLightminEmbedded.java
+++ b/spring-batch-lightmin-embedded/src/main/java/org/tuxdevelop/spring/batch/lightmin/annotation/EnableLightminEmbedded.java
@@ -12,6 +12,6 @@
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-@Import(value = {LightminEmbeddedConfiguration.class})
+@Import(LightminEmbeddedConfiguration.class)
 public @interface EnableLightminEmbedded {
 }
diff --git a/spring-batch-lightmin-embedded/src/main/java/org/tuxdevelop/spring/batch/lightmin/configuration/LightminEmbeddedConfiguration.java b/spring-batch-lightmin-embedded/src/main/java/org/tuxdevelop/spring/batch/lightmin/configuration/LightminEmbeddedConfiguration.java
index fc7e7174f..61bbce9e3 100644
--- a/spring-batch-lightmin-embedded/src/main/java/org/tuxdevelop/spring/batch/lightmin/configuration/LightminEmbeddedConfiguration.java
+++ b/spring-batch-lightmin-embedded/src/main/java/org/tuxdevelop/spring/batch/lightmin/configuration/LightminEmbeddedConfiguration.java
@@ -3,7 +3,7 @@
 import org.springframework.batch.core.configuration.JobRegistry;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.tuxdevelop.spring.batch.lightmin.annotation.EnableLightminCore;
+import org.springframework.context.annotation.Import;
 import org.tuxdevelop.spring.batch.lightmin.client.annotation.EnableLightminClientCore;
 import org.tuxdevelop.spring.batch.lightmin.client.configuration.LightminClientProperties;
 import org.tuxdevelop.spring.batch.lightmin.client.event.EmbeddedJobExecutionEventPublisher;
@@ -11,11 +11,14 @@
 import org.tuxdevelop.spring.batch.lightmin.client.publisher.JobExecutionEventPublisher;
 import org.tuxdevelop.spring.batch.lightmin.client.publisher.StepExecutionEventPublisher;
 import org.tuxdevelop.spring.batch.lightmin.event.listener.OnApplicationReadyEventEmbeddedListener;
-import org.tuxdevelop.spring.batch.lightmin.server.annotation.EnableLightminServerCore;
-import org.tuxdevelop.spring.batch.lightmin.server.fe.annotation.EnableLightminServerFrontend;
+import org.tuxdevelop.spring.batch.lightmin.server.configuration.BaseStandaloneConfiguration;
+import org.tuxdevelop.spring.batch.lightmin.server.configuration.LightminServerCoreProperties;
+import org.tuxdevelop.spring.batch.lightmin.server.repository.*;
+import org.tuxdevelop.spring.batch.lightmin.server.scheduler.repository.annotation.EnableServerSchedulerMapRepository;
 import org.tuxdevelop.spring.batch.lightmin.server.service.AdminServerService;
 import org.tuxdevelop.spring.batch.lightmin.server.service.EventService;
 import org.tuxdevelop.spring.batch.lightmin.server.service.JobServerService;
+import org.tuxdevelop.spring.batch.lightmin.server.sheduler.StandaloneSchedulerConfiguration;
 import org.tuxdevelop.spring.batch.lightmin.server.support.RegistrationBean;
 import org.tuxdevelop.spring.batch.lightmin.service.EmbeddedAdminServerService;
 import org.tuxdevelop.spring.batch.lightmin.service.EmbeddedJobServerService;
@@ -26,11 +29,10 @@
  * @since 0.3
  */
 @Configuration
-@EnableLightminCore
 @EnableLightminClientCore
-@EnableLightminServerCore
-@EnableLightminServerFrontend
-public class LightminEmbeddedConfiguration {
+@EnableServerSchedulerMapRepository
+@Import(StandaloneSchedulerConfiguration.class)
+public class LightminEmbeddedConfiguration extends BaseStandaloneConfiguration {
 
     @Bean
     public AdminServerService adminServerService(final ServiceEntry serviceEntry) {
@@ -50,7 +52,6 @@ public OnApplicationReadyEventEmbeddedListener onApplicationReadyEventEmbeddedLi
         return new OnApplicationReadyEventEmbeddedListener(registrationBean, jobRegistry, lightminClientProperties);
     }
 
-
     @Bean
     public JobExecutionEventPublisher jobExecutionEventPublisher(final EventService eventService) {
         return new EmbeddedJobExecutionEventPublisher(eventService);
@@ -60,5 +61,20 @@ public JobExecutionEventPublisher jobExecutionEventPublisher(final EventService
     public StepExecutionEventPublisher stepExecutionEventPublisher(final EventService eventService) {
         return new EmbeddedStepJobExecutionEventPublisher(eventService);
     }
+
+    @Bean
+    public LightminApplicationRepository lightminApplicationRepository() {
+        return new MapLightminApplicationRepository();
+    }
+
+    @Bean
+    public JobExecutionEventRepository jobExecutionEventRepository(final LightminServerCoreProperties lightminServerCoreProperties) {
+        return new MapJobExecutionEventRepository(lightminServerCoreProperties.getEventRepositorySize());
+    }
+
+    @Bean
+    public JournalRepository journalRepository() {
+        return new MapJournalRepository();
+    }
 }
 
diff --git a/spring-batch-lightmin-embedded/src/main/java/org/tuxdevelop/spring/batch/lightmin/configuration/LightminEmbededClientPublishConfiguration.java b/spring-batch-lightmin-embedded/src/main/java/org/tuxdevelop/spring/batch/lightmin/configuration/LightminEmbededClientPublishConfiguration.java
new file mode 100644
index 000000000..a89d83c19
--- /dev/null
+++ b/spring-batch-lightmin-embedded/src/main/java/org/tuxdevelop/spring/batch/lightmin/configuration/LightminEmbededClientPublishConfiguration.java
@@ -0,0 +1,36 @@
+package org.tuxdevelop.spring.batch.lightmin.configuration;
+
+import org.springframework.batch.core.configuration.JobRegistry;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.tuxdevelop.spring.batch.lightmin.client.configuration.LightminClientProperties;
+import org.tuxdevelop.spring.batch.lightmin.client.event.EmbeddedJobExecutionEventPublisher;
+import org.tuxdevelop.spring.batch.lightmin.client.event.EmbeddedStepJobExecutionEventPublisher;
+import org.tuxdevelop.spring.batch.lightmin.client.publisher.JobExecutionEventPublisher;
+import org.tuxdevelop.spring.batch.lightmin.client.publisher.StepExecutionEventPublisher;
+import org.tuxdevelop.spring.batch.lightmin.event.listener.OnApplicationReadyEventEmbeddedListener;
+import org.tuxdevelop.spring.batch.lightmin.server.service.EventService;
+import org.tuxdevelop.spring.batch.lightmin.server.support.RegistrationBean;
+
+@Configuration
+public class LightminEmbededClientPublishConfiguration {
+
+    @Bean
+    public JobExecutionEventPublisher jobExecutionEventPublisher(final EventService eventService) {
+        return new EmbeddedJobExecutionEventPublisher(eventService);
+    }
+
+    @Bean
+    public StepExecutionEventPublisher stepExecutionEventPublisher(final EventService eventService) {
+        return new EmbeddedStepJobExecutionEventPublisher(eventService);
+
+    }
+
+    @Bean
+    public OnApplicationReadyEventEmbeddedListener onApplicationReadyEventEmbeddedListener(
+            final RegistrationBean registrationBean,
+            final JobRegistry jobRegistry,
+            final LightminClientProperties lightminClientProperties) {
+        return new OnApplicationReadyEventEmbeddedListener(registrationBean, jobRegistry, lightminClientProperties);
+    }
+}
diff --git a/spring-batch-lightmin-embedded/src/test/resources/application.yml b/spring-batch-lightmin-embedded/src/test/resources/application.yml
index c5864d7f5..0938ce3cd 100644
--- a/spring-batch-lightmin-embedded/src/test/resources/application.yml
+++ b/spring-batch-lightmin-embedded/src/test/resources/application.yml
@@ -1,9 +1,7 @@
 server:
-  port: 50111
+  port: 5011
 
 spring:
-  main:
-    allow-bean-definition-overriding: true
   application:
     name: embedded-test-app
   batch:
diff --git a/spring-batch-lightmin-embedded/src/test/resources/properties/local_client.properties b/spring-batch-lightmin-embedded/src/test/resources/properties/local_client.properties
index 39c88d453..11c95b9d5 100644
--- a/spring-batch-lightmin-embedded/src/test/resources/properties/local_client.properties
+++ b/spring-batch-lightmin-embedded/src/test/resources/properties/local_client.properties
@@ -1,6 +1,5 @@
 spring.application.name=test
-spring.batch.lightmin.client.classic.server.url.[0]=http://localhost:${server.port}
+spring.batch.lightmin.client.classic.server.url.[0]=http://localhost:9090
 spring.batch.job.enabled=false
 spring.batch.lightmin.batch.repository-type=map
-spring.cloud.consul.enabled=false
-spring.main.allow-bean-definition-overriding=true
\ No newline at end of file
+spring.cloud.consul.enabled=false
\ No newline at end of file
diff --git a/spring-batch-lightmin-metrics/pom.xml b/spring-batch-lightmin-metrics/pom.xml
index 6aaafb451..4ce234472 100644
--- a/spring-batch-lightmin-metrics/pom.xml
+++ b/spring-batch-lightmin-metrics/pom.xml
@@ -5,7 +5,7 @@
     
         spring-batch-lightmin
         org.tuxdevelop
-        2.2.2-SNAPSHOT
+        2.2.3-SNAPSHOT
     
     4.0.0
 
diff --git a/spring-batch-lightmin-repository-server/pom.xml b/spring-batch-lightmin-repository-server/pom.xml
index 5bb7d9866..3c6c360a0 100644
--- a/spring-batch-lightmin-repository-server/pom.xml
+++ b/spring-batch-lightmin-repository-server/pom.xml
@@ -5,7 +5,7 @@
     
         spring-batch-lightmin
         org.tuxdevelop
-        2.2.2-SNAPSHOT
+        2.2.3-SNAPSHOT
     
     4.0.0
 
diff --git a/spring-batch-lightmin-repository/pom.xml b/spring-batch-lightmin-repository/pom.xml
index 137b0237a..6293945f1 100644
--- a/spring-batch-lightmin-repository/pom.xml
+++ b/spring-batch-lightmin-repository/pom.xml
@@ -5,7 +5,7 @@
     
         spring-batch-lightmin
         org.tuxdevelop
-        2.2.2-SNAPSHOT
+        2.2.3-SNAPSHOT
     
     4.0.0
 
diff --git a/spring-batch-lightmin-repository/spring-batch-lightmin-repository-core/pom.xml b/spring-batch-lightmin-repository/spring-batch-lightmin-repository-core/pom.xml
index e0dee52bb..4b0eed3fc 100644
--- a/spring-batch-lightmin-repository/spring-batch-lightmin-repository-core/pom.xml
+++ b/spring-batch-lightmin-repository/spring-batch-lightmin-repository-core/pom.xml
@@ -5,7 +5,7 @@
     
         spring-batch-lightmin-repository
         org.tuxdevelop
-        2.2.2-SNAPSHOT
+        2.2.3-SNAPSHOT
     
     4.0.0
 
diff --git a/spring-batch-lightmin-repository/spring-batch-lightmin-repository-jdbc/pom.xml b/spring-batch-lightmin-repository/spring-batch-lightmin-repository-jdbc/pom.xml
index 5095f8ba8..ec8f3dfbd 100644
--- a/spring-batch-lightmin-repository/spring-batch-lightmin-repository-jdbc/pom.xml
+++ b/spring-batch-lightmin-repository/spring-batch-lightmin-repository-jdbc/pom.xml
@@ -5,7 +5,7 @@
     
         spring-batch-lightmin-repository
         org.tuxdevelop
-        2.2.2-SNAPSHOT
+        2.2.3-SNAPSHOT
     
     4.0.0
 
diff --git a/spring-batch-lightmin-repository/spring-batch-lightmin-repository-map/pom.xml b/spring-batch-lightmin-repository/spring-batch-lightmin-repository-map/pom.xml
index 90381ceb4..758b41a3a 100644
--- a/spring-batch-lightmin-repository/spring-batch-lightmin-repository-map/pom.xml
+++ b/spring-batch-lightmin-repository/spring-batch-lightmin-repository-map/pom.xml
@@ -5,7 +5,7 @@
     
         spring-batch-lightmin-repository
         org.tuxdevelop
-        2.2.2-SNAPSHOT
+        2.2.3-SNAPSHOT
     
     4.0.0
 
diff --git a/spring-batch-lightmin-repository/spring-batch-lightmin-repository-remote/pom.xml b/spring-batch-lightmin-repository/spring-batch-lightmin-repository-remote/pom.xml
index 2cb42c790..ad2240bc6 100644
--- a/spring-batch-lightmin-repository/spring-batch-lightmin-repository-remote/pom.xml
+++ b/spring-batch-lightmin-repository/spring-batch-lightmin-repository-remote/pom.xml
@@ -5,7 +5,7 @@
     
         spring-batch-lightmin-repository
         org.tuxdevelop
-        2.2.2-SNAPSHOT
+        2.2.3-SNAPSHOT
     
     4.0.0
 
diff --git a/spring-batch-lightmin-repository/spring-batch-lightmin-repository-test/pom.xml b/spring-batch-lightmin-repository/spring-batch-lightmin-repository-test/pom.xml
index 66dbafb72..b6e6a0850 100644
--- a/spring-batch-lightmin-repository/spring-batch-lightmin-repository-test/pom.xml
+++ b/spring-batch-lightmin-repository/spring-batch-lightmin-repository-test/pom.xml
@@ -5,7 +5,7 @@
     
         spring-batch-lightmin-repository
         org.tuxdevelop
-        2.2.2-SNAPSHOT
+        2.2.3-SNAPSHOT
     
     4.0.0
 
diff --git a/spring-batch-lightmin-server/pom.xml b/spring-batch-lightmin-server/pom.xml
index cbfcd1b66..3e7b73bf4 100644
--- a/spring-batch-lightmin-server/pom.xml
+++ b/spring-batch-lightmin-server/pom.xml
@@ -5,7 +5,7 @@
     
         spring-batch-lightmin
         org.tuxdevelop
-        2.2.2-SNAPSHOT
+        2.2.3-SNAPSHOT
     
     4.0.0
 
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/pom.xml b/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/pom.xml
index 38c916d31..089a4efe4 100644
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/pom.xml
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/pom.xml
@@ -5,7 +5,7 @@
     
         spring-batch-lightmin-server
         org.tuxdevelop
-        2.2.2-SNAPSHOT
+        2.2.3-SNAPSHOT
     
     4.0.0
 
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-core/pom.xml b/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-core/pom.xml
index 85b4f8547..4a4efd24c 100644
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-core/pom.xml
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-core/pom.xml
@@ -5,7 +5,7 @@
     
         spring-batch-lightmin-server-cluster
         org.tuxdevelop
-        2.2.2-SNAPSHOT
+        2.2.3-SNAPSHOT
     
     4.0.0
 
@@ -29,7 +29,7 @@
         
         
             org.tuxdevelop
-            spring-batch-lightmin-server-core
+            spring-batch-lightmin-server-standalone
             ${project.version}
         
 
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/cluster/annotation/EnableServerClusterCore.java b/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/cluster/annotation/EnableServerClusterCore.java
deleted file mode 100644
index 6cf785f02..000000000
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/cluster/annotation/EnableServerClusterCore.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.tuxdevelop.spring.batch.lightmin.server.cluster.annotation;
-
-import org.springframework.context.annotation.Import;
-import org.tuxdevelop.spring.batch.lightmin.server.cluster.configuration.CommonServerClusterConfiguration;
-
-import java.lang.annotation.*;
-
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Import(value = {CommonServerClusterConfiguration.class})
-public @interface EnableServerClusterCore {
-}
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/cluster/configuration/CommonServerClusterConfiguration.java b/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/cluster/configuration/CommonServerClusterConfiguration.java
index a7b573a81..f5e5e851d 100644
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/cluster/configuration/CommonServerClusterConfiguration.java
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/cluster/configuration/CommonServerClusterConfiguration.java
@@ -2,31 +2,20 @@
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.context.annotation.Import;
 import org.tuxdevelop.spring.batch.lightmin.server.cluster.actuator.LockEndpoint;
 import org.tuxdevelop.spring.batch.lightmin.server.cluster.lock.LightminServerLockManager;
 import org.tuxdevelop.spring.batch.lightmin.server.cluster.lock.ServerLockAspect;
+import org.tuxdevelop.spring.batch.lightmin.server.configuration.BaseRemoteStandaloneConfiguration;
+import org.tuxdevelop.spring.batch.lightmin.server.configuration.BaseStandaloneConfiguration;
+import org.tuxdevelop.spring.batch.lightmin.server.configuration.LightminServerStandaloneConfiguration;
 import org.tuxdevelop.spring.batch.lightmin.server.scheduler.annotation.EnableServerSchedulerCore;
-import org.tuxdevelop.spring.batch.lightmin.server.scheduler.configuration.ServerSchedulerCoreConfigurationProperties;
-import org.tuxdevelop.spring.batch.lightmin.server.scheduler.repository.SchedulerExecutionRepository;
-import org.tuxdevelop.spring.batch.lightmin.server.scheduler.service.*;
+import org.tuxdevelop.spring.batch.lightmin.server.scheduler.service.ClusterSchedulerConfiguration;
 
-
-@EnableServerSchedulerCore
 @EnableAspectJAutoProxy
-public class CommonServerClusterConfiguration {
-
-    @Bean
-    public ExecutionPollerService executionPollerService(final ServerSchedulerService serverSchedulerService,
-                                                         final SchedulerExecutionService schedulerExecutionService,
-                                                         final ServerSchedulerCoreConfigurationProperties properties) {
-        return new ClusterExecutionPollerService(serverSchedulerService, schedulerExecutionService, properties);
-    }
-
-    @Bean
-    public ExecutionCleanUpService executionCleanUpService(final SchedulerExecutionRepository schedulerExecutionRepository,
-                                                           final ServerSchedulerCoreConfigurationProperties properties) {
-        return new ClusterExecutionCleanUpService(schedulerExecutionRepository, properties);
-    }
+@EnableServerSchedulerCore
+@Import(ClusterSchedulerConfiguration.class)
+public class CommonServerClusterConfiguration extends BaseRemoteStandaloneConfiguration {
 
     @Bean
     public ServerLockAspect serverLockAspect(final LightminServerLockManager lightminServerLockManager) {
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/scheduler/service/ClusterSchedulerConfiguration.java b/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/scheduler/service/ClusterSchedulerConfiguration.java
new file mode 100644
index 000000000..c2d333786
--- /dev/null
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/scheduler/service/ClusterSchedulerConfiguration.java
@@ -0,0 +1,22 @@
+package org.tuxdevelop.spring.batch.lightmin.server.scheduler.service;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.tuxdevelop.spring.batch.lightmin.server.scheduler.configuration.ServerSchedulerCoreConfigurationProperties;
+import org.tuxdevelop.spring.batch.lightmin.server.scheduler.repository.SchedulerExecutionRepository;
+
+@Configuration
+public class ClusterSchedulerConfiguration {
+    @Bean
+    public ExecutionPollerService executionPollerService(final ServerSchedulerService serverSchedulerService,
+                                                         final SchedulerExecutionService schedulerExecutionService,
+                                                         final ServerSchedulerCoreConfigurationProperties properties) {
+        return new ClusterExecutionPollerService(serverSchedulerService, schedulerExecutionService, properties);
+    }
+
+    @Bean
+    public ExecutionCleanUpService executionCleanUpService(final SchedulerExecutionRepository schedulerExecutionRepository,
+                                                           final ServerSchedulerCoreConfigurationProperties properties) {
+        return new ClusterExecutionCleanUpService(schedulerExecutionRepository, properties);
+    }
+}
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-infinispan/pom.xml b/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-infinispan/pom.xml
index 767e52dd0..8f40eca59 100644
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-infinispan/pom.xml
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-infinispan/pom.xml
@@ -5,7 +5,7 @@
     
         spring-batch-lightmin-server-cluster
         org.tuxdevelop
-        2.2.2-SNAPSHOT
+        2.2.3-SNAPSHOT
     
 
     4.0.0
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-infinispan/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/cluster/configuration/InfinispanServerClusterConfiguration.java b/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-infinispan/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/cluster/configuration/InfinispanServerClusterConfiguration.java
index a4be980cb..cf418dfba 100644
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-infinispan/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/cluster/configuration/InfinispanServerClusterConfiguration.java
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-infinispan/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/cluster/configuration/InfinispanServerClusterConfiguration.java
@@ -5,7 +5,6 @@
 import org.infinispan.configuration.cache.CacheMode;
 import org.infinispan.configuration.cache.ConfigurationBuilder;
 import org.infinispan.configuration.global.GlobalConfiguration;
-import org.infinispan.eviction.EvictionType;
 import org.infinispan.manager.DefaultCacheManager;
 import org.infinispan.manager.EmbeddedCacheManager;
 import org.infinispan.spring.embedded.provider.SpringEmbeddedCacheManager;
@@ -18,7 +17,6 @@
 import org.springframework.context.annotation.DependsOn;
 import org.tuxdevelop.spring.batch.lightmin.api.resource.monitoring.JobExecutionEventInfo;
 import org.tuxdevelop.spring.batch.lightmin.client.api.LightminClientApplication;
-import org.tuxdevelop.spring.batch.lightmin.server.cluster.annotation.EnableServerClusterCore;
 import org.tuxdevelop.spring.batch.lightmin.server.cluster.lock.InfinispanLightminServerLockManager;
 import org.tuxdevelop.spring.batch.lightmin.server.cluster.lock.LightminServerLockManager;
 import org.tuxdevelop.spring.batch.lightmin.server.cluster.repository.*;
@@ -37,9 +35,8 @@
 
 @Slf4j
 @Configuration
-@EnableServerClusterCore
 @EnableConfigurationProperties(value = {InfinispanServerClusterConfigurationProperties.class})
-public class InfinispanServerClusterConfiguration {
+public class InfinispanServerClusterConfiguration extends CommonServerClusterConfiguration {
 
     public static final String INFINISPAN_DEFAULT_CACHE_MANAGER_NAME = "lightminInfinispanCacheManager";
     public static final String REPOSITORY_ID_CACHE_NAME = "lightminInfinispanRepositoryIdCache";
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-infinispan/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/repository/InfinispanJobExecutionEventRepositoryIT.java b/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-infinispan/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/repository/InfinispanJobExecutionEventRepositoryIT.java
index 48749fd36..bb1472e3c 100644
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-infinispan/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/repository/InfinispanJobExecutionEventRepositoryIT.java
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-infinispan/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/repository/InfinispanJobExecutionEventRepositoryIT.java
@@ -6,6 +6,7 @@
 import org.springframework.test.context.junit4.SpringRunner;
 import org.tuxdevelop.spring.batch.lightmin.server.configuration.LightminServerCoreProperties;
 import org.tuxdevelop.spring.batch.lightmin.test.configuration.InfinispanITConfiguration;
+import org.txudevelop.spring.batch.lightmin.server.repository.JobExecutionEventRepositoryTest;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = {InfinispanITConfiguration.class})
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-infinispan/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/repository/InfinispanJournalRepositoryIT.java b/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-infinispan/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/repository/InfinispanJournalRepositoryIT.java
index 9e55c567f..e903eabd2 100644
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-infinispan/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/repository/InfinispanJournalRepositoryIT.java
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-infinispan/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/repository/InfinispanJournalRepositoryIT.java
@@ -5,6 +5,7 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.tuxdevelop.spring.batch.lightmin.test.configuration.InfinispanITConfiguration;
+import org.txudevelop.spring.batch.lightmin.server.repository.JournalRepositoryTest;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = {InfinispanITConfiguration.class})
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-infinispan/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/repository/InfinispanLightminApplicationRepositoryIT.java b/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-infinispan/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/repository/InfinispanLightminApplicationRepositoryIT.java
index 529a7d112..015121f40 100644
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-infinispan/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/repository/InfinispanLightminApplicationRepositoryIT.java
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-infinispan/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/repository/InfinispanLightminApplicationRepositoryIT.java
@@ -5,6 +5,7 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.tuxdevelop.spring.batch.lightmin.test.configuration.InfinispanITConfiguration;
+import org.txudevelop.spring.batch.lightmin.server.repository.LightminApplicationRepositoryTest;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = {InfinispanITConfiguration.class})
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-infinispan/src/test/java/org/tuxdevelop/spring/batch/lightmin/test/configuration/InfinispanITConfiguration.java b/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-infinispan/src/test/java/org/tuxdevelop/spring/batch/lightmin/test/configuration/InfinispanITConfiguration.java
index ca198dcaa..25705b644 100644
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-infinispan/src/test/java/org/tuxdevelop/spring/batch/lightmin/test/configuration/InfinispanITConfiguration.java
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-infinispan/src/test/java/org/tuxdevelop/spring/batch/lightmin/test/configuration/InfinispanITConfiguration.java
@@ -4,6 +4,7 @@
 import org.infinispan.configuration.global.GlobalConfigurationBuilder;
 import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -16,6 +17,7 @@
 import org.tuxdevelop.spring.batch.lightmin.server.service.JobServerService;
 
 @Configuration
+@EnableAutoConfiguration
 @EnableServerClusterInfinispan
 @Import(value = {MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class})
 public class InfinispanITConfiguration {
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-infinispan/src/test/resources/application.yml b/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-infinispan/src/test/resources/application.yml
index 716518efa..240d4d8e7 100644
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-infinispan/src/test/resources/application.yml
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-cluster/spring-batch-lightmin-server-cluster-infinispan/src/test/resources/application.yml
@@ -1,6 +1,4 @@
 spring:
-  main:
-    allow-bean-definition-overriding: true
   batch:
     lightmin:
       server:
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-core/pom.xml b/spring-batch-lightmin-server/spring-batch-lightmin-server-core/pom.xml
index 6ec3973d9..06acaf2dc 100644
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-core/pom.xml
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-core/pom.xml
@@ -5,7 +5,7 @@
     
         spring-batch-lightmin-server
         org.tuxdevelop
-        2.2.2-SNAPSHOT
+        2.2.3-SNAPSHOT
     
     4.0.0
 
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/configuration/LightminServerCoreConfiguration.java b/spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/configuration/LightminServerCoreConfiguration.java
index d8f45c96c..640c826bd 100644
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/configuration/LightminServerCoreConfiguration.java
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/configuration/LightminServerCoreConfiguration.java
@@ -33,12 +33,6 @@
 @EnableConfigurationProperties(value = {LightminServerCoreProperties.class})
 public class LightminServerCoreConfiguration {
 
-    @Bean
-    @ConditionalOnMissingBean(LightminApplicationRepository.class)
-    public LightminApplicationRepository lightminApplicationRepository() {
-        return new MapLightminApplicationRepository();
-    }
-
     @Bean
     @ConditionalOnMissingBean(RegistrationBean.class)
     public RegistrationBean registrationBean(final LightminApplicationRepository lightminApplicationRepository) {
@@ -51,18 +45,6 @@ public EventService eventService(@Qualifier("jobExecutionEventRepository") final
         return new EventServiceBean(jobExecutionEventRepository);
     }
 
-    @Bean
-    @ConditionalOnMissingBean(value = JobExecutionEventRepository.class)
-    public JobExecutionEventRepository jobExecutionEventRepository(final LightminServerCoreProperties lightminServerCoreProperties) {
-        return new MapJobExecutionEventRepository(lightminServerCoreProperties.getEventRepositorySize());
-    }
-
-    @Bean
-    @ConditionalOnMissingBean(value = {JournalRepository.class})
-    public JournalRepository journalRepository() {
-        return new MapJournalRepository();
-    }
-
     @Bean
     @ConditionalOnMissingBean(value = {JournalServiceBean.class})
     public JournalServiceBean journalServiceBean(final JournalRepository journalRepository) {
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/repository/JobExecutionEventRepositoryTest.java b/spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/txudevelop/spring/batch/lightmin/server/repository/JobExecutionEventRepositoryTest.java
similarity index 96%
rename from spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/repository/JobExecutionEventRepositoryTest.java
rename to spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/txudevelop/spring/batch/lightmin/server/repository/JobExecutionEventRepositoryTest.java
index 548e6603d..fcdcfebe3 100644
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/repository/JobExecutionEventRepositoryTest.java
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/txudevelop/spring/batch/lightmin/server/repository/JobExecutionEventRepositoryTest.java
@@ -1,4 +1,4 @@
-package org.tuxdevelop.spring.batch.lightmin.server.repository;
+package org.txudevelop.spring.batch.lightmin.server.repository;
 
 import org.assertj.core.api.BDDAssertions;
 import org.junit.Before;
@@ -6,6 +6,7 @@
 import org.tuxdevelop.spring.batch.lightmin.api.resource.batch.ExitStatus;
 import org.tuxdevelop.spring.batch.lightmin.api.resource.monitoring.JobExecutionEventInfo;
 import org.tuxdevelop.spring.batch.lightmin.server.configuration.LightminServerCoreProperties;
+import org.tuxdevelop.spring.batch.lightmin.server.repository.JobExecutionEventRepository;
 
 import java.util.List;
 
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/repository/JournalRepositoryTest.java b/spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/txudevelop/spring/batch/lightmin/server/repository/JournalRepositoryTest.java
similarity index 88%
rename from spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/repository/JournalRepositoryTest.java
rename to spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/txudevelop/spring/batch/lightmin/server/repository/JournalRepositoryTest.java
index 76d2808a6..f740f486d 100644
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/repository/JournalRepositoryTest.java
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/txudevelop/spring/batch/lightmin/server/repository/JournalRepositoryTest.java
@@ -1,8 +1,9 @@
-package org.tuxdevelop.spring.batch.lightmin.server.repository;
+package org.txudevelop.spring.batch.lightmin.server.repository;
 
 import org.assertj.core.api.BDDAssertions;
 import org.junit.Test;
 import org.tuxdevelop.spring.batch.lightmin.server.domain.Journal;
+import org.tuxdevelop.spring.batch.lightmin.server.repository.JournalRepository;
 
 import java.util.List;
 
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/repository/LightminApplicationRepositoryTest.java b/spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/txudevelop/spring/batch/lightmin/server/repository/LightminApplicationRepositoryTest.java
similarity index 95%
rename from spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/repository/LightminApplicationRepositoryTest.java
rename to spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/txudevelop/spring/batch/lightmin/server/repository/LightminApplicationRepositoryTest.java
index 2c18e79fd..622f01774 100644
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/repository/LightminApplicationRepositoryTest.java
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/txudevelop/spring/batch/lightmin/server/repository/LightminApplicationRepositoryTest.java
@@ -1,10 +1,11 @@
-package org.tuxdevelop.spring.batch.lightmin.server.repository;
+package org.txudevelop.spring.batch.lightmin.server.repository;
 
 import lombok.extern.slf4j.Slf4j;
 import org.assertj.core.api.BDDAssertions;
 import org.junit.Before;
 import org.junit.Test;
 import org.tuxdevelop.spring.batch.lightmin.client.api.LightminClientApplication;
+import org.tuxdevelop.spring.batch.lightmin.server.repository.LightminApplicationRepository;
 
 import java.util.Collection;
 
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/repository/MapJobExecutionEventRepositoryTest.java b/spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/txudevelop/spring/batch/lightmin/server/repository/MapJobExecutionEventRepositoryTest.java
similarity index 77%
rename from spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/repository/MapJobExecutionEventRepositoryTest.java
rename to spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/txudevelop/spring/batch/lightmin/server/repository/MapJobExecutionEventRepositoryTest.java
index 0be7aa183..e7ba3b8e2 100644
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/repository/MapJobExecutionEventRepositoryTest.java
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/txudevelop/spring/batch/lightmin/server/repository/MapJobExecutionEventRepositoryTest.java
@@ -1,7 +1,9 @@
-package org.tuxdevelop.spring.batch.lightmin.server.repository;
+package org.txudevelop.spring.batch.lightmin.server.repository;
 
 import org.junit.Before;
 import org.tuxdevelop.spring.batch.lightmin.server.configuration.LightminServerCoreProperties;
+import org.tuxdevelop.spring.batch.lightmin.server.repository.JobExecutionEventRepository;
+import org.tuxdevelop.spring.batch.lightmin.server.repository.MapJobExecutionEventRepository;
 
 public class MapJobExecutionEventRepositoryTest extends JobExecutionEventRepositoryTest {
 
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/repository/MapJournalRepositoryTest.java b/spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/txudevelop/spring/batch/lightmin/server/repository/MapJournalRepositoryTest.java
similarity index 54%
rename from spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/repository/MapJournalRepositoryTest.java
rename to spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/txudevelop/spring/batch/lightmin/server/repository/MapJournalRepositoryTest.java
index 0fa465c63..03187631f 100644
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/repository/MapJournalRepositoryTest.java
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/txudevelop/spring/batch/lightmin/server/repository/MapJournalRepositoryTest.java
@@ -1,4 +1,7 @@
-package org.tuxdevelop.spring.batch.lightmin.server.repository;
+package org.txudevelop.spring.batch.lightmin.server.repository;
+
+import org.tuxdevelop.spring.batch.lightmin.server.repository.JournalRepository;
+import org.tuxdevelop.spring.batch.lightmin.server.repository.MapJournalRepository;
 
 public class MapJournalRepositoryTest extends JournalRepositoryTest {
 
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/repository/MapLightminApplicationRepositoryTest.java b/spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/txudevelop/spring/batch/lightmin/server/repository/MapLightminApplicationRepositoryTest.java
similarity index 56%
rename from spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/repository/MapLightminApplicationRepositoryTest.java
rename to spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/txudevelop/spring/batch/lightmin/server/repository/MapLightminApplicationRepositoryTest.java
index 27e95a6cb..9000384fb 100644
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/repository/MapLightminApplicationRepositoryTest.java
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/txudevelop/spring/batch/lightmin/server/repository/MapLightminApplicationRepositoryTest.java
@@ -1,4 +1,7 @@
-package org.tuxdevelop.spring.batch.lightmin.server.repository;
+package org.txudevelop.spring.batch.lightmin.server.repository;
+
+import org.tuxdevelop.spring.batch.lightmin.server.repository.LightminApplicationRepository;
+import org.tuxdevelop.spring.batch.lightmin.server.repository.MapLightminApplicationRepository;
 
 public class MapLightminApplicationRepositoryTest extends LightminApplicationRepositoryTest {
 
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/repository/ServerDomainHelper.java b/spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/txudevelop/spring/batch/lightmin/server/repository/ServerDomainHelper.java
similarity index 97%
rename from spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/repository/ServerDomainHelper.java
rename to spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/txudevelop/spring/batch/lightmin/server/repository/ServerDomainHelper.java
index b4e4aa92e..a68b09f93 100644
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/repository/ServerDomainHelper.java
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-core/src/test/java/org/txudevelop/spring/batch/lightmin/server/repository/ServerDomainHelper.java
@@ -1,4 +1,4 @@
-package org.tuxdevelop.spring.batch.lightmin.server.repository;
+package org.txudevelop.spring.batch.lightmin.server.repository;
 
 import org.tuxdevelop.spring.batch.lightmin.api.resource.batch.ExitStatus;
 import org.tuxdevelop.spring.batch.lightmin.api.resource.monitoring.JobExecutionEventInfo;
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-fe/pom.xml b/spring-batch-lightmin-server/spring-batch-lightmin-server-fe/pom.xml
index 652d3acdb..0822903df 100644
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-fe/pom.xml
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-fe/pom.xml
@@ -5,7 +5,7 @@
     
         spring-batch-lightmin-server
         org.tuxdevelop
-        2.2.2-SNAPSHOT
+        2.2.3-SNAPSHOT
     
     4.0.0
 
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/pom.xml b/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/pom.xml
index a5df7468b..04591a3a6 100644
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/pom.xml
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/pom.xml
@@ -5,7 +5,7 @@
     
         spring-batch-lightmin-server
         org.tuxdevelop
-        2.2.2-SNAPSHOT
+        2.2.3-SNAPSHOT
     
     4.0.0
 
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-core/pom.xml b/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-core/pom.xml
index 3a4af4035..abc5c99fa 100644
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-core/pom.xml
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-core/pom.xml
@@ -5,7 +5,7 @@
     
         spring-batch-lightmin-server-scheduler
         org.tuxdevelop
-        2.2.2-SNAPSHOT
+        2.2.3-SNAPSHOT
     
     4.0.0
 
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/scheduler/annotation/EnableServerSchedulerCore.java b/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/scheduler/annotation/EnableServerSchedulerCore.java
index 52acdec56..9b7af3390 100644
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/scheduler/annotation/EnableServerSchedulerCore.java
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/scheduler/annotation/EnableServerSchedulerCore.java
@@ -2,7 +2,6 @@
 
 import org.springframework.context.annotation.Import;
 import org.tuxdevelop.spring.batch.lightmin.server.scheduler.configuration.ServerSchedulerCoreConfiguration;
-import org.tuxdevelop.spring.batch.lightmin.server.scheduler.repository.configuration.ServerSchedulerMapConfiguration;
 
 import java.lang.annotation.*;
 
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/scheduler/configuration/ServerSchedulerCoreConfiguration.java b/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/scheduler/configuration/ServerSchedulerCoreConfiguration.java
index 6a5d47de4..2910708ea 100644
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/scheduler/configuration/ServerSchedulerCoreConfiguration.java
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/scheduler/configuration/ServerSchedulerCoreConfiguration.java
@@ -1,6 +1,5 @@
 package org.tuxdevelop.spring.batch.lightmin.server.scheduler.configuration;
 
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -10,7 +9,6 @@
 import org.tuxdevelop.spring.batch.lightmin.server.repository.LightminApplicationRepository;
 import org.tuxdevelop.spring.batch.lightmin.server.scheduler.repository.SchedulerConfigurationRepository;
 import org.tuxdevelop.spring.batch.lightmin.server.scheduler.repository.SchedulerExecutionRepository;
-import org.tuxdevelop.spring.batch.lightmin.server.scheduler.repository.annotation.EnableServerSchedulerMapRepository;
 import org.tuxdevelop.spring.batch.lightmin.server.scheduler.service.*;
 import org.tuxdevelop.spring.batch.lightmin.server.service.JobServerService;
 
@@ -18,7 +16,6 @@
 @EnableScheduling
 @EnableLightminServerCore
 @ConditionalOnProperty(prefix = "spring.batch.lightmin.server.scheduler", name = "enabled", havingValue = "true", matchIfMissing = true)
-@EnableServerSchedulerMapRepository
 @EnableConfigurationProperties(value = {ServerSchedulerCoreConfigurationProperties.class})
 public class ServerSchedulerCoreConfiguration {
 
@@ -53,21 +50,6 @@ public ServerPollerService serverPollerService(final ExecutionPollerService exec
         return new ServerPollerService(executionPollerService, executionCleanUpService);
     }
 
-    @Bean
-    @ConditionalOnMissingBean(ExecutionPollerService.class)
-    public ExecutionPollerService executionPollerService(final ServerSchedulerService serverSchedulerService,
-                                                         final SchedulerExecutionService schedulerExecutionService,
-                                                         final ServerSchedulerCoreConfigurationProperties properties) {
-        return new StandaloneExecutionPollerService(serverSchedulerService, schedulerExecutionService, properties);
-    }
-
-    @Bean
-    @ConditionalOnMissingBean(ExecutionCleanUpService.class)
-    public ExecutionCleanUpService executionCleanUpService(final SchedulerExecutionRepository schedulerExecutionRepository,
-                                                           final ServerSchedulerCoreConfigurationProperties properties) {
-        return new StandaloneExecutionCleanupService(schedulerExecutionRepository, properties);
-    }
-
     @Bean
     public ExecutionInfoService executionInfoService(final SchedulerExecutionService schedulerExecutionService,
                                                      final SchedulerConfigurationService schedulerConfigurationService) {
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-core/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/scheduler/MockedServerCoreRepoConfig.java b/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-core/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/scheduler/MockedServerCoreRepoConfig.java
new file mode 100644
index 000000000..13584eb28
--- /dev/null
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-core/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/scheduler/MockedServerCoreRepoConfig.java
@@ -0,0 +1,28 @@
+package org.tuxdevelop.spring.batch.lightmin.server.scheduler;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.tuxdevelop.spring.batch.lightmin.server.repository.JobExecutionEventRepository;
+import org.tuxdevelop.spring.batch.lightmin.server.repository.JournalRepository;
+import org.tuxdevelop.spring.batch.lightmin.server.repository.LightminApplicationRepository;
+
+import static org.mockito.Mockito.mock;
+
+@Configuration
+public class MockedServerCoreRepoConfig {
+
+    @Bean
+    LightminApplicationRepository lightminApplicationRepository() {
+        return mock(LightminApplicationRepository.class);
+    }
+
+    @Bean
+    JobExecutionEventRepository jobExecutionEventRepository() {
+        return mock(JobExecutionEventRepository.class);
+    }
+
+    @Bean
+    JournalRepository journalRepository() {
+        return mock(JournalRepository.class);
+    }
+}
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-core/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/scheduler/SchedulerITNR.java b/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-core/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/scheduler/SchedulerITNR.java
index 84529c3bc..70ce3ef28 100644
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-core/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/scheduler/SchedulerITNR.java
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-core/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/scheduler/SchedulerITNR.java
@@ -4,20 +4,29 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.tuxdevelop.spring.batch.lightmin.api.resource.admin.JobIncrementer;
 import org.tuxdevelop.spring.batch.lightmin.client.api.LightminClientApplication;
+import org.tuxdevelop.spring.batch.lightmin.server.repository.JobExecutionEventRepository;
+import org.tuxdevelop.spring.batch.lightmin.server.repository.JournalRepository;
 import org.tuxdevelop.spring.batch.lightmin.server.repository.LightminApplicationRepository;
 import org.tuxdevelop.spring.batch.lightmin.server.scheduler.configuration.ServerSchedulerCoreConfiguration;
+import org.tuxdevelop.spring.batch.lightmin.server.scheduler.configuration.ServerSchedulerCoreConfigurationProperties;
+import org.tuxdevelop.spring.batch.lightmin.server.scheduler.repository.MapSchedulerConfigurationRepository;
+import org.tuxdevelop.spring.batch.lightmin.server.scheduler.repository.MapSchedulerExecutionRepository;
+import org.tuxdevelop.spring.batch.lightmin.server.scheduler.repository.SchedulerConfigurationRepository;
 import org.tuxdevelop.spring.batch.lightmin.server.scheduler.repository.SchedulerExecutionRepository;
 import org.tuxdevelop.spring.batch.lightmin.server.scheduler.repository.domain.ExecutionStatus;
 import org.tuxdevelop.spring.batch.lightmin.server.scheduler.repository.domain.SchedulerConfiguration;
 import org.tuxdevelop.spring.batch.lightmin.server.scheduler.repository.domain.SchedulerExecution;
 import org.tuxdevelop.spring.batch.lightmin.server.scheduler.repository.domain.ServerSchedulerStatus;
-import org.tuxdevelop.spring.batch.lightmin.server.scheduler.service.SchedulerConfigurationService;
+import org.tuxdevelop.spring.batch.lightmin.server.scheduler.service.*;
 import org.tuxdevelop.spring.batch.lightmin.server.service.JobServerService;
 
 import java.util.Collections;
@@ -25,18 +34,47 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 @Slf4j
 @RunWith(SpringRunner.class)
-@SpringBootTest(classes = {ServerSchedulerCoreConfiguration.class})
+@SpringBootTest(classes = {ServerSchedulerCoreConfiguration.class, MockedServerCoreRepoConfig.class,
+        SchedulerITNR.MockConfig.class}, properties = "spring.batch.lightmin.server.metrics-enabled=false")
 public class SchedulerITNR {
 
     private static final String APP_NAME = "IT_NR_APP";
 
+
+    @Configuration
+    static class MockConfig {
+        @Bean
+        SchedulerExecutionRepository executionRepository() {
+            return new MapSchedulerExecutionRepository();
+        }
+
+        @Bean
+        SchedulerConfigurationRepository schedulerConfigurationRepository() {
+            return new MapSchedulerConfigurationRepository();
+        }
+
+        @Bean
+        public ExecutionPollerService executionPollerService(final ServerSchedulerService serverSchedulerService,
+                                                             final SchedulerExecutionService schedulerExecutionService,
+                                                             final ServerSchedulerCoreConfigurationProperties properties) {
+            return new StandaloneExecutionPollerService(serverSchedulerService, schedulerExecutionService, properties);
+        }
+
+        @Bean
+        public ExecutionCleanUpService executionCleanUpService(final SchedulerExecutionRepository schedulerExecutionRepository,
+                                                               final ServerSchedulerCoreConfigurationProperties properties) {
+            return new StandaloneExecutionCleanupService(schedulerExecutionRepository, properties);
+        }
+    }
+
     @MockBean
     private JobServerService jobServerService;
-    @MockBean
+    @Autowired
     private LightminApplicationRepository lightminApplicationRepository;
     @Autowired
     private SchedulerConfigurationService schedulerConfigurationService;
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-core/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/scheduler/service/SchedulerConfigurationServiceIT.java b/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-core/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/scheduler/service/SchedulerConfigurationServiceIT.java
index b8c8227ae..4feebe0fd 100644
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-core/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/scheduler/service/SchedulerConfigurationServiceIT.java
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-core/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/scheduler/service/SchedulerConfigurationServiceIT.java
@@ -35,7 +35,6 @@ public class SchedulerConfigurationServiceIT extends CommonServiceIT {
     @MockBean
     private JobServerService jobServerService;
 
-
     @Test
     public void testSave() {
         final SchedulerConfiguration schedulerConfiguration =
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-core/src/test/java/org/tuxdevelop/spring/batch/lightmin/test/configuration/SchedulerCoreITConfiguration.java b/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-core/src/test/java/org/tuxdevelop/spring/batch/lightmin/test/configuration/SchedulerCoreITConfiguration.java
index d96655414..ec626f099 100644
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-core/src/test/java/org/tuxdevelop/spring/batch/lightmin/test/configuration/SchedulerCoreITConfiguration.java
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-core/src/test/java/org/tuxdevelop/spring/batch/lightmin/test/configuration/SchedulerCoreITConfiguration.java
@@ -6,11 +6,12 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.tuxdevelop.spring.batch.lightmin.server.annotation.EnableLightminServerCore;
+import org.tuxdevelop.spring.batch.lightmin.server.configuration.LightminServerCoreProperties;
+import org.tuxdevelop.spring.batch.lightmin.server.repository.*;
 import org.tuxdevelop.spring.batch.lightmin.server.scheduler.annotation.EnableServerSchedulerCore;
-import org.tuxdevelop.spring.batch.lightmin.server.scheduler.repository.CleanUpRepository;
-import org.tuxdevelop.spring.batch.lightmin.server.scheduler.repository.DefaultCleanUpRepository;
-import org.tuxdevelop.spring.batch.lightmin.server.scheduler.repository.SchedulerConfigurationRepository;
-import org.tuxdevelop.spring.batch.lightmin.server.scheduler.repository.SchedulerExecutionRepository;
+import org.tuxdevelop.spring.batch.lightmin.server.scheduler.configuration.ServerSchedulerCoreConfigurationProperties;
+import org.tuxdevelop.spring.batch.lightmin.server.scheduler.repository.*;
+import org.tuxdevelop.spring.batch.lightmin.server.scheduler.service.*;
 
 @Configuration
 @EnableServerSchedulerCore
@@ -23,4 +24,43 @@ public CleanUpRepository cleanUpRepository(final SchedulerExecutionRepository sc
                                                final SchedulerConfigurationRepository schedulerConfigurationRepository) {
         return new DefaultCleanUpRepository(schedulerConfigurationRepository, schedulerExecutionRepository);
     }
+
+    @Bean
+    public LightminApplicationRepository lightminApplicationRepository() {
+        return new MapLightminApplicationRepository();
+    }
+
+    @Bean
+    public JobExecutionEventRepository jobExecutionEventRepository(final LightminServerCoreProperties lightminServerCoreProperties) {
+        return new MapJobExecutionEventRepository(lightminServerCoreProperties.getEventRepositorySize());
+    }
+
+    @Bean
+    public JournalRepository journalRepository() {
+        return new MapJournalRepository();
+    }
+
+    @Bean
+    public SchedulerExecutionRepository schedulerExecutionRepository() {
+        return new MapSchedulerExecutionRepository();
+    }
+
+    @Bean
+    public SchedulerConfigurationRepository schedulerConfigurationRepository() {
+        return new MapSchedulerConfigurationRepository();
+    }
+
+    @Bean
+    public ExecutionPollerService executionPollerService(final ServerSchedulerService serverSchedulerService,
+                                                         final SchedulerExecutionService schedulerExecutionService,
+                                                         final ServerSchedulerCoreConfigurationProperties properties) {
+        return new StandaloneExecutionPollerService(serverSchedulerService, schedulerExecutionService, properties);
+    }
+
+    @Bean
+    public ExecutionCleanUpService executionCleanUpService(final SchedulerExecutionRepository schedulerExecutionRepository,
+                                                           final ServerSchedulerCoreConfigurationProperties properties) {
+        return new StandaloneExecutionCleanupService(schedulerExecutionRepository, properties);
+    }
+
 }
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-repository/pom.xml b/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-repository/pom.xml
index 9eefd8e7e..1bf6d6f5f 100644
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-repository/pom.xml
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-repository/pom.xml
@@ -5,7 +5,7 @@
     
         spring-batch-lightmin-server-scheduler
         org.tuxdevelop
-        2.2.2-SNAPSHOT
+        2.2.3-SNAPSHOT
     
     4.0.0
 
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-repository/spring-batch-lightmin-server-scheduler-repository-core/pom.xml b/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-repository/spring-batch-lightmin-server-scheduler-repository-core/pom.xml
index 8380a3c3c..17acfc647 100644
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-repository/spring-batch-lightmin-server-scheduler-repository-core/pom.xml
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-repository/spring-batch-lightmin-server-scheduler-repository-core/pom.xml
@@ -5,7 +5,7 @@
     
         spring-batch-lightmin-server-scheduler-repository
         org.tuxdevelop
-        2.2.2-SNAPSHOT
+        2.2.3-SNAPSHOT
     
     4.0.0
 
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-repository/spring-batch-lightmin-server-scheduler-repository-jdbc/pom.xml b/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-repository/spring-batch-lightmin-server-scheduler-repository-jdbc/pom.xml
index 9419bd8e9..30f937fec 100644
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-repository/spring-batch-lightmin-server-scheduler-repository-jdbc/pom.xml
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-repository/spring-batch-lightmin-server-scheduler-repository-jdbc/pom.xml
@@ -5,7 +5,7 @@
     
         spring-batch-lightmin-server-scheduler-repository
         org.tuxdevelop
-        2.2.2-SNAPSHOT
+        2.2.3-SNAPSHOT
     
     4.0.0
 
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-repository/spring-batch-lightmin-server-scheduler-repository-map/pom.xml b/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-repository/spring-batch-lightmin-server-scheduler-repository-map/pom.xml
index 059e676aa..a1757d364 100644
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-repository/spring-batch-lightmin-server-scheduler-repository-map/pom.xml
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-repository/spring-batch-lightmin-server-scheduler-repository-map/pom.xml
@@ -5,7 +5,7 @@
     
         spring-batch-lightmin-server-scheduler-repository
         org.tuxdevelop
-        2.2.2-SNAPSHOT
+        2.2.3-SNAPSHOT
     
     4.0.0
 
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-repository/spring-batch-lightmin-server-scheduler-repository-map/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/scheduler/repository/configuration/ServerSchedulerMapConfiguration.java b/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-repository/spring-batch-lightmin-server-scheduler-repository-map/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/scheduler/repository/configuration/ServerSchedulerMapConfiguration.java
index 57e48bd31..3185a56c3 100644
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-repository/spring-batch-lightmin-server-scheduler-repository-map/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/scheduler/repository/configuration/ServerSchedulerMapConfiguration.java
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-repository/spring-batch-lightmin-server-scheduler-repository-map/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/scheduler/repository/configuration/ServerSchedulerMapConfiguration.java
@@ -1,6 +1,5 @@
 package org.tuxdevelop.spring.batch.lightmin.server.scheduler.repository.configuration;
 
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.tuxdevelop.spring.batch.lightmin.server.scheduler.repository.MapSchedulerConfigurationRepository;
@@ -12,13 +11,11 @@
 public class ServerSchedulerMapConfiguration {
 
     @Bean
-    @ConditionalOnMissingBean(value = {SchedulerExecutionRepository.class})
     public SchedulerExecutionRepository schedulerExecutionRepository() {
         return new MapSchedulerExecutionRepository();
     }
 
     @Bean
-    @ConditionalOnMissingBean(value = {SchedulerConfigurationRepository.class})
     public SchedulerConfigurationRepository schedulerConfigurationRepository() {
         return new MapSchedulerConfigurationRepository();
     }
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-repository/spring-batch-lightmin-server-scheduler-repository-test/pom.xml b/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-repository/spring-batch-lightmin-server-scheduler-repository-test/pom.xml
index ce5ab78fc..ea4c3f3f6 100644
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-repository/spring-batch-lightmin-server-scheduler-repository-test/pom.xml
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-scheduler/spring-batch-lightmin-server-scheduler-repository/spring-batch-lightmin-server-scheduler-repository-test/pom.xml
@@ -5,7 +5,7 @@
     
         spring-batch-lightmin-server-scheduler-repository
         org.tuxdevelop
-        2.2.2-SNAPSHOT
+        2.2.3-SNAPSHOT
     
     4.0.0
 
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-standalone/pom.xml b/spring-batch-lightmin-server/spring-batch-lightmin-server-standalone/pom.xml
index 70949f336..b672124f6 100644
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-standalone/pom.xml
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-standalone/pom.xml
@@ -5,7 +5,7 @@
     
         spring-batch-lightmin-server
         org.tuxdevelop
-        2.2.2-SNAPSHOT
+        2.2.3-SNAPSHOT
     
     4.0.0
 
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-standalone/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/configuration/BaseRemoteStandaloneConfiguration.java b/spring-batch-lightmin-server/spring-batch-lightmin-server-standalone/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/configuration/BaseRemoteStandaloneConfiguration.java
new file mode 100644
index 000000000..d6385e087
--- /dev/null
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-standalone/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/configuration/BaseRemoteStandaloneConfiguration.java
@@ -0,0 +1,23 @@
+package org.tuxdevelop.spring.batch.lightmin.server.configuration;
+
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
+import org.tuxdevelop.spring.batch.lightmin.server.service.AdminServerService;
+import org.tuxdevelop.spring.batch.lightmin.server.service.JobServerService;
+import org.tuxdevelop.spring.batch.lightmin.server.service.RemoteAdminServerService;
+import org.tuxdevelop.spring.batch.lightmin.server.service.RemoteJobServerService;
+
+@Configuration
+public class BaseRemoteStandaloneConfiguration extends BaseStandaloneConfiguration{
+    @Bean
+    public AdminServerService adminServerService(@Qualifier("clientRestTemplate") final RestTemplate restTemplate) {
+        return new RemoteAdminServerService(restTemplate);
+    }
+
+    @Bean
+    public JobServerService jobServerService(@Qualifier("clientRestTemplate") final RestTemplate restTemplate) {
+        return new RemoteJobServerService(restTemplate);
+    }
+}
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-standalone/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/configuration/BaseStandaloneConfiguration.java b/spring-batch-lightmin-server/spring-batch-lightmin-server-standalone/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/configuration/BaseStandaloneConfiguration.java
new file mode 100644
index 000000000..1830d36c7
--- /dev/null
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-standalone/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/configuration/BaseStandaloneConfiguration.java
@@ -0,0 +1,38 @@
+package org.tuxdevelop.spring.batch.lightmin.server.configuration;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+import org.tuxdevelop.spring.batch.lightmin.server.annotation.EnableLightminServerCore;
+import org.tuxdevelop.spring.batch.lightmin.server.api.controller.JobExecutionEventController;
+import org.tuxdevelop.spring.batch.lightmin.server.api.controller.RegistrationController;
+import org.tuxdevelop.spring.batch.lightmin.server.api.controller.StepExecutionEventController;
+import org.tuxdevelop.spring.batch.lightmin.server.fe.annotation.EnableLightminServerFrontend;
+import org.tuxdevelop.spring.batch.lightmin.server.service.EventService;
+import org.tuxdevelop.spring.batch.lightmin.server.support.RegistrationBean;
+
+@Configuration
+@EnableLightminServerCore
+@EnableLightminServerFrontend
+public abstract class BaseStandaloneConfiguration {
+
+    @Bean
+    public RegistrationController registrationController(final RegistrationBean registrationBean) {
+        return new RegistrationController(registrationBean);
+    }
+
+    @Bean
+    public JobExecutionEventController jobExecutionEventController(final EventService eventService) {
+        return new JobExecutionEventController(eventService);
+    }
+
+    @Bean
+    public StepExecutionEventController stepExecutionEventController(final EventService eventService) {
+        return new StepExecutionEventController(eventService);
+    }
+
+    @Bean
+    public ScheduledTaskRegistrar serverScheduledTaskRegistrar() {
+        return new ScheduledTaskRegistrar();
+    }
+}
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-standalone/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/configuration/LightminServerStandaloneConfiguration.java b/spring-batch-lightmin-server/spring-batch-lightmin-server-standalone/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/configuration/LightminServerStandaloneConfiguration.java
index 0d63a7642..308259e94 100644
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-standalone/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/configuration/LightminServerStandaloneConfiguration.java
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-standalone/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/configuration/LightminServerStandaloneConfiguration.java
@@ -6,41 +6,42 @@
 import org.springframework.context.annotation.Import;
 import org.springframework.scheduling.config.ScheduledTaskRegistrar;
 import org.springframework.web.client.RestTemplate;
-import org.tuxdevelop.spring.batch.lightmin.server.annotation.EnableLightminServerCore;
-import org.tuxdevelop.spring.batch.lightmin.server.api.controller.JobExecutionEventController;
-import org.tuxdevelop.spring.batch.lightmin.server.api.controller.RegistrationController;
-import org.tuxdevelop.spring.batch.lightmin.server.api.controller.StepExecutionEventController;
 import org.tuxdevelop.spring.batch.lightmin.server.event.listener.OnApplicationReadyEventListener;
 import org.tuxdevelop.spring.batch.lightmin.server.event.listener.OnLightminClientApplicationRegisteredEventListener;
 import org.tuxdevelop.spring.batch.lightmin.server.fe.annotation.EnableLightminServerFrontend;
-import org.tuxdevelop.spring.batch.lightmin.server.repository.LightminApplicationRepository;
-import org.tuxdevelop.spring.batch.lightmin.server.service.*;
+import org.tuxdevelop.spring.batch.lightmin.server.repository.*;
+import org.tuxdevelop.spring.batch.lightmin.server.scheduler.repository.annotation.EnableServerSchedulerMapRepository;
+import org.tuxdevelop.spring.batch.lightmin.server.service.AdminServerService;
+import org.tuxdevelop.spring.batch.lightmin.server.service.JobServerService;
+import org.tuxdevelop.spring.batch.lightmin.server.service.RemoteAdminServerService;
+import org.tuxdevelop.spring.batch.lightmin.server.service.RemoteJobServerService;
+import org.tuxdevelop.spring.batch.lightmin.server.sheduler.StandaloneSchedulerConfiguration;
 import org.tuxdevelop.spring.batch.lightmin.server.support.ClientApplicationStatusUpdater;
-import org.tuxdevelop.spring.batch.lightmin.server.support.RegistrationBean;
 
 /**
  * @author Marcel Becker
  * @since 0.3
  */
 @Configuration
-@EnableLightminServerCore
 @EnableLightminServerFrontend
-@Import(value = {LightminServerStandaloneDiscoveryConfiguration.class})
-public class LightminServerStandaloneConfiguration {
+@EnableServerSchedulerMapRepository
+@Import(value = {LightminServerStandaloneDiscoveryConfiguration.class, StandaloneSchedulerConfiguration.class})
+public class LightminServerStandaloneConfiguration extends BaseStandaloneConfiguration{
+
 
     @Bean
-    public RegistrationController registrationController(final RegistrationBean registrationBean) {
-        return new RegistrationController(registrationBean);
+    public LightminApplicationRepository lightminApplicationRepository() {
+        return new MapLightminApplicationRepository();
     }
 
     @Bean
-    public JobExecutionEventController jobExecutionEventController(final EventService eventService) {
-        return new JobExecutionEventController(eventService);
+    public JobExecutionEventRepository jobExecutionEventRepository(final LightminServerCoreProperties lightminServerCoreProperties) {
+        return new MapJobExecutionEventRepository(lightminServerCoreProperties.getEventRepositorySize());
     }
 
     @Bean
-    public StepExecutionEventController stepExecutionEventController(final EventService eventService) {
-        return new StepExecutionEventController(eventService);
+    public JournalRepository journalRepository() {
+        return new MapJournalRepository();
     }
 
     @Bean
@@ -60,11 +61,6 @@ public ClientApplicationStatusUpdater clientApplicationStatusUpdater(
         return new ClientApplicationStatusUpdater(restTemplate, lightminApplicationRepository);
     }
 
-    @Bean
-    public ScheduledTaskRegistrar serverScheduledTaskRegistrar() {
-        return new ScheduledTaskRegistrar();
-    }
-
     @Bean
     public OnApplicationReadyEventListener onApplicationReadyEventListener(final ScheduledTaskRegistrar serverScheduledTaskRegistrar,
                                                                            final ClientApplicationStatusUpdater clientApplicationStatusUpdater,
@@ -77,4 +73,5 @@ public OnLightminClientApplicationRegisteredEventListener onLightminClientApplic
         return new OnLightminClientApplicationRegisteredEventListener(clientApplicationStatusUpdater);
     }
 
+
 }
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-standalone/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/sheduler/StandaloneSchedulerConfiguration.java b/spring-batch-lightmin-server/spring-batch-lightmin-server-standalone/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/sheduler/StandaloneSchedulerConfiguration.java
new file mode 100644
index 000000000..2109b6a93
--- /dev/null
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-standalone/src/main/java/org/tuxdevelop/spring/batch/lightmin/server/sheduler/StandaloneSchedulerConfiguration.java
@@ -0,0 +1,23 @@
+package org.tuxdevelop.spring.batch.lightmin.server.sheduler;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.tuxdevelop.spring.batch.lightmin.server.scheduler.configuration.ServerSchedulerCoreConfigurationProperties;
+import org.tuxdevelop.spring.batch.lightmin.server.scheduler.repository.SchedulerExecutionRepository;
+import org.tuxdevelop.spring.batch.lightmin.server.scheduler.service.*;
+
+@Configuration
+public class StandaloneSchedulerConfiguration {
+    @Bean
+    public ExecutionPollerService executionPollerService(final ServerSchedulerService serverSchedulerService,
+                                                         final SchedulerExecutionService schedulerExecutionService,
+                                                         final ServerSchedulerCoreConfigurationProperties properties) {
+        return new StandaloneExecutionPollerService(serverSchedulerService, schedulerExecutionService, properties);
+    }
+
+    @Bean
+    public ExecutionCleanUpService executionCleanUpService(final SchedulerExecutionRepository schedulerExecutionRepository,
+                                                           final ServerSchedulerCoreConfigurationProperties properties) {
+        return new StandaloneExecutionCleanupService(schedulerExecutionRepository, properties);
+    }
+}
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-standalone/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/sample/application/client/configuration/ApplicationConfig.java b/spring-batch-lightmin-server/spring-batch-lightmin-server-standalone/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/sample/application/client/configuration/ApplicationConfig.java
index c2c6fdaff..a1ba66688 100644
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-standalone/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/sample/application/client/configuration/ApplicationConfig.java
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-standalone/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/sample/application/client/configuration/ApplicationConfig.java
@@ -9,10 +9,10 @@
 @Configuration
 public class ApplicationConfig {
 
-    @Bean
-    public MeterRegistryCustomizer metricsCommonTags(@Value("${spring.application.name}") final String name) {
-        return registry ->
-                registry.config()
-                        .commonTags("APPLICATION_NAME", name);
-    }
+//    @Bean
+//    public MeterRegistryCustomizer metricsCommonTags(@Value("${spring.application.name}") final String name) {
+//        return registry ->
+//                registry.config()
+//                        .commonTags("APPLICATION_NAME", name);
+//    }
 }
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-standalone/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/sample/application/server/LightminServer.java b/spring-batch-lightmin-server/spring-batch-lightmin-server-standalone/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/sample/application/server/LightminServer.java
index f63fc0fe8..852b55c31 100644
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-standalone/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/sample/application/server/LightminServer.java
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-standalone/src/test/java/org/tuxdevelop/spring/batch/lightmin/server/sample/application/server/LightminServer.java
@@ -56,10 +56,10 @@ public JdbcTemplate jdbcTemplate(final DataSource dataSource) {
         return jdbcTemplate;
     }
 
-    @Bean
-    public MeterRegistryCustomizer metricsCommonTags(@Value("${spring.application.name}") final String name) {
-        return registry ->
-                registry.config()
-                        .commonTags("APPLICATION_NAME", name);
-    }
+//    @Bean
+//    public MeterRegistryCustomizer metricsCommonTags(@Value("${spring.application.name}") final String name) {
+//        return registry ->
+//                registry.config()
+//                        .commonTags("APPLICATION_NAME", name);
+//    }
 }
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-standalone/src/test/resources/application.yml b/spring-batch-lightmin-server/spring-batch-lightmin-server-standalone/src/test/resources/application.yml
index a65058ad6..fc86246e6 100644
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-standalone/src/test/resources/application.yml
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-standalone/src/test/resources/application.yml
@@ -1,6 +1,3 @@
-spring:
-  main:
-    allow-bean-definition-overriding: true
 management:
   endpoints:
     web:
diff --git a/spring-batch-lightmin-server/spring-batch-lightmin-server-standalone/src/test/resources/properties/local_client.properties b/spring-batch-lightmin-server/spring-batch-lightmin-server-standalone/src/test/resources/properties/local_client.properties
index 39c88d453..b111f97a0 100644
--- a/spring-batch-lightmin-server/spring-batch-lightmin-server-standalone/src/test/resources/properties/local_client.properties
+++ b/spring-batch-lightmin-server/spring-batch-lightmin-server-standalone/src/test/resources/properties/local_client.properties
@@ -2,5 +2,4 @@ spring.application.name=test
 spring.batch.lightmin.client.classic.server.url.[0]=http://localhost:${server.port}
 spring.batch.job.enabled=false
 spring.batch.lightmin.batch.repository-type=map
-spring.cloud.consul.enabled=false
-spring.main.allow-bean-definition-overriding=true
\ No newline at end of file
+spring.cloud.consul.enabled=false
\ No newline at end of file
diff --git a/spring-batch-lightmin-test/pom.xml b/spring-batch-lightmin-test/pom.xml
index e215bf34d..47a42ea09 100644
--- a/spring-batch-lightmin-test/pom.xml
+++ b/spring-batch-lightmin-test/pom.xml
@@ -5,7 +5,7 @@
     
         spring-batch-lightmin
         org.tuxdevelop
-        2.2.2-SNAPSHOT
+        2.2.3-SNAPSHOT
     
     4.0.0
 
diff --git a/spring-batch-lightmin-test/spring-batch-lightmin-test-api/pom.xml b/spring-batch-lightmin-test/spring-batch-lightmin-test-api/pom.xml
index 8f99f6501..02e5664ea 100644
--- a/spring-batch-lightmin-test/spring-batch-lightmin-test-api/pom.xml
+++ b/spring-batch-lightmin-test/spring-batch-lightmin-test-api/pom.xml
@@ -5,7 +5,7 @@
     
         spring-batch-lightmin-test
         org.tuxdevelop
-        2.2.2-SNAPSHOT
+        2.2.3-SNAPSHOT
     
     4.0.0
 
diff --git a/spring-batch-lightmin-test/spring-batch-lightmin-test-core/pom.xml b/spring-batch-lightmin-test/spring-batch-lightmin-test-core/pom.xml
index b5f9d52aa..5ff80a7f4 100644
--- a/spring-batch-lightmin-test/spring-batch-lightmin-test-core/pom.xml
+++ b/spring-batch-lightmin-test/spring-batch-lightmin-test-core/pom.xml
@@ -5,7 +5,7 @@
     
         spring-batch-lightmin-test
         org.tuxdevelop
-        2.2.2-SNAPSHOT
+        2.2.3-SNAPSHOT
     
     4.0.0
 
diff --git a/spring-batch-lightmin-test/spring-batch-lightmin-test-domain/pom.xml b/spring-batch-lightmin-test/spring-batch-lightmin-test-domain/pom.xml
index 8ef684148..164a32eae 100644
--- a/spring-batch-lightmin-test/spring-batch-lightmin-test-domain/pom.xml
+++ b/spring-batch-lightmin-test/spring-batch-lightmin-test-domain/pom.xml
@@ -5,7 +5,7 @@
     
         spring-batch-lightmin-test
         org.tuxdevelop
-        2.2.2-SNAPSHOT
+        2.2.3-SNAPSHOT
     
     4.0.0
 
diff --git a/spring-batch-lightmin-util/pom.xml b/spring-batch-lightmin-util/pom.xml
index c2cecc3a6..e153ea6de 100644
--- a/spring-batch-lightmin-util/pom.xml
+++ b/spring-batch-lightmin-util/pom.xml
@@ -5,7 +5,7 @@
     
         spring-batch-lightmin
         org.tuxdevelop
-        2.2.2-SNAPSHOT
+        2.2.3-SNAPSHOT
     
     4.0.0
 
diff --git a/spring-batch-lightmin-validation/pom.xml b/spring-batch-lightmin-validation/pom.xml
index c3e03dfac..d0d5926f4 100644
--- a/spring-batch-lightmin-validation/pom.xml
+++ b/spring-batch-lightmin-validation/pom.xml
@@ -6,7 +6,7 @@
     
         spring-batch-lightmin
         org.tuxdevelop
-        2.2.2-SNAPSHOT
+        2.2.3-SNAPSHOT
     
 
     spring-batch-lightmin-validation