You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/02/06 04:13:38 UTC

[isis] branch v1-lab updated: fixes option-cli related build issues

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch v1-lab
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/v1-lab by this push:
     new 73c5efa  fixes option-cli related build issues
73c5efa is described below

commit 73c5efacd853dc03bec0b2d3a7efcef763b2e439
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Feb 6 05:13:23 2021 +0100

    fixes option-cli related build issues
    
    restores feature compliance with 'v1'
    
    that is restores all command line options
---
 .../opts/OptionHandlerAdditionalProperty.java      | 16 ++++++++-----
 .../runner/opts/OptionHandlerAppManifest.java      | 28 +++++++++++-----------
 .../runner/opts/OptionHandlerConfiguration.java    | 16 ++++++++-----
 .../runner/opts/OptionHandlerDeploymentType.java   | 20 +++++++++-------
 .../runtime/runner/opts/OptionHandlerFixture.java  | 27 +++++++++++----------
 ...ptionHandlerFixtureFromEnvironmentVariable.java |  1 -
 .../runner/opts/OptionHandlerInitParameters.java   |  1 -
 .../runtime/runner/opts/OptionHandlerPassword.java | 14 +++++++----
 .../runner/opts/OptionHandlerSystemProperties.java |  1 -
 .../runtime/runner/opts/OptionHandlerUser.java     | 14 +++++++----
 .../webserver/internal/OptionHandlerAddress.java   | 11 +++++----
 .../core/webserver/internal/OptionHandlerPort.java | 15 +++++++-----
 .../internal/OptionHandlerResourceBase.java        | 12 ++++++----
 .../internal/OptionHandlerStartupMode.java         | 14 +++++++----
 14 files changed, 111 insertions(+), 79 deletions(-)

diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerAdditionalProperty.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerAdditionalProperty.java
index 6d1c74d..4026aea 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerAdditionalProperty.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerAdditionalProperty.java
@@ -25,9 +25,7 @@ import java.util.List;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
-
 import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
 import org.apache.isis.core.runtime.optionhandler.BootPrinter;
 import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
@@ -38,11 +36,17 @@ public class OptionHandlerAdditionalProperty extends OptionHandlerAbstract {
     private List<String> additionalProperties;
 
     @Override
-    @SuppressWarnings("static-access")
     public void addOption(final Options options) {
-//        final Option option = OptionBuilder.withArgName("property=value").hasArg().withValueSeparator().withDescription("use value for given property").create(ADDITIONAL_PROPERTY);
-//        option.setArgs(Option.UNLIMITED_VALUES);
-//        options.addOption(option);
+    	
+    	Option option = Option.builder(ADDITIONAL_PROPERTY)
+    	.argName("property=value")
+    	.hasArg()
+    	.valueSeparator()
+    	.desc("use value for given property")
+    	.build();
+    	
+        option.setArgs(Option.UNLIMITED_VALUES);
+        options.addOption(option);
     }
 
     @Override
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerAppManifest.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerAppManifest.java
index 10018c8..2941eed 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerAppManifest.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerAppManifest.java
@@ -19,21 +19,19 @@
 
 package org.apache.isis.core.runtime.runner.opts;
 
+import static org.apache.isis.core.runtime.runner.Constants.APP_MANIFEST_LONG_OPT;
+import static org.apache.isis.core.runtime.runner.Constants.APP_MANIFEST_OPT;
+
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
 import org.apache.isis.core.runtime.optionhandler.BootPrinter;
 import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
 import org.apache.isis.core.runtime.runner.Constants;
 import org.apache.isis.core.runtime.system.SystemConstants;
-
-import static org.apache.isis.core.runtime.runner.Constants.APP_MANIFEST_LONG_OPT;
-import static org.apache.isis.core.runtime.runner.Constants.APP_MANIFEST_OPT;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class OptionHandlerAppManifest extends OptionHandlerAbstract {
 
@@ -45,14 +43,16 @@ public class OptionHandlerAppManifest extends OptionHandlerAbstract {
     }
 
     @Override
-    @SuppressWarnings("static-access")
     public void addOption(final Options options) {
-//        final Option option = OptionBuilder
-//                                    .withArgName("app manifest").hasArg()
-//                                    .withLongOpt(APP_MANIFEST_LONG_OPT)
-//                                    .withDescription("fully qualified AppManifest class")
-//                                    .create(APP_MANIFEST_OPT);
-        //options.addOption(option);
+    	
+    	Option option = Option.builder(APP_MANIFEST_OPT)
+    	.argName("app manifest")
+    	.hasArg()
+    	.longOpt(APP_MANIFEST_LONG_OPT)
+    	.desc("fully qualified AppManifest class")
+    	.build();
+    	
+        options.addOption(option);
     }
 
     @Override
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerConfiguration.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerConfiguration.java
index c120232..5099f2c 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerConfiguration.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerConfiguration.java
@@ -24,12 +24,10 @@ import static org.apache.isis.core.runtime.runner.Constants.CONFIGURATION_OPT;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
-
 import org.apache.isis.core.commons.config.IsisConfigurationDefault;
-import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
 import org.apache.isis.core.commons.config.NotFoundPolicy;
+import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
 import org.apache.isis.core.runtime.optionhandler.BootPrinter;
 import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
 import org.apache.isis.core.runtime.runner.Constants;
@@ -39,10 +37,16 @@ public class OptionHandlerConfiguration extends OptionHandlerAbstract {
     private String configurationResource;
 
     @Override
-    @SuppressWarnings("static-access")
     public void addOption(final Options options) {
-//        final Option option = OptionBuilder.withArgName("config file").hasArg().withLongOpt(CONFIGURATION_LONG_OPT).withDescription("read in configuration file (as well as isis.properties)").create(CONFIGURATION_OPT);
-//        options.addOption(option);
+    	
+    	Option option = Option.builder(CONFIGURATION_OPT)
+    	.argName("config file")
+    	.hasArg()
+    	.longOpt(CONFIGURATION_LONG_OPT)
+    	.desc("read in configuration file (as well as isis.properties)")
+    	.build();
+    	
+        options.addOption(option);
     }
 
     @Override
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerDeploymentType.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerDeploymentType.java
index 3eee044..bc6e89f 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerDeploymentType.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerDeploymentType.java
@@ -19,11 +19,12 @@
 
 package org.apache.isis.core.runtime.runner.opts;
 
+import static org.apache.isis.core.runtime.runner.Constants.TYPE_LONG_OPT;
+import static org.apache.isis.core.runtime.runner.Constants.TYPE_OPT;
+
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
-
 import org.apache.isis.core.commons.config.IsisConfigurationDefault;
 import org.apache.isis.core.commons.config.NotFoundPolicy;
 import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
@@ -33,9 +34,6 @@ import org.apache.isis.core.runtime.runner.Constants;
 import org.apache.isis.core.runtime.system.DeploymentType;
 import org.apache.isis.core.runtime.system.SystemConstants;
 
-import static org.apache.isis.core.runtime.runner.Constants.TYPE_LONG_OPT;
-import static org.apache.isis.core.runtime.runner.Constants.TYPE_OPT;
-
 public abstract class OptionHandlerDeploymentType extends OptionHandlerAbstract {
 
     private final DeploymentType defaultDeploymentType;
@@ -49,10 +47,16 @@ public abstract class OptionHandlerDeploymentType extends OptionHandlerAbstract
     }
 
     @Override
-    @SuppressWarnings("static-access")
     public void addOption(final Options options) {
-//        final Option option = OptionBuilder.withArgName("name").hasArg().withLongOpt(TYPE_LONG_OPT).withDescription("deployment type: " + types).create(TYPE_OPT);
-//        options.addOption(option);
+    	
+    	Option option = Option.builder(TYPE_OPT)
+    	.argName("name")
+    	.hasArg()
+    	.longOpt(TYPE_LONG_OPT)
+    	.desc("deployment type: " + types)
+    	.build();
+
+        options.addOption(option);
     }
 
     @Override
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerFixture.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerFixture.java
index 8c56db2..2f7946f 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerFixture.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerFixture.java
@@ -19,17 +19,16 @@
 
 package org.apache.isis.core.runtime.runner.opts;
 
+import static org.apache.isis.core.runtime.runner.Constants.FIXTURE_LONG_OPT;
+import static org.apache.isis.core.runtime.runner.Constants.FIXTURE_OPT;
+
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.isis.core.runtime.optionhandler.BootPrinter;
 import org.apache.isis.core.runtime.runner.Constants;
-
-import static org.apache.isis.core.runtime.runner.Constants.FIXTURE_LONG_OPT;
-import static org.apache.isis.core.runtime.runner.Constants.FIXTURE_OPT;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class OptionHandlerFixture extends OptionHandlerFixtureAbstract {
 
@@ -40,14 +39,16 @@ public class OptionHandlerFixture extends OptionHandlerFixtureAbstract {
     }
 
     @Override
-    @SuppressWarnings("static-access")
     public void addOption(final Options options) {
-//        final Option option = OptionBuilder
-//                                    .withArgName("class name").hasArg()
-//                                    .withLongOpt(FIXTURE_LONG_OPT)
-//                                    .withDescription("fully qualified fixture class")
-//                                    .create(FIXTURE_OPT);
-//        options.addOption(option);
+    	
+    	Option option = Option.builder(FIXTURE_OPT)
+    	.argName("class name")
+    	.hasArg()
+    	.longOpt(FIXTURE_LONG_OPT)
+    	.desc("fully qualified fixture class")
+    	.build();
+
+        options.addOption(option);
     }
 
     @Override
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerFixtureFromEnvironmentVariable.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerFixtureFromEnvironmentVariable.java
index b05406e..fb0b09a 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerFixtureFromEnvironmentVariable.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerFixtureFromEnvironmentVariable.java
@@ -33,7 +33,6 @@ public class OptionHandlerFixtureFromEnvironmentVariable extends OptionHandlerFi
 
 
     @Override
-    @SuppressWarnings("static-access")
     public void addOption(final Options options) {
         // no-op
     }
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerInitParameters.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerInitParameters.java
index 64c871f..1fcf715 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerInitParameters.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerInitParameters.java
@@ -43,7 +43,6 @@ public class OptionHandlerInitParameters extends OptionHandlerAbstract {
     }
 
     @Override
-    @SuppressWarnings("static-access")
     public void addOption(final Options options) {
         // no-op
     }
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerPassword.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerPassword.java
index 83283bb..825420d 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerPassword.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerPassword.java
@@ -24,9 +24,7 @@ import static org.apache.isis.core.runtime.runner.Constants.PASSWORD_OPT;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
-
 import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
 import org.apache.isis.core.runtime.optionhandler.BootPrinter;
 import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
@@ -42,10 +40,16 @@ public class OptionHandlerPassword extends OptionHandlerAbstract {
     }
 
     @Override
-    @SuppressWarnings("static-access")
     public void addOption(final Options options) {
-//        final Option option = OptionBuilder.withArgName("password").hasArg().withLongOpt(PASSWORD_LONG_OPT).withDescription("password to automatically log in with").create(PASSWORD_OPT);
-//        options.addOption(option);
+    	
+    	Option option = Option.builder(PASSWORD_OPT)
+    	.argName("password")
+    	.hasArg()
+    	.longOpt(PASSWORD_LONG_OPT)
+    	.desc("password to automatically log in with")
+    	.build();
+    	
+        options.addOption(option);
     }
 
     @Override
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerSystemProperties.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerSystemProperties.java
index a4adb43..156f708 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerSystemProperties.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerSystemProperties.java
@@ -37,7 +37,6 @@ public class OptionHandlerSystemProperties extends OptionHandlerAbstract {
     private Map<String,String> additionalProperties;
 
     @Override
-    @SuppressWarnings("static-access")
     public void addOption(final Options options) {
         // no-op
     }
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerUser.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerUser.java
index 3317075..bf17f7a 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerUser.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerUser.java
@@ -24,9 +24,7 @@ import static org.apache.isis.core.runtime.runner.Constants.USER_OPT;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
-
 import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
 import org.apache.isis.core.runtime.optionhandler.BootPrinter;
 import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
@@ -42,10 +40,16 @@ public class OptionHandlerUser extends OptionHandlerAbstract {
     }
 
     @Override
-    @SuppressWarnings("static-access")
     public void addOption(final Options options) {
-//        final Option option = OptionBuilder.withArgName("user name").hasArg().withLongOpt(USER_LONG_OPT).withDescription("user name to log in with").create(USER_OPT);
-//        options.addOption(option);
+    	
+    	Option option = Option.builder(USER_OPT)
+    	.argName("user name")
+    	.hasArg()
+    	.longOpt(USER_LONG_OPT)
+    	.desc("user name to log in with")
+    	.build();
+    	
+        options.addOption(option);
 
     }
 
diff --git a/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerAddress.java b/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerAddress.java
index 87537f1..d062ba3 100644
--- a/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerAddress.java
+++ b/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerAddress.java
@@ -24,9 +24,7 @@ package org.apache.isis.core.webserver.internal;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
-
 import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
 import org.apache.isis.core.runtime.optionhandler.BootPrinter;
 import org.apache.isis.core.runtime.optionhandler.OptionHandler;
@@ -42,9 +40,14 @@ public final class OptionHandlerAddress implements OptionHandler {
     static final String ADDRESS_LONG_OPT = "address";
 
     @Override
-    @SuppressWarnings("static-access")
     public void addOption(final Options options) {
-        final Option option = OptionBuilder.withArgName("address").hasArg().withLongOpt(OptionHandlerAddress.ADDRESS_LONG_OPT).withDescription("address to listen on").create(OptionHandlerAddress.ADDRESS_OPT);
+    	Option option = Option.builder(OptionHandlerAddress.ADDRESS_OPT)
+    	.argName("address")
+    	.hasArg()
+    	.longOpt(OptionHandlerAddress.ADDRESS_LONG_OPT)
+    	.desc("address to listen on")
+    	.build();
+    	
         options.addOption(option);
     }
 
diff --git a/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerPort.java b/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerPort.java
index c6d4433..1aec821 100644
--- a/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerPort.java
+++ b/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerPort.java
@@ -24,9 +24,7 @@ package org.apache.isis.core.webserver.internal;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
-
 import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
 import org.apache.isis.core.commons.lang.ArrayExtensions;
 import org.apache.isis.core.runtime.optionhandler.BootPrinter;
@@ -43,11 +41,16 @@ public final class OptionHandlerPort implements OptionHandler {
     }
 
     @Override
-    @SuppressWarnings("static-access")
     public void addOption(final Options options) {
-//        OptionBuilder.withArgName("port");
-//        final Option option = OptionBuilder.hasArg().withLongOpt(OptionHandlerPort.PORT_LONG_OPT).withDescription("port to listen on").create(OptionHandlerPort.PORT_OPT);
-//        options.addOption(option);
+    	
+    	Option option = Option.builder(OptionHandlerPort.PORT_OPT)
+    	.argName("port")
+    	.hasArg()
+    	.longOpt(OptionHandlerPort.PORT_LONG_OPT)
+    	.desc("port to listen on")
+    	.build();
+    	
+        options.addOption(option);
     }
 
     @Override
diff --git a/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerResourceBase.java b/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerResourceBase.java
index 4a2c965..f03d8bb 100644
--- a/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerResourceBase.java
+++ b/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerResourceBase.java
@@ -21,9 +21,7 @@ package org.apache.isis.core.webserver.internal;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
-
 import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
 import org.apache.isis.core.runtime.optionhandler.BootPrinter;
 import org.apache.isis.core.runtime.optionhandler.OptionHandler;
@@ -39,9 +37,15 @@ public final class OptionHandlerResourceBase implements OptionHandler {
     static final String RESOURCE_BASE_OPT = "w";
 
     @Override
-    @SuppressWarnings("static-access")
     public void addOption(final Options options) {
-        final Option option = OptionBuilder.withArgName("webapp directory").hasArg().withLongOpt(OptionHandlerResourceBase.RESOURCE_BASE_LONG_OPT).withDescription("directory holding webapp").create(OptionHandlerResourceBase.RESOURCE_BASE_OPT);
+    	
+    	Option option = Option.builder(OptionHandlerResourceBase.RESOURCE_BASE_OPT)
+    	.argName("webapp directory")
+    	.hasArg()
+    	.longOpt(OptionHandlerResourceBase.RESOURCE_BASE_LONG_OPT)
+    	.desc("directory holding webapp")
+    	.build();
+    	
         options.addOption(option);
     }
 
diff --git a/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerStartupMode.java b/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerStartupMode.java
index 84a9c83..fc6c4c2 100644
--- a/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerStartupMode.java
+++ b/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerStartupMode.java
@@ -21,9 +21,7 @@ package org.apache.isis.core.webserver.internal;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
-
 import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
 import org.apache.isis.core.commons.lang.ArrayExtensions;
 import org.apache.isis.core.runtime.optionhandler.BootPrinter;
@@ -43,10 +41,16 @@ public final class OptionHandlerStartupMode implements OptionHandler {
     private StartupMode startupMode;
 
     @Override
-    @SuppressWarnings("static-access")
     public void addOption(final Options options) {
-//        final Option option = OptionBuilder.withArgName("startup mode").hasArg().withLongOpt(OptionHandlerStartupMode.STARTUP_MODE_LONG_OPT).withDescription("start in foreground (sync) or background (async)").create(OptionHandlerStartupMode.STARTUP_MODE_BASE_OPT);
-//        options.addOption(option);
+    	
+    	Option option = Option.builder(OptionHandlerStartupMode.STARTUP_MODE_BASE_OPT)
+    	.argName("startup mode")
+    	.hasArg()
+    	.longOpt(OptionHandlerStartupMode.STARTUP_MODE_LONG_OPT)
+    	.desc("start in foreground (sync) or background (async)")
+    	.build();
+    	
+        options.addOption(option);
     }
 
     @Override