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 2015/08/14 13:25:57 UTC
[3/4] isis git commit: ISIS-848: a couple of additional fixes from
the tidy-up of defunct cmd lines of WebServer.
ISIS-848: a couple of additional fixes from the tidy-up of defunct cmd lines of WebServer.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8f461506
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8f461506
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8f461506
Branch: refs/heads/master
Commit: 8f4615067cb51dac3695d3f4ec28273dff4414ec
Parents: c2e7852
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Aug 14 12:24:20 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Aug 14 12:24:20 2015 +0100
----------------------------------------------------------------------
.../core/runtime/system/SystemConstants.java | 32 +++++++++++++++++++-
.../apache/isis/core/webserver/WebServer.java | 15 ++-------
2 files changed, 33 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/8f461506/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 b64b746..83e209e 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
@@ -41,18 +41,25 @@ public final class SystemConstants {
* <p>
* Use {@link DeploymentType#lookup(String)} to decode.
*/
-
public static final String DEPLOYMENT_TYPE_KEY = ConfigurationConstants.ROOT + "deploymentType";
+
+
/**
* Key used to lookup {@link SpecificationLoaderSpi specification Loader} in
* {@link IsisConfiguration}, and root for any
* {@link ObjectReflectorInstaller reflector}-specific configuration keys.
+ *
+ * @deprecated
*/
+ @Deprecated
public final static String REFLECTOR_KEY = ConfigurationConstants.ROOT + ObjectReflectorInstaller.TYPE;
/**
* Default for {@link #REFLECTOR_KEY}
+ *
+ * @deprecated
*/
+ @Deprecated
public static final String REFLECTOR_DEFAULT = "java";
@@ -61,10 +68,24 @@ public final class SystemConstants {
* {@link IsisConfiguration}, and root for any
* {@link PersistenceMechanismInstaller persistor}-specific configuration
* keys.
+ *
+ * @deprecated
*/
+ @Deprecated
public final static String OBJECT_PERSISTOR_INSTALLER_KEY = ConfigurationConstants.ROOT + PersistenceMechanismInstaller.TYPE;
+ /**
+ *
+ * @deprecated
+ */
+ @Deprecated
public static final String OBJECT_PERSISTOR_KEY = OBJECT_PERSISTOR_INSTALLER_KEY;
+
+ /**
+ *
+ * @deprecated
+ */
+ @Deprecated
public static final String OBJECT_PERSISTOR_DEFAULT = "datanucleus";
@@ -128,13 +149,19 @@ public final class SystemConstants {
/**
* Key by which requested user (eg via command line) is made available in
* {@link IsisConfiguration} .
+ *
+ * @deprecated
*/
+ @Deprecated
public final static String USER_KEY = ConfigurationConstants.ROOT + "user";
/**
* Key by which requested password (eg via command line) is made available
* in {@link IsisConfiguration}.
+ *
+ * @deprecated
*/
+ @Deprecated
public final static String PASSWORD_KEY = ConfigurationConstants.ROOT + "password";
/**
@@ -143,7 +170,10 @@ public final class SystemConstants {
*
* <p>
* Use {@link Splash#valueOf(String)} to decode.
+ *
+ * @deprecated
*/
+ @Deprecated
public static final String NOSPLASH_KEY = ConfigurationConstants.ROOT + "nosplash";
public static final String LOCALE_KEY = ConfigurationConstants.ROOT + "locale";
http://git-wip-us.apache.org/repos/asf/isis/blob/8f461506/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServer.java
----------------------------------------------------------------------
diff --git a/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServer.java b/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServer.java
index d2e3482..5fd37a0 100644
--- a/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServer.java
+++ b/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServer.java
@@ -31,11 +31,9 @@ import org.eclipse.jetty.webapp.WebAppContext;
import org.apache.isis.core.commons.config.IsisConfigurationBuilderDefault;
import org.apache.isis.core.commons.lang.ArrayExtensions;
-import org.apache.isis.core.runtime.runner.Constants;
import org.apache.isis.core.runtime.runner.IsisRunner;
import org.apache.isis.core.webserver.internal.OptionHandlerDeploymentTypeWebServer;
import org.apache.isis.core.webserver.internal.OptionHandlerPort;
-import org.apache.isis.core.webserver.internal.OptionHandlerStartupMode;
public class WebServer {
@@ -68,7 +66,8 @@ public class WebServer {
public static void main(final String[] args) {
// System.out.println("press any key to start...");
// readLine();
- new WebServer().run(ArrayExtensions.append(args, "--" + Constants.NO_SPLASH_LONG_OPT));
+// final String[] args2 = ArrayExtensions.append(args, "--" + Constants.NO_SPLASH_LONG_OPT);
+ new WebServer().run(args);
}
private static void readLine() {
@@ -83,16 +82,6 @@ public class WebServer {
}
}
- /**
- * Originally introduced to allow the WebServer to be used by tests.
- */
- public void run(final int port) {
- String[] args = new String[0];
- args = OptionHandlerStartupMode.appendArg(args, StartupMode.BACKGROUND);
- args = OptionHandlerPort.appendArg(args, port);
- run(args);
- }
-
public void run(final String[] args) {
final IsisRunner runner = new IsisRunner(args, new OptionHandlerDeploymentTypeWebServer());
addOptionHandlersAndValidators(runner);