You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2014/10/04 14:31:44 UTC
[09/12] git commit: ISIS-913: further stuff pertaining to removing
the EmbeddedWebServer API.
ISIS-913: further stuff pertaining to removing the EmbeddedWebServer API.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/73bbad63
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/73bbad63
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/73bbad63
Branch: refs/heads/master
Commit: 73bbad63e238bc5fd3f7905cb97c7402777c48fc
Parents: c769dac
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat Oct 4 09:39:29 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat Oct 4 09:39:29 2014 +0100
----------------------------------------------------------------------
.../core/runtime/system/SystemConstants.java | 44 --------------------
.../core/webserver/WebServerBootstrapper.java | 16 ++-----
.../isis/core/webserver/WebServerConstants.java | 3 +-
3 files changed, 5 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/73bbad63/core/runtime/src/main/java/org/apache/isis/core/runtime/system/SystemConstants.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/SystemConstants.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/SystemConstants.java
index f4f0ca4..49803aa 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/SystemConstants.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/SystemConstants.java
@@ -28,15 +28,11 @@ import org.apache.isis.core.runtime.authentication.AuthenticationManagerInstalle
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
import org.apache.isis.core.runtime.authorization.AuthorizationManagerInstaller;
import org.apache.isis.core.runtime.fixtures.FixturesInstaller;
-import org.apache.isis.core.runtime.imageloader.TemplateImageLoaderInstaller;
-import org.apache.isis.core.runtime.installerregistry.installerapi.EmbeddedWebServerInstaller;
-import org.apache.isis.core.runtime.installerregistry.installerapi.IsisViewerInstaller;
import org.apache.isis.core.runtime.installerregistry.installerapi.PersistenceMechanismInstaller;
import org.apache.isis.core.runtime.services.ServicesInstaller;
import org.apache.isis.core.runtime.system.persistence.PersistenceSessionFactory;
import org.apache.isis.core.runtime.userprofile.UserProfileStore;
import org.apache.isis.core.runtime.userprofile.UserProfileStoreInstaller;
-import org.apache.isis.core.runtime.viewer.IsisViewer;
public final class SystemConstants {
@@ -61,16 +57,6 @@ public final class SystemConstants {
*/
public static final String REFLECTOR_DEFAULT = "java";
- /**
- * Key used to lookup {@link IsisViewer viewer} in {@link IsisConfiguration}
- * , and root for any {@link IsisViewerInstaller viewer}-specific
- * configuration keys.
- */
- public final static String VIEWER_KEY = ConfigurationConstants.ROOT + IsisViewerInstaller.TYPE;
- /**
- * Default for {@link #VIEWER_KEY}.
- */
- public static final String VIEWER_DEFAULT = "restfulobjects";
/**
* Key used to lookup {@link PersistenceSessionFactory persistor} in
@@ -158,35 +144,6 @@ public final class SystemConstants {
public static final String FIXTURES_INSTALLER_DEFAULT = "configuration";
/**
- * Key used to lookup {@link TemplateImageLoaderInstaller template image
- * loader} in {@link IsisConfiguration}, and root for any
- * {@link TemplateImageLoaderInstaller template image loader}-specific
- * configuration keys.
- */
- public static final String IMAGE_LOADER_KEY = ConfigurationConstants.ROOT + TemplateImageLoaderInstaller.TYPE;
- /**
- * Default for {@link #IMAGE_LOADER_KEY} and not running on Google App Engine.
- */
- public static final String IMAGE_LOADER_DEFAULT = "awt";
- /**
- * Default if running on Google App Engine, see {@link org.apache.isis.core.runtime.installerregistry.InstallerLookup#templateImageLoaderInstaller(String)}
- */
- public static final String IMAGE_LOADER_NOOP = "noop";
-
-
- /**
- * Key used to lookup {@link EmbeddedWebServerInstaller embedded web
- * installer} in {@link IsisConfiguration}, and root for any
- * {@link EmbeddedWebServerInstaller embedded web server installer}-specific
- * configuration keys.
- */
- public static final String WEBSERVER_KEY = ConfigurationConstants.ROOT + EmbeddedWebServerInstaller.TYPE;
- /**
- * Default for {@link #WEBSERVER_KEY}
- */
- public static final String WEBSERVER_DEFAULT = "jetty";
-
- /**
* Key by which requested fixture (eg via command line) is made available in
* {@link IsisConfiguration}.
*/
@@ -212,7 +169,6 @@ public final class SystemConstants {
* Use {@link Splash#valueOf(String)} to decode.
*/
public static final String NOSPLASH_KEY = ConfigurationConstants.ROOT + "nosplash";
- public static final boolean NOSPLASH_DEFAULT = false;
public static final String LOCALE_KEY = ConfigurationConstants.ROOT + "locale";
http://git-wip-us.apache.org/repos/asf/isis/blob/73bbad63/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerBootstrapper.java
----------------------------------------------------------------------
diff --git a/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerBootstrapper.java b/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerBootstrapper.java
index 0d85e62..4f1f466 100644
--- a/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerBootstrapper.java
+++ b/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerBootstrapper.java
@@ -19,25 +19,15 @@
package org.apache.isis.core.webserver;
-import static org.apache.isis.core.webserver.WebServerConstants.EMBEDDED_WEB_SERVER_PORT_DEFAULT;
-import static org.apache.isis.core.webserver.WebServerConstants.EMBEDDED_WEB_SERVER_PORT_KEY;
-import static org.apache.isis.core.webserver.WebServerConstants.EMBEDDED_WEB_SERVER_RESOURCE_BASE_DEFAULT;
-import static org.apache.isis.core.webserver.WebServerConstants.EMBEDDED_WEB_SERVER_RESOURCE_BASE_KEY;
-import static org.apache.isis.core.webserver.WebServerConstants.EMBEDDED_WEB_SERVER_STARTUP_MODE_DEFAULT;
-import static org.apache.isis.core.webserver.WebServerConstants.EMBEDDED_WEB_SERVER_STARTUP_MODE_KEY;
-
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import com.google.inject.Injector;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.mortbay.jetty.Connector;
import org.mortbay.jetty.Server;
import org.mortbay.jetty.webapp.WebAppContext;
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
import org.apache.isis.core.commons.config.IsisConfigurationBuilderPrimer;
@@ -48,6 +38,8 @@ import org.apache.isis.core.runtime.runner.IsisRunner;
import org.apache.isis.core.webapp.WebAppConstants;
import org.apache.isis.core.webserver.WebServer.StartupMode;
+import static org.apache.isis.core.webserver.WebServerConstants.*;
+
final class WebServerBootstrapper implements IsisBootstrapper {
private static final Logger LOG = LoggerFactory.getLogger(WebServerBootstrapper.class);
http://git-wip-us.apache.org/repos/asf/isis/blob/73bbad63/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerConstants.java
----------------------------------------------------------------------
diff --git a/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerConstants.java b/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerConstants.java
index 9e4a899..42439ec 100644
--- a/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerConstants.java
+++ b/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerConstants.java
@@ -20,12 +20,11 @@
package org.apache.isis.core.webserver;
import org.apache.isis.core.commons.config.ConfigurationConstants;
-import org.apache.isis.core.runtime.installerregistry.installerapi.EmbeddedWebServerInstaller;
import org.apache.isis.core.webserver.WebServer.StartupMode;
public final class WebServerConstants {
- private static final String ROOT = ConfigurationConstants.ROOT + EmbeddedWebServerInstaller.TYPE + ".";
+ private static final String ROOT = ConfigurationConstants.ROOT + "embedded-web-server" + ".";
public static final String EMBEDDED_WEB_SERVER_PORT_KEY = ROOT + "port";
public static final int EMBEDDED_WEB_SERVER_PORT_DEFAULT = 8080;