Moved Setup components to a separate package.

rapidoid · Feb 22, 2016 · 810f950 · 810f950
1 parent 3d48199
commit 810f950
Show file tree

Hide file tree

Showing 43 changed files with 50 additions and 17 deletions.
diff --git a/examples/getting-started/src/main/java/com/example/Main.java b/examples/getting-started/src/main/java/com/example/Main.java
@@ -1,7 +1,7 @@
 package com.example;
 
 import org.rapidoid.http.Req;
-import org.rapidoid.http.On;
+import org.rapidoid.setup.On;
 
 public class Main {
 

diff --git a/...rg/rapidoid/http/AppRestartProcessor.java → ...g/rapidoid/setup/AppRestartProcessor.java b/...rg/rapidoid/http/AppRestartProcessor.java → ...g/rapidoid/setup/AppRestartProcessor.java
@@ -1,4 +1,4 @@
-package org.rapidoid.http;
+package org.rapidoid.setup;
 
 /*
  * #%L

diff --git a/...ava/org/rapidoid/http/LoginProcessor.java → ...va/org/rapidoid/setup/LoginProcessor.java b/...ava/org/rapidoid/http/LoginProcessor.java → ...va/org/rapidoid/setup/LoginProcessor.java
@@ -1,4 +1,4 @@
-package org.rapidoid.http;
+package org.rapidoid.setup;
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;

diff --git a/...r/src/main/java/org/rapidoid/http/On.java → .../src/main/java/org/rapidoid/setup/On.java b/...r/src/main/java/org/rapidoid/http/On.java → .../src/main/java/org/rapidoid/setup/On.java
@@ -1,4 +1,4 @@
-package org.rapidoid.http;
+package org.rapidoid.setup;
 
 /*
  * #%L
@@ -25,6 +25,7 @@
 import org.rapidoid.config.Conf;
 import org.rapidoid.config.RapidoidInitializer;
 import org.rapidoid.data.JSON;
+import org.rapidoid.http.*;
 import org.rapidoid.http.handler.FastHttpHandler;
 import org.rapidoid.http.processor.HttpProcessor;
 import org.rapidoid.ioc.IoC;

diff --git a/...main/java/org/rapidoid/http/OnAction.java → ...ain/java/org/rapidoid/setup/OnAction.java b/...main/java/org/rapidoid/http/OnAction.java → ...ain/java/org/rapidoid/setup/OnAction.java
@@ -1,4 +1,4 @@
-package org.rapidoid.http;
+package org.rapidoid.setup;
 
 /*
  * #%L
@@ -23,6 +23,8 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.commons.MediaType;
+import org.rapidoid.http.FastHttp;
+import org.rapidoid.http.HttpWrapper;
 import org.rapidoid.http.handler.HttpHandlers;
 import org.rapidoid.lambda.*;
 

diff --git a/...n/java/org/rapidoid/http/OnAnnotated.java → .../java/org/rapidoid/setup/OnAnnotated.java b/...n/java/org/rapidoid/http/OnAnnotated.java → .../java/org/rapidoid/setup/OnAnnotated.java
@@ -1,4 +1,4 @@
-package org.rapidoid.http;
+package org.rapidoid.setup;
 
 /*
  * #%L

diff --git a/...ain/java/org/rapidoid/http/OnChanges.java → ...in/java/org/rapidoid/setup/OnChanges.java b/...ain/java/org/rapidoid/http/OnChanges.java → ...in/java/org/rapidoid/setup/OnChanges.java
@@ -1,4 +1,4 @@
-package org.rapidoid.http;
+package org.rapidoid.setup;
 
 /*
  * #%L

diff --git a/...c/main/java/org/rapidoid/http/OnPage.java → .../main/java/org/rapidoid/setup/OnPage.java b/...c/main/java/org/rapidoid/http/OnPage.java → .../main/java/org/rapidoid/setup/OnPage.java
@@ -1,4 +1,4 @@
-package org.rapidoid.http;
+package org.rapidoid.setup;
 
 /*
  * #%L
@@ -23,6 +23,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.commons.MediaType;
+import org.rapidoid.http.*;
 import org.rapidoid.http.handler.FastParamsAwareHttpHandler;
 import org.rapidoid.http.handler.FastStaticHttpHandler;
 import org.rapidoid.http.handler.HttpHandlers;

diff --git a/.../org/rapidoid/http/PojoHandlersSetup.java → ...org/rapidoid/setup/PojoHandlersSetup.java b/.../org/rapidoid/http/PojoHandlersSetup.java → ...org/rapidoid/setup/PojoHandlersSetup.java
@@ -1,4 +1,4 @@
-package org.rapidoid.http;
+package org.rapidoid.setup;
 
 /*
  * #%L

diff --git a/...java/org/rapidoid/http/RolesProvider.java → ...ava/org/rapidoid/setup/RolesProvider.java b/...java/org/rapidoid/http/RolesProvider.java → ...ava/org/rapidoid/setup/RolesProvider.java
@@ -1,4 +1,4 @@
-package org.rapidoid.http;
+package org.rapidoid.setup;
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;

diff --git a/...va/org/rapidoid/http/ServerSetupType.java → ...a/org/rapidoid/setup/ServerSetupType.java b/...va/org/rapidoid/http/ServerSetupType.java → ...a/org/rapidoid/setup/ServerSetupType.java
@@ -1,4 +1,4 @@
-package org.rapidoid.http;
+package org.rapidoid.setup;
 
 /*
  * #%L

diff --git a/...rc/main/java/org/rapidoid/http/Setup.java → ...c/main/java/org/rapidoid/setup/Setup.java b/...rc/main/java/org/rapidoid/http/Setup.java → ...c/main/java/org/rapidoid/setup/Setup.java
@@ -1,11 +1,12 @@
-package org.rapidoid.http;
+package org.rapidoid.setup;
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Controller;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.cls.Cls;
 import org.rapidoid.commons.MediaType;
 import org.rapidoid.config.Conf;
+import org.rapidoid.http.*;
 import org.rapidoid.http.handler.FastHttpErrorHandler;
 import org.rapidoid.http.handler.FastHttpHandler;
 import org.rapidoid.http.handler.optimized.DelegatingFastParamsAwareReqHandler;

diff --git a/...va/org/rapidoid/http/WatchForChanges.java → ...a/org/rapidoid/setup/WatchForChanges.java b/...va/org/rapidoid/http/WatchForChanges.java → ...a/org/rapidoid/setup/WatchForChanges.java
@@ -1,4 +1,4 @@
-package org.rapidoid.http;
+package org.rapidoid.setup;
 
 /*
  * #%L

diff --git a/rapidoid-integration-tests/src/test/java/demo/rapidoid/reload/ReloadDemo.java b/rapidoid-integration-tests/src/test/java/demo/rapidoid/reload/ReloadDemo.java
@@ -21,7 +21,7 @@
  */
 
 import org.rapidoid.http.Req;
-import org.rapidoid.http.On;
+import org.rapidoid.setup.On;
 
 /**
  * Demo for class reloading. Try changing the classes

diff --git a/rapidoid-integration-tests/src/test/java/org/rapidoid/http/AsyncHttpServerTest.java b/rapidoid-integration-tests/src/test/java/org/rapidoid/http/AsyncHttpServerTest.java
@@ -25,6 +25,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.job.Jobs;
 import org.rapidoid.log.Log;
+import org.rapidoid.setup.On;
 import org.rapidoid.u.U;
 
 import java.io.IOException;

diff --git a/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpAdminAndDevServerTest.java b/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpAdminAndDevServerTest.java
@@ -24,6 +24,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.config.Conf;
+import org.rapidoid.setup.On;
 import org.rapidoid.util.UTILS;
 
 import java.net.ConnectException;

diff --git a/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpBeanParamsTest.java b/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpBeanParamsTest.java
@@ -24,6 +24,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.GET;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.setup.On;
 import org.rapidoid.u.U;
 
 import java.util.List;

diff --git a/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpCookiepackTest.java b/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpCookiepackTest.java
@@ -24,6 +24,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.log.Log;
+import org.rapidoid.setup.On;
 
 @Authors("Nikolche Mihajlovski")
 @Since("5.0.10")

diff --git a/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpErrorHandlerTest.java b/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpErrorHandlerTest.java
@@ -23,6 +23,7 @@
 import org.junit.Test;
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.setup.On;
 
 @Authors("Nikolche Mihajlovski")
 @Since("5.0.11")

diff --git a/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpErrorTest.java b/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpErrorTest.java
@@ -23,6 +23,7 @@
 import org.junit.Test;
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.setup.On;
 
 @Authors("Nikolche Mihajlovski")
 @Since("5.0.10")

diff --git a/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpFullRawResponseTest.java b/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpFullRawResponseTest.java
@@ -23,6 +23,7 @@
 import org.junit.Test;
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.setup.On;
 import org.rapidoid.util.Bufs;
 
 @Authors("Nikolche Mihajlovski")

diff --git a/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpHtmlApiTest.java b/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpHtmlApiTest.java
@@ -25,6 +25,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.commons.MediaType;
 import org.rapidoid.io.Res;
+import org.rapidoid.setup.On;
 import org.rapidoid.u.U;
 import org.rapidoid.util.Bufs;
 

diff --git a/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpMultiControllerTest.java b/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpMultiControllerTest.java
@@ -24,6 +24,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.GET;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.setup.On;
 
 @Authors("Nikolche Mihajlovski")
 @Since("5.0.11")

diff --git a/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpPathMatchingTest.java b/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpPathMatchingTest.java
@@ -23,6 +23,7 @@
 import org.junit.Test;
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.setup.On;
 
 @Authors("Nikolche Mihajlovski")
 @Since("5.1.0")

diff --git a/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpPojoApiTest.java b/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpPojoApiTest.java
@@ -22,6 +22,7 @@
 
 import org.junit.Test;
 import org.rapidoid.annotation.*;
+import org.rapidoid.setup.On;
 import org.rapidoid.u.U;
 
 import java.util.Date;

diff --git a/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpPojoControllerTest.java b/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpPojoControllerTest.java
@@ -25,6 +25,7 @@
 import org.rapidoid.annotation.GET;
 import org.rapidoid.annotation.POST;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.setup.On;
 import org.rapidoid.u.U;
 import org.rapidoid.ioc.IoC;
 

diff --git a/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpRawBodyTest.java b/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpRawBodyTest.java
@@ -23,6 +23,7 @@
 import org.junit.Test;
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.setup.On;
 import org.rapidoid.util.Bufs;
 
 @Authors("Nikolche Mihajlovski")

diff --git a/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpRedirectTest.java b/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpRedirectTest.java
@@ -23,6 +23,7 @@
 import org.junit.Test;
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.setup.On;
 
 @Authors("Nikolche Mihajlovski")
 @Since("5.0.10")

diff --git a/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpRenderTest.java b/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpRenderTest.java
@@ -26,6 +26,7 @@
 import org.junit.Test;
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.setup.On;
 
 import java.io.PrintWriter;
 

diff --git a/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpReregistrationTest.java b/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpReregistrationTest.java
@@ -25,6 +25,7 @@
 import org.rapidoid.annotation.GET;
 import org.rapidoid.annotation.POST;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.setup.On;
 
 @Authors("Nikolche Mihajlovski")
 @Since("5.1.0")

diff --git a/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpRootPojoControllerTest.java b/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpRootPojoControllerTest.java
@@ -22,6 +22,7 @@
 
 import org.junit.Test;
 import org.rapidoid.annotation.*;
+import org.rapidoid.setup.On;
 import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")

diff --git a/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpServerHeadersTest.java b/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpServerHeadersTest.java
@@ -26,6 +26,7 @@
 import org.rapidoid.commons.Rnd;
 import org.rapidoid.io.IO;
 import org.rapidoid.job.Jobs;
+import org.rapidoid.setup.On;
 
 import java.io.IOException;
 import java.net.URISyntaxException;

diff --git a/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpServerRestartTest.java b/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpServerRestartTest.java
@@ -23,6 +23,7 @@
 import org.junit.Test;
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.setup.On;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")

diff --git a/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpServerTest.java b/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpServerTest.java
@@ -23,6 +23,7 @@
 import org.junit.Test;
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.setup.On;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.1.0")

diff --git a/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpSessionTest.java b/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpSessionTest.java
@@ -24,6 +24,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.log.Log;
+import org.rapidoid.setup.On;
 
 @Authors("Nikolche Mihajlovski")
 @Since("5.0.10")

diff --git a/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpStaticFilesTest.java b/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpStaticFilesTest.java
@@ -23,6 +23,7 @@
 import org.junit.Test;
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.setup.On;
 
 @Authors("Nikolche Mihajlovski")
 @Since("5.0.11")

diff --git a/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpTestCommons.java b/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpTestCommons.java
@@ -32,6 +32,8 @@
 import org.rapidoid.log.Log;
 import org.rapidoid.log.LogLevel;
 import org.rapidoid.scan.ClasspathUtil;
+import org.rapidoid.setup.On;
+import org.rapidoid.setup.Setup;
 import org.rapidoid.test.TestCommons;
 import org.rapidoid.u.U;
 

diff --git a/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpVerbsTest.java b/rapidoid-integration-tests/src/test/java/org/rapidoid/http/HttpVerbsTest.java
@@ -23,6 +23,7 @@
 import org.junit.Test;
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.setup.On;
 
 @Authors("Nikolche Mihajlovski")
 @Since("5.0.5")

diff --git a/rapidoid-integration-tests/src/test/java/org/rapidoid/http/MicroServicesTest.java b/rapidoid-integration-tests/src/test/java/org/rapidoid/http/MicroServicesTest.java
@@ -25,6 +25,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.concurrent.Callback;
+import org.rapidoid.setup.On;
 import org.rapidoid.u.U;
 import org.rapidoid.util.UTILS;
 

diff --git a/rapidoid-integration-tests/src/test/java/org/rapidoid/http/OnSetupTest.java b/rapidoid-integration-tests/src/test/java/org/rapidoid/http/OnSetupTest.java
@@ -5,6 +5,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.data.JSON;
 import org.rapidoid.data.YAML;
+import org.rapidoid.setup.On;
 import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")

diff --git a/rapidoid-integration-tests/src/test/java/org/rapidoid/rest/DynamicClientTest.java b/rapidoid-integration-tests/src/test/java/org/rapidoid/rest/DynamicClientTest.java
@@ -7,6 +7,7 @@
 import org.rapidoid.concurrent.Promises;
 import org.rapidoid.http.*;
 import org.rapidoid.job.Jobs;
+import org.rapidoid.setup.On;
 import org.rapidoid.u.U;
 
 import java.util.concurrent.TimeUnit;

diff --git a/rapidoid-oauth/src/main/java/org/rapidoid/oauth/OAuth.java b/rapidoid-oauth/src/main/java/org/rapidoid/oauth/OAuth.java
@@ -32,7 +32,7 @@
 import org.rapidoid.http.ReqHandler;
 import org.rapidoid.log.Log;
 import org.rapidoid.u.U;
-import org.rapidoid.http.Setup;
+import org.rapidoid.setup.Setup;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")

diff --git a/rapidoid-oauth/src/test/java/org/rapidoid/oauth/OAuthDemo.java b/rapidoid-oauth/src/test/java/org/rapidoid/oauth/OAuthDemo.java
@@ -23,8 +23,8 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.config.Config;
-import org.rapidoid.http.On;
-import org.rapidoid.http.Setup;
+import org.rapidoid.setup.On;
+import org.rapidoid.setup.Setup;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")