Refactored the context management and redesigned multi-web-app compon…

…ents.
rapidoid · Jul 23, 2015 · 0e943e4 · 0e943e4
1 parent 97b1153
commit 0e943e4
Show file tree

Hide file tree

Showing 54 changed files with 463 additions and 360 deletions.
diff --git a/pom.xml b/pom.xml
@@ -106,7 +106,6 @@
 		<module>rapidoid-test-appctx-helper</module>
 		<module>rapidoid-buffer</module>
 		<module>rapidoid-net</module>
-		<module>rapidoid-appctx</module>
 		<module>rapidoid-http-api</module>
 		<module>rapidoid-http</module>
 		<module>rapidoid-measure</module>

diff --git a/rapidoid-app/src/main/java/org/rapidoid/app/Apps.java b/rapidoid-app/src/main/java/org/rapidoid/app/Apps.java
@@ -31,7 +31,8 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.annotation.Transaction;
 import org.rapidoid.aop.AOP;
-import org.rapidoid.apps.Scan;
+import org.rapidoid.appctx.Application;
+import org.rapidoid.appctx.Scan;
 import org.rapidoid.beany.Beany;
 import org.rapidoid.cls.Cls;
 import org.rapidoid.config.Conf;
@@ -60,20 +61,12 @@ public class Apps {
 
 	private static AppClasses APP_CLASSES;
 
-	public static void main(String[] args) {
-		run((Object[]) args);
+	public static void run(Application app, Object... args) {
+		bootstrap(app, args);
+		serve(app, args);
 	}
 
-	public static void run(String[] args) {
-		run((Object[]) args);
-	}
-
-	public static void run(Object... args) {
-		bootstrap(args);
-		serve(args);
-	}
-
-	public static void bootstrap(Object... args) {
+	public static void bootstrap(Application app, Object... args) {
 		Set<String> config = U.set();
 
 		for (Object arg : args) {
@@ -89,13 +82,13 @@ public static void bootstrap(Object... args) {
 		Lifecycle.onStart(args);
 	}
 
-	public static HTTPServer serve(Object... args) {
+	public static HTTPServer serve(Application app, Object... args) {
 		HTTPServer server = HTTP.server().build();
 
-		OAuth.register(server);
-		HttpBuiltins.register(server);
+		OAuth.register(app);
+		HttpBuiltins.register(app);
 
-		server.serve(new AppHandler());
+		app.getRouter().serve(new AppHandler());
 
 		return server.start();
 	}

diff --git a/rapidoid-app/src/main/java/org/rapidoid/app/UsersTool.java b/rapidoid-app/src/main/java/org/rapidoid/app/UsersTool.java
@@ -22,7 +22,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.apps.AppCtx;
+import org.rapidoid.appctx.AppCtx;
 import org.rapidoid.ctx.UserInfo;
 import org.rapidoid.plugins.users.Users;
 

diff --git a/rapidoid-app/src/main/java/org/rapidoid/app/builtin/AppPageGeneric.java b/rapidoid-app/src/main/java/org/rapidoid/app/builtin/AppPageGeneric.java
@@ -36,8 +36,8 @@
 import org.rapidoid.app.AppScreens;
 import org.rapidoid.app.Apps;
 import org.rapidoid.app.Scaffolding;
-import org.rapidoid.apps.AppCtx;
-import org.rapidoid.apps.Scan;
+import org.rapidoid.appctx.AppCtx;
+import org.rapidoid.appctx.Scan;
 import org.rapidoid.beany.Beany;
 import org.rapidoid.cls.Cls;
 import org.rapidoid.config.Conf;

diff --git a/rapidoid-app/src/main/java/org/rapidoid/app/builtin/DebugUserInfoScreenBuiltIn.java b/rapidoid-app/src/main/java/org/rapidoid/app/builtin/DebugUserInfoScreenBuiltIn.java
@@ -23,7 +23,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.app.GUI;
-import org.rapidoid.apps.AppCtx;
+import org.rapidoid.appctx.AppCtx;
 import org.rapidoid.html.Tag;
 import org.rapidoid.security.Secure;
 import org.rapidoid.security.annotation.DevMode;

diff --git a/rapidoid-app/src/main/java/org/rapidoid/app/builtin/ListEntityScreenGeneric.java b/rapidoid-app/src/main/java/org/rapidoid/app/builtin/ListEntityScreenGeneric.java
@@ -23,7 +23,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Session;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.apps.AppCtx;
+import org.rapidoid.appctx.AppCtx;
 import org.rapidoid.cls.Cls;
 import org.rapidoid.html.Tag;
 import org.rapidoid.plugins.entities.Entities;

diff --git a/rapidoid-app/src/main/java/org/rapidoid/app/builtin/ViewEntityScreenGeneric.java b/rapidoid-app/src/main/java/org/rapidoid/app/builtin/ViewEntityScreenGeneric.java
@@ -22,7 +22,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.apps.AppCtx;
+import org.rapidoid.appctx.AppCtx;
 import org.rapidoid.cls.Cls;
 import org.rapidoid.html.Tag;
 import org.rapidoid.plugins.db.DB;

diff --git a/rapidoid-appctx/pom.xml b/rapidoid-appctx/pom.xml
diff --git a/rapidoid-demo/src/main/java/org/rapidoid/demo/http/HttpDemo.java b/rapidoid-demo/src/main/java/org/rapidoid/demo/http/HttpDemo.java
@@ -24,6 +24,8 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.appctx.Application;
+import org.rapidoid.appctx.Applications;
 import org.rapidoid.config.Conf;
 import org.rapidoid.http.HTTP;
 import org.rapidoid.http.HTTPServer;
@@ -36,12 +38,13 @@ public class HttpDemo {
 
 	public static void main(String[] args) {
 		Conf.args(args);
+		Application app = Applications.openRootContext();
 
 		final AtomicLong n = new AtomicLong();
 
 		HTTPServer server = HTTP.server().build();
 
-		server.get("/hi", new Handler() {
+		app.getRouter().get("/hi", new Handler() {
 			@Override
 			public Object handle(HttpExchange x) {
 				return "[" + n.incrementAndGet() + "] Hi: " + x.uri();

diff --git a/rapidoid-docs/src/main/java/org/rapidoid/docs/Examples.java b/rapidoid-docs/src/main/java/org/rapidoid/docs/Examples.java
@@ -31,9 +31,11 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.app.AppHandler;
 import org.rapidoid.app.Apps;
-import org.rapidoid.apps.AppMode;
-import org.rapidoid.apps.Application;
-import org.rapidoid.apps.Scan;
+import org.rapidoid.appctx.AppMode;
+import org.rapidoid.appctx.Application;
+import org.rapidoid.appctx.Applications;
+import org.rapidoid.appctx.Scan;
+import org.rapidoid.appctx.WebApp;
 import org.rapidoid.cls.Cls;
 import org.rapidoid.config.Conf;
 import org.rapidoid.ctx.Classes;
@@ -65,10 +67,12 @@ public static void main(String[] args) {
 		String path = "../../rapidoid.github.io/";
 		U.must(new File(path).exists());
 
+		Application app = Applications.openRootContext();
+
 		HTTPServer server = HTTP.server().build();
-		OAuth.register(server);
-		HttpBuiltins.register(server);
-		server.serve(new AppHandler());
+		OAuth.register(app);
+		HttpBuiltins.register(app);
+		app.getRouter().serve(new AppHandler());
 		server.start();
 
 		// FIXME For each example a server is created internally, trying to bind
@@ -184,7 +188,7 @@ private static String cleanSnippet(String s) {
 	public static void generate(HTTPServer server, String path, String id, List<Class<?>> classes) {
 
 		Classes appClasses = Classes.from(classes);
-		Application app = new Application(id, "app", null, null, U.set("/"), AppMode.DEVELOPMENT, appClasses);
+		Application app = new WebApp(id, "app", null, null, U.set("/"), AppMode.DEVELOPMENT, null, appClasses);
 		Ctxs.ctx().setApp(app);
 
 		Class<?> appCls = appClasses.get("Main");

diff --git a/rapidoid-html/pom.xml b/rapidoid-html/pom.xml
@@ -32,12 +32,6 @@
 			<artifactId>commons-lang3</artifactId>
 			<version>3.3.2</version>
 		</dependency>
-		<dependency>
-			<groupId>org.rapidoid</groupId>
-			<artifactId>rapidoid-test-appctx-helper</artifactId>
-			<version>${project.version}</version>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 
 </project>
diff --git a/rapidoid-http/pom.xml b/rapidoid-http/pom.xml
@@ -29,12 +29,17 @@
 		</dependency>
 		<dependency>
 			<groupId>org.rapidoid</groupId>
-			<artifactId>rapidoid-appctx</artifactId>
+			<artifactId>rapidoid-security</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.rapidoid</groupId>
-			<artifactId>rapidoid-test-appctx-helper</artifactId>
+			<artifactId>rapidoid-plugins</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.rapidoid</groupId>
+			<artifactId>rapidoid-test-commons</artifactId>
 			<version>${project.version}</version>
 			<scope>test</scope>
 		</dependency>

diff --git a/...doid/apps/AppClasspathEntitiesPlugin.java → ...id/appctx/AppClasspathEntitiesPlugin.java b/...doid/apps/AppClasspathEntitiesPlugin.java → ...id/appctx/AppClasspathEntitiesPlugin.java
@@ -1,4 +1,4 @@
-package org.rapidoid.apps;
+package org.rapidoid.appctx;
 
 import java.lang.reflect.Proxy;
 import java.util.Map;
@@ -15,7 +15,7 @@
 
 /*
  * #%L
- * rapidoid-appctx
+ * rapidoid-http
  * %%
  * Copyright (C) 2014 - 2015 Nikolche Mihajlovski and contributors
  * %%

diff --git a/...c/main/java/org/rapidoid/apps/AppCtx.java → ...main/java/org/rapidoid/appctx/AppCtx.java b/...c/main/java/org/rapidoid/apps/AppCtx.java → ...main/java/org/rapidoid/appctx/AppCtx.java
@@ -1,4 +1,4 @@
-package org.rapidoid.apps;
+package org.rapidoid.appctx;
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
@@ -8,7 +8,7 @@
 
 /*
  * #%L
- * rapidoid-appctx
+ * rapidoid-http
  * %%
  * Copyright (C) 2014 - 2015 Nikolche Mihajlovski and contributors
  * %%

diff --git a/.../main/java/org/rapidoid/apps/AppMode.java → ...ain/java/org/rapidoid/appctx/AppMode.java b/.../main/java/org/rapidoid/apps/AppMode.java → ...ain/java/org/rapidoid/appctx/AppMode.java
@@ -1,11 +1,11 @@
-package org.rapidoid.apps;
+package org.rapidoid.appctx;
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 
 /*
  * #%L
- * rapidoid-appctx
+ * rapidoid-http
  * %%
  * Copyright (C) 2014 - 2015 Nikolche Mihajlovski and contributors
  * %%

diff --git a/rapidoid-http/src/main/java/org/rapidoid/appctx/Application.java b/rapidoid-http/src/main/java/org/rapidoid/appctx/Application.java
@@ -0,0 +1,52 @@
+package org.rapidoid.appctx;
+
+/*
+ * #%L
+ * rapidoid-http
+ * %%
+ * Copyright (C) 2014 - 2015 Nikolche Mihajlovski and contributors
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+import java.util.Set;
+
+import org.rapidoid.annotation.Authors;
+import org.rapidoid.annotation.Since;
+import org.rapidoid.ctx.Classes;
+import org.rapidoid.http.Router;
+
+@Authors("Nikolche Mihajlovski")
+@Since("4.1.0")
+public interface Application {
+
+	String getId();
+
+	String getTitle();
+
+	Set<String> getOwners();
+
+	Set<String> getHostnames();
+
+	Set<String> getUriContexts();
+
+	AppMode getMode();
+
+	Router getRouter();
+
+	Classes getClasses();
+
+	boolean dev();
+
+}
diff --git a/.../java/org/rapidoid/apps/Applications.java → ...ava/org/rapidoid/appctx/Applications.java b/.../java/org/rapidoid/apps/Applications.java → ...ava/org/rapidoid/appctx/Applications.java
@@ -1,14 +1,16 @@
-package org.rapidoid.apps;
+package org.rapidoid.appctx;
 
 import java.util.Map;
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.ctx.Ctxs;
+import org.rapidoid.plugins.Plugins;
 import org.rapidoid.util.U;
 
 /*
  * #%L
- * rapidoid-appctx
+ * rapidoid-http
  * %%
  * Copyright (C) 2014 - 2015 Nikolche Mihajlovski and contributors
  * %%
@@ -71,4 +73,16 @@ public static RootApplication root() {
 		return new RootApplication();
 	}
 
+	public static Application openRootContext() {
+		Application app = Applications.root();
+		Applications.main().setDefaultApp(app);
+
+		Ctxs.open();
+		Ctxs.ctx().setApp(app);
+
+		Plugins.register(new AppClasspathEntitiesPlugin());
+
+		return app;
+	}
+
 }