diff --git a/spring-all/src/main/java/org/baeldung/core/ComponentUsingProperties.java b/spring-all/src/main/java/org/baeldung/core/ComponentUsingProperties.java
new file mode 100644
index 0000000000..b3b44da3bd
--- /dev/null
+++ b/spring-all/src/main/java/org/baeldung/core/ComponentUsingProperties.java
@@ -0,0 +1,12 @@
+package org.baeldung.core;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public class ComponentUsingProperties {
+
+ public ComponentUsingProperties() {
+ super();
+ }
+
+}
diff --git a/spring-all/src/main/java/org/baeldung/web/Setup.java b/spring-all/src/main/java/org/baeldung/persistence/Setup.java
similarity index 72%
rename from spring-all/src/main/java/org/baeldung/web/Setup.java
rename to spring-all/src/main/java/org/baeldung/persistence/Setup.java
index f04135d807..5cba4e70fb 100644
--- a/spring-all/src/main/java/org/baeldung/web/Setup.java
+++ b/spring-all/src/main/java/org/baeldung/persistence/Setup.java
@@ -1,20 +1,14 @@
-package org.baeldung.web;
+package org.baeldung.persistence;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationListener;
import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.stereotype.Component;
-// @Component
+@Component
public class Setup implements ApplicationListener<ContextRefreshedEvent> {
private boolean setupDone;
- @Autowired
- ServiceA serviceA;
-
- @Autowired
- IServiceB serviceB;
-
public Setup() {
super();
}
diff --git a/spring-all/src/main/java/org/baeldung/spring/config/CoreConfig.java b/spring-all/src/main/java/org/baeldung/spring/config/CoreConfig.java
index e202a779db..ba17ca7938 100644
--- a/spring-all/src/main/java/org/baeldung/spring/config/CoreConfig.java
+++ b/spring-all/src/main/java/org/baeldung/spring/config/CoreConfig.java
@@ -1,11 +1,13 @@
package org.baeldung.spring.config;
+import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.ImportResource;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
@Configuration
-@ImportResource("classpath:beansInXml.xml")
+@ImportResource("classpath:configForProperties.xml")
+@ComponentScan("org.baeldung.core")
public class CoreConfig extends WebMvcConfigurerAdapter {
public CoreConfig() {
diff --git a/spring-all/src/main/java/org/baeldung/spring/config/ClientWebConfig.java b/spring-all/src/main/java/org/baeldung/spring/config/MvcConfig.java
similarity index 92%
rename from spring-all/src/main/java/org/baeldung/spring/config/ClientWebConfig.java
rename to spring-all/src/main/java/org/baeldung/spring/config/MvcConfig.java
index f027eb73fc..f87e400fce 100644
--- a/spring-all/src/main/java/org/baeldung/spring/config/ClientWebConfig.java
+++ b/spring-all/src/main/java/org/baeldung/spring/config/MvcConfig.java
@@ -11,9 +11,9 @@ import org.springframework.web.servlet.view.JstlView;
@EnableWebMvc
@Configuration
-public class ClientWebConfig extends WebMvcConfigurerAdapter {
+public class MvcConfig extends WebMvcConfigurerAdapter {
- public ClientWebConfig() {
+ public MvcConfig() {
super();
}
diff --git a/spring-all/src/main/java/org/baeldung/spring/config/WebConfig.java b/spring-all/src/main/java/org/baeldung/spring/config/WebConfig.java
deleted file mode 100644
index c69ef21b0c..0000000000
--- a/spring-all/src/main/java/org/baeldung/spring/config/WebConfig.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.baeldung.spring.config;
-
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-
-@Configuration
-@EnableWebMvc
-@ComponentScan("org.baeldung.web")
-public class WebConfig extends WebMvcConfigurerAdapter {
-
- @Autowired
- BeanFactory beanFactory;
-
- public WebConfig() {
- super();
- }
-
-}
\ No newline at end of file
diff --git a/spring-all/src/main/java/org/baeldung/web/BeanC1.java b/spring-all/src/main/java/org/baeldung/web/BeanC1.java
deleted file mode 100644
index cb3c845a02..0000000000
--- a/spring-all/src/main/java/org/baeldung/web/BeanC1.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.baeldung.web;
-
-import org.springframework.stereotype.Component;
-
-@Component
-public class BeanC1 implements IBeanC {
-
- public BeanC1() {
- super();
- }
-
-}
diff --git a/spring-all/src/main/java/org/baeldung/web/BeanC2.java b/spring-all/src/main/java/org/baeldung/web/BeanC2.java
deleted file mode 100644
index ed38a809cf..0000000000
--- a/spring-all/src/main/java/org/baeldung/web/BeanC2.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.baeldung.web;
-
-import org.springframework.stereotype.Component;
-
-@Component
-public class BeanC2 implements IBeanC {
-
- public BeanC2() {
- super();
- }
-
-}
diff --git a/spring-all/src/main/java/org/baeldung/web/BeanD.java b/spring-all/src/main/java/org/baeldung/web/BeanD.java
deleted file mode 100644
index 04488238e5..0000000000
--- a/spring-all/src/main/java/org/baeldung/web/BeanD.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.baeldung.web;
-
-import org.springframework.stereotype.Component;
-
-@Component
-public class BeanD implements IBeanD {
-
- public BeanD() {
- super();
- }
-
-}
diff --git a/spring-all/src/main/java/org/baeldung/web/IBeanC.java b/spring-all/src/main/java/org/baeldung/web/IBeanC.java
deleted file mode 100644
index 78adca4e72..0000000000
--- a/spring-all/src/main/java/org/baeldung/web/IBeanC.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.baeldung.web;
-
-public interface IBeanC {
- //
-}
diff --git a/spring-all/src/main/java/org/baeldung/web/IBeanD.java b/spring-all/src/main/java/org/baeldung/web/IBeanD.java
deleted file mode 100644
index 2b50038c71..0000000000
--- a/spring-all/src/main/java/org/baeldung/web/IBeanD.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.baeldung.web;
-
-public interface IBeanD {
- //
-}
diff --git a/spring-all/src/main/java/org/baeldung/web/IServiceA.java b/spring-all/src/main/java/org/baeldung/web/IServiceA.java
deleted file mode 100644
index 0461d5293f..0000000000
--- a/spring-all/src/main/java/org/baeldung/web/IServiceA.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.baeldung.web;
-
-public interface IServiceA {
- //
-}
diff --git a/spring-all/src/main/java/org/baeldung/web/IServiceB.java b/spring-all/src/main/java/org/baeldung/web/IServiceB.java
deleted file mode 100644
index faf048cde5..0000000000
--- a/spring-all/src/main/java/org/baeldung/web/IServiceB.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.baeldung.web;
-
-public interface IServiceB {
- //
-}
diff --git a/spring-all/src/main/java/org/baeldung/web/ServiceA.java b/spring-all/src/main/java/org/baeldung/web/ServiceA.java
deleted file mode 100644
index deee4c6e55..0000000000
--- a/spring-all/src/main/java/org/baeldung/web/ServiceA.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.baeldung.web;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-@Service
-@Transactional
-public class ServiceA {
-
- @Autowired
- public ServiceA(final IServiceB serviceB) {
- super();
- }
-
- //
-
- public void testA() {
- System.out.println();
- }
-
-}
diff --git a/spring-all/src/main/java/org/baeldung/web/ServiceB.java b/spring-all/src/main/java/org/baeldung/web/ServiceB.java
deleted file mode 100644
index 48ff0f2648..0000000000
--- a/spring-all/src/main/java/org/baeldung/web/ServiceB.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.baeldung.web;
-
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-@Service
-@Transactional
-public class ServiceB implements IServiceB {
-
- public ServiceB() {
- super();
- }
-
- //
-
- public void testB() {
- System.out.println();
- }
-
-}
diff --git a/spring-all/src/main/resources/beansInXml.xml b/spring-all/src/main/resources/configForProperties.xml
similarity index 100%
rename from spring-all/src/main/resources/beansInXml.xml
rename to spring-all/src/main/resources/configForProperties.xml