From f07985b402c96fbf54e4a05ae0a2f3c51fda47b8 Mon Sep 17 00:00:00 2001
From: Grzegorz Piwowarek <gpiwowarek@gmail.com>
Date: Mon, 6 Mar 2017 20:38:29 +0100
Subject: [PATCH] Remove spring-autowire (#1319)

---
 pom.xml                                       |   1 -
 .../main/java/org/baeldung}/sample/App.java   |   2 +-
 .../java/org/baeldung}/sample/AppConfig.java  |   2 +-
 .../main/java/org/baeldung/sample/Bar.java    |   5 +
 .../org/baeldung}/sample/BarFormatter.java    |   2 +-
 .../main/java/org/baeldung/sample/Foo.java    |   5 +
 .../main/java/org/baeldung/sample/FooDAO.java |   5 +
 .../org/baeldung}/sample/FooFormatter.java    |   2 +-
 .../java/org/baeldung}/sample/FooService.java |   2 +-
 .../java/org/baeldung}/sample/Formatter.java  |   2 +-
 .../org/baeldung}/sample/FormatterType.java   |   2 +-
 .../sample/FooServiceIntegrationTest.java     |   2 +-
 spring-autowire/README.md                     |   2 -
 spring-autowire/pom.xml                       | 105 ------------------
 .../com/baeldung/autowire/sample/Bar.java     |   5 -
 .../com/baeldung/autowire/sample/Foo.java     |   5 -
 .../com/baeldung/autowire/sample/FooDAO.java  |   5 -
 17 files changed, 23 insertions(+), 131 deletions(-)
 rename {spring-autowire/src/main/java/com/baeldung/autowire => spring-all/src/main/java/org/baeldung}/sample/App.java (90%)
 rename {spring-autowire/src/main/java/com/baeldung/autowire => spring-all/src/main/java/org/baeldung}/sample/AppConfig.java (84%)
 create mode 100644 spring-all/src/main/java/org/baeldung/sample/Bar.java
 rename {spring-autowire/src/main/java/com/baeldung/autowire => spring-all/src/main/java/org/baeldung}/sample/BarFormatter.java (83%)
 create mode 100644 spring-all/src/main/java/org/baeldung/sample/Foo.java
 create mode 100644 spring-all/src/main/java/org/baeldung/sample/FooDAO.java
 rename {spring-autowire/src/main/java/com/baeldung/autowire => spring-all/src/main/java/org/baeldung}/sample/FooFormatter.java (83%)
 rename {spring-autowire/src/main/java/com/baeldung/autowire => spring-all/src/main/java/org/baeldung}/sample/FooService.java (88%)
 rename {spring-autowire/src/main/java/com/baeldung/autowire => spring-all/src/main/java/org/baeldung}/sample/Formatter.java (59%)
 rename {spring-autowire/src/main/java/com/baeldung/autowire => spring-all/src/main/java/org/baeldung}/sample/FormatterType.java (91%)
 rename {spring-autowire/src/test/java/com/baeldung/autowire => spring-all/src/test/java/org/baeldung}/sample/FooServiceIntegrationTest.java (94%)
 delete mode 100644 spring-autowire/README.md
 delete mode 100644 spring-autowire/pom.xml
 delete mode 100644 spring-autowire/src/main/java/com/baeldung/autowire/sample/Bar.java
 delete mode 100644 spring-autowire/src/main/java/com/baeldung/autowire/sample/Foo.java
 delete mode 100644 spring-autowire/src/main/java/com/baeldung/autowire/sample/FooDAO.java

diff --git a/pom.xml b/pom.xml
index 5230a680fe..5adbbcb7e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,7 +111,6 @@
         <module>spring-amqp</module>
         <module>spring-all</module>
         <module>spring-apache-camel</module>
-        <module>spring-autowire</module>
         <module>spring-batch</module>
         <module>spring-boot</module>
         <module>spring-cloud-data-flow</module>
diff --git a/spring-autowire/src/main/java/com/baeldung/autowire/sample/App.java b/spring-all/src/main/java/org/baeldung/sample/App.java
similarity index 90%
rename from spring-autowire/src/main/java/com/baeldung/autowire/sample/App.java
rename to spring-all/src/main/java/org/baeldung/sample/App.java
index 18ff11a49c..17fc49fc8c 100644
--- a/spring-autowire/src/main/java/com/baeldung/autowire/sample/App.java
+++ b/spring-all/src/main/java/org/baeldung/sample/App.java
@@ -1,4 +1,4 @@
-package com.baeldung.autowire.sample;
+package org.baeldung.sample;
 
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
diff --git a/spring-autowire/src/main/java/com/baeldung/autowire/sample/AppConfig.java b/spring-all/src/main/java/org/baeldung/sample/AppConfig.java
similarity index 84%
rename from spring-autowire/src/main/java/com/baeldung/autowire/sample/AppConfig.java
rename to spring-all/src/main/java/org/baeldung/sample/AppConfig.java
index f948e2bf8e..ffc792d9df 100644
--- a/spring-autowire/src/main/java/com/baeldung/autowire/sample/AppConfig.java
+++ b/spring-all/src/main/java/org/baeldung/sample/AppConfig.java
@@ -1,4 +1,4 @@
-package com.baeldung.autowire.sample;
+package org.baeldung.sample;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-all/src/main/java/org/baeldung/sample/Bar.java b/spring-all/src/main/java/org/baeldung/sample/Bar.java
new file mode 100644
index 0000000000..54e8d54418
--- /dev/null
+++ b/spring-all/src/main/java/org/baeldung/sample/Bar.java
@@ -0,0 +1,5 @@
+package org.baeldung.sample;
+
+public class Bar {
+
+}
diff --git a/spring-autowire/src/main/java/com/baeldung/autowire/sample/BarFormatter.java b/spring-all/src/main/java/org/baeldung/sample/BarFormatter.java
similarity index 83%
rename from spring-autowire/src/main/java/com/baeldung/autowire/sample/BarFormatter.java
rename to spring-all/src/main/java/org/baeldung/sample/BarFormatter.java
index e67a376d25..8396653970 100644
--- a/spring-autowire/src/main/java/com/baeldung/autowire/sample/BarFormatter.java
+++ b/spring-all/src/main/java/org/baeldung/sample/BarFormatter.java
@@ -1,4 +1,4 @@
-package com.baeldung.autowire.sample;
+package org.baeldung.sample;
 
 import org.springframework.stereotype.Component;
 
diff --git a/spring-all/src/main/java/org/baeldung/sample/Foo.java b/spring-all/src/main/java/org/baeldung/sample/Foo.java
new file mode 100644
index 0000000000..562a00121a
--- /dev/null
+++ b/spring-all/src/main/java/org/baeldung/sample/Foo.java
@@ -0,0 +1,5 @@
+package org.baeldung.sample;
+
+public class Foo {
+
+}
diff --git a/spring-all/src/main/java/org/baeldung/sample/FooDAO.java b/spring-all/src/main/java/org/baeldung/sample/FooDAO.java
new file mode 100644
index 0000000000..151c0c38de
--- /dev/null
+++ b/spring-all/src/main/java/org/baeldung/sample/FooDAO.java
@@ -0,0 +1,5 @@
+package org.baeldung.sample;
+
+public class FooDAO {
+
+}
diff --git a/spring-autowire/src/main/java/com/baeldung/autowire/sample/FooFormatter.java b/spring-all/src/main/java/org/baeldung/sample/FooFormatter.java
similarity index 83%
rename from spring-autowire/src/main/java/com/baeldung/autowire/sample/FooFormatter.java
rename to spring-all/src/main/java/org/baeldung/sample/FooFormatter.java
index 57f93a53d7..68cb7f81f2 100644
--- a/spring-autowire/src/main/java/com/baeldung/autowire/sample/FooFormatter.java
+++ b/spring-all/src/main/java/org/baeldung/sample/FooFormatter.java
@@ -1,4 +1,4 @@
-package com.baeldung.autowire.sample;
+package org.baeldung.sample;
 
 import org.springframework.stereotype.Component;
 
diff --git a/spring-autowire/src/main/java/com/baeldung/autowire/sample/FooService.java b/spring-all/src/main/java/org/baeldung/sample/FooService.java
similarity index 88%
rename from spring-autowire/src/main/java/com/baeldung/autowire/sample/FooService.java
rename to spring-all/src/main/java/org/baeldung/sample/FooService.java
index c55d93da11..711711f205 100644
--- a/spring-autowire/src/main/java/com/baeldung/autowire/sample/FooService.java
+++ b/spring-all/src/main/java/org/baeldung/sample/FooService.java
@@ -1,4 +1,4 @@
-package com.baeldung.autowire.sample;
+package org.baeldung.sample;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
diff --git a/spring-autowire/src/main/java/com/baeldung/autowire/sample/Formatter.java b/spring-all/src/main/java/org/baeldung/sample/Formatter.java
similarity index 59%
rename from spring-autowire/src/main/java/com/baeldung/autowire/sample/Formatter.java
rename to spring-all/src/main/java/org/baeldung/sample/Formatter.java
index 59d718050a..ab29c2b848 100644
--- a/spring-autowire/src/main/java/com/baeldung/autowire/sample/Formatter.java
+++ b/spring-all/src/main/java/org/baeldung/sample/Formatter.java
@@ -1,4 +1,4 @@
-package com.baeldung.autowire.sample;
+package org.baeldung.sample;
 
 public interface Formatter {
 
diff --git a/spring-autowire/src/main/java/com/baeldung/autowire/sample/FormatterType.java b/spring-all/src/main/java/org/baeldung/sample/FormatterType.java
similarity index 91%
rename from spring-autowire/src/main/java/com/baeldung/autowire/sample/FormatterType.java
rename to spring-all/src/main/java/org/baeldung/sample/FormatterType.java
index f2961745b5..d4d82dd022 100644
--- a/spring-autowire/src/main/java/com/baeldung/autowire/sample/FormatterType.java
+++ b/spring-all/src/main/java/org/baeldung/sample/FormatterType.java
@@ -1,4 +1,4 @@
-package com.baeldung.autowire.sample;
+package org.baeldung.sample;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/spring-autowire/src/test/java/com/baeldung/autowire/sample/FooServiceIntegrationTest.java b/spring-all/src/test/java/org/baeldung/sample/FooServiceIntegrationTest.java
similarity index 94%
rename from spring-autowire/src/test/java/com/baeldung/autowire/sample/FooServiceIntegrationTest.java
rename to spring-all/src/test/java/org/baeldung/sample/FooServiceIntegrationTest.java
index 34ba7902ca..6b518395a1 100644
--- a/spring-autowire/src/test/java/com/baeldung/autowire/sample/FooServiceIntegrationTest.java
+++ b/spring-all/src/test/java/org/baeldung/sample/FooServiceIntegrationTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.autowire.sample;
+package org.baeldung.sample;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/spring-autowire/README.md b/spring-autowire/README.md
deleted file mode 100644
index d5b8221b25..0000000000
--- a/spring-autowire/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-### Relevant Articles:
-- [Guide to Spring @Autowired](http://www.baeldung.com/spring-autowire)
diff --git a/spring-autowire/pom.xml b/spring-autowire/pom.xml
deleted file mode 100644
index 391cfc018e..0000000000
--- a/spring-autowire/pom.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>com.baeldung</groupId>
-  <artifactId>spring-autowire</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
-  <packaging>jar</packaging>
-
-  <name>spring-autowire</name>
-  <url>http://maven.apache.org</url>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <org.springframework.version>4.3.4.RELEASE</org.springframework.version>
-    <junit.version>4.12</junit.version>
-    <maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
-    <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
-  </properties>
-
-  <dependencies>
-  	<dependency>
-	    <groupId>junit</groupId>
-	    <artifactId>junit</artifactId>
-	    <version>${junit.version}</version>
-	</dependency>
-    <dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-core</artifactId>
-	  <version>${org.springframework.version}</version>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-context</artifactId>
-	  <version>${org.springframework.version}</version>
-	</dependency>
-	<dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-test</artifactId>
-        <version>${org.springframework.version}</version>
-        <scope>test</scope>
-    </dependency>
-  </dependencies>
-  
-  <build>
-        <finalName>spring-autowire</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
-                <configuration>
-                    <excludes>
-                        <exclude>**/*IntegrationTest.java</exclude>
-                        <exclude>**/*LiveTest.java</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>  
-    
-    <profiles>
-        <profile>
-            <id>integration</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <phase>integration-test</phase>
-                                <goals>
-                                    <goal>test</goal>
-                                </goals>
-                                <configuration>
-                                    <excludes>
-                                        <exclude>**/*LiveTest.java</exclude>
-                                    </excludes>
-                                    <includes>
-                                        <include>**/*IntegrationTest.java</include>
-                                    </includes>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <systemPropertyVariables>
-                                <test.mime>json</test.mime>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>    
-</project>
diff --git a/spring-autowire/src/main/java/com/baeldung/autowire/sample/Bar.java b/spring-autowire/src/main/java/com/baeldung/autowire/sample/Bar.java
deleted file mode 100644
index 7aa820adef..0000000000
--- a/spring-autowire/src/main/java/com/baeldung/autowire/sample/Bar.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.baeldung.autowire.sample;
-
-public class Bar {
-
-}
diff --git a/spring-autowire/src/main/java/com/baeldung/autowire/sample/Foo.java b/spring-autowire/src/main/java/com/baeldung/autowire/sample/Foo.java
deleted file mode 100644
index b587ab38b8..0000000000
--- a/spring-autowire/src/main/java/com/baeldung/autowire/sample/Foo.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.baeldung.autowire.sample;
-
-public class Foo {
-
-}
diff --git a/spring-autowire/src/main/java/com/baeldung/autowire/sample/FooDAO.java b/spring-autowire/src/main/java/com/baeldung/autowire/sample/FooDAO.java
deleted file mode 100644
index aec26202ab..0000000000
--- a/spring-autowire/src/main/java/com/baeldung/autowire/sample/FooDAO.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.baeldung.autowire.sample;
-
-public class FooDAO {
-
-}