Merge branch 'master' into bael-16656

java-lite/src/main/java/app/config/AppBootstrap.java

@@ -0,0 +1,17 @@
+package app.config;
+
+import org.javalite.activeweb.AppContext;
+import org.javalite.activeweb.Bootstrap;
+
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+
+import app.services.ArticleServiceModule;
+
+public class AppBootstrap extends Bootstrap {
+    public void init(AppContext context) {
+    }
+    public Injector getInjector() {
+        return Guice.createInjector(new ArticleServiceModule());
+    }
+}

java-lite/src/main/java/app/config/AppControllerConfig.java

@@ -0,0 +1,15 @@
+package app.config;
+
+import app.controllers.ProductsController;
+import org.javalite.activeweb.AbstractControllerConfig;
+import org.javalite.activeweb.AppContext;
+import org.javalite.activeweb.controller_filters.DBConnectionFilter;
+import org.javalite.activeweb.controller_filters.TimingFilter;
+
+public class AppControllerConfig extends AbstractControllerConfig {
+    @Override
+    public void init(AppContext appContext) {
+        addGlobalFilters(new TimingFilter());
+        add(new DBConnectionFilter()).to(ProductsController.class);
+    }
+}

java-lite/src/main/java/app/config/DbConfig.java

@@ -0,0 +1,11 @@
+package app.config;
+
+import org.javalite.activeweb.AbstractDBConfig;
+import org.javalite.activeweb.AppContext;
+
+public class DbConfig extends AbstractDBConfig {
+    @Override
+    public void init(AppContext appContext) {
+        this.configFile("/database.properties");
+    }
+}