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/16 10:54:16 UTC
isis git commit: ISIS-848: reinstating method in WebServer,
as used by TCK tests...
Repository: isis
Updated Branches:
refs/heads/master 73709dd88 -> 5d4588b98
ISIS-848: reinstating method in WebServer, as used by TCK tests...
... that have been moved to the isisaddons' kitchensink
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/5d4588b9
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/5d4588b9
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/5d4588b9
Branch: refs/heads/master
Commit: 5d4588b9847d6596a06a17df107ed9584e0c57fd
Parents: 73709dd
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sun Aug 16 09:54:04 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sun Aug 16 09:54:04 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/isis/core/webserver/WebServer.java | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/5d4588b9/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 5fd37a0..f93220e 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
@@ -34,6 +34,7 @@ import org.apache.isis.core.commons.lang.ArrayExtensions;
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 {
@@ -82,6 +83,16 @@ 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);