Style changes to make the code read cleaner on small monitors.

conf/dev/ant/ivy.xml

@@ -5,33 +5,48 @@
     <conf name="provided" description="Provided by the environment" />
     <conf name="compile" extends="default,provided" />
     <conf name="war" extends="default"/>
-    <conf name="ant" description="Used by ant to integrate with tools and not included in the final build." />
-    <conf name="test" description="Used to test compiled files and not included in the final build." />
+    <conf name="ant" description="Used by ant to integrate with tools and not
+                                  included in the final build." />
+    <conf name="test" description="Used to test compiled files and not included in
+                                   the final build." />
   </configurations>
   <dependencies>
     <!-- Spring Framework -->
-    <dependency org="org.springframework" name="spring-webmvc" rev="5.0.9.RELEASE"/>
+    <dependency org="org.springframework"
+                name="spring-webmvc" rev="5.0.9.RELEASE"/>
     <!-- Logging -->
     <dependency org="log4j" name="log4j" rev="1.2.17"/>
     <!-- DB Resources -->
     <dependency org="org.mongodb.morphia" name="morphia" rev="1.3.2"/>
-    <dependency org="org.springframework.boot" name="spring-boot-starter-data-mongodb" rev="2.0.5.RELEASE"/>
+    <dependency org="org.springframework.boot"
+                name="spring-boot-starter-data-mongodb" rev="2.0.5.RELEASE"/>
     <!-- JSON API Serialization -->
-    <dependency org="com.fasterxml.jackson.core" name="jackson-databind" rev="2.9.6"/>
+    <dependency org="com.fasterxml.jackson.core"
+                name="jackson-databind" rev="2.9.6"/>
     <!-- UI Resources -->
     <dependency org="org.webjars" name="jquery" rev="2.2.4" conf="war->default"/>
-    <dependency org="org.webjars" name="angularjs" rev="1.7.5" conf="war->default"/>
-    <dependency org="org.webjars" name="angular-ui-bootstrap" rev="2.5.0" conf="war->default"/>
-    <dependency org="org.webjars" name="webjars-locator" rev="0.34" conf="war->default"/>
+    <dependency org="org.webjars"
+                name="angularjs" rev="1.7.5" conf="war->default"/>
+    <dependency org="org.webjars"
+                name="angular-ui-bootstrap" rev="2.5.0" conf="war->default"/>
+    <dependency org="org.webjars"
+                name="webjars-locator" rev="0.34" conf="war->default"/>
     <dependency org="javax.servlet" name="jstl" rev="1.2" conf="war->default"/>
-    <dependency org="org.apache.taglibs" name="taglibs-standard-impl" rev="1.2.5" conf="war->default"/>
+    <dependency org="org.apache.taglibs"
+                name="taglibs-standard-impl" rev="1.2.5" conf="war->default"/>
     <!-- Tomcat Resources -->
-    <dependency org="javax.servlet" name="javax.servlet-api" rev="4.0.1" conf="provided->default"/>
+    <dependency org="javax.servlet"
+                name="javax.servlet-api" rev="4.0.1" conf="provided->default"/>
     <!-- Ant dependencies -->
-    <dependency org="org.apache.tomcat" name="catalina-ant" rev="6.0.53" conf="ant->default"/>
-    <dependency org="org.apache.ant" name="ant-junit" rev="1.10.5" conf="ant->default"/>
+    <dependency org="org.apache.tomcat"
+                name="catalina-ant" rev="6.0.53" conf="ant->default"/>
+    <dependency org="org.apache.ant"
+                name="ant-junit" rev="1.10.5" conf="ant->default"/>
     <!-- Test dependencies -->
     <dependency org="junit" name="junit" rev="4.11" conf="test->default"/>
-    <dependency org="org.springframework" name="spring-test" rev="5.0.9.RELEASE" conf="test->default"/>
+    <dependency org="org.springframework.boot" name="spring-boot-starter-test"
+                rev="2.1.0.RELEASE" conf="test->default"/>
+    <!--<dependency org="org.springframework" name="spring-test"
+        rev="5.0.9.RELEASE" conf="test->default"/>-->
   </dependencies>
 </ivy-module>

src/name/tflucke/ieat2/AppInitializer.java

@@ -2,9 +2,12 @@ package name.tflucke.ieat2;
 
 import javax.servlet.Filter;
 
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.PropertySource;
 import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+
+import org.apache.log4j.Logger;
 
 import name.tflucke.ieat2.configs.RootConfig;
 
@@ -16,9 +19,12 @@ import name.tflucke.ieat2.configs.RootConfig;
  * @author Thomas Flucke
  * @since 2.0.0
  */
-public class AppInitializer extends AbstractAnnotationConfigDispatcherServletInitializer {
+@SpringBootApplication
+@ConfigurationProperties
+public class AppInitializer
+    extends AbstractAnnotationConfigDispatcherServletInitializer {
 
-    private static final Log log = LogFactory.getLog(AppInitializer.class);
+    private static final Logger log = Logger.getLogger(AppInitializer.class);
 
     @Override
     protected Class<?>[] getRootConfigClasses() {

src/name/tflucke/ieat2/configs/WebConfig.java

@@ -74,5 +74,5 @@ public class WebConfig implements WebMvcConfigurer {
             .resourceChain(true)
             .addResolver(new WebJarsResourceResolver());
 
-    } 
+    }
 }

src/name/tflucke/ieat2/controllers/AbstractController.java

@@ -35,8 +35,7 @@ import name.tflucke.ieat2.errors.ResourceNotFoundException;
  */
 public abstract class AbstractController<T extends DBObject> {
 
-    private static final Log log = LogFactory.getLog(AbstractController.class);
-
+    protected final Log log = LogFactory.getLog(getClass());
     @Autowired
     protected Datastore db;
     private final Class<T> clazz;