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 2018/11/17 15:40:25 UTC

[isis] branch v2 updated: ISIS-1991: fixing property values

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

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


The following commit(s) were added to refs/heads/v2 by this push:
     new b419c1f  ISIS-1991: fixing property values
b419c1f is described below

commit b419c1ff718c9c13fe3e0f3818aaed3ad363060e
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Nov 17 16:40:20 2018 +0100

    ISIS-1991: fixing property values
    
    Task-Url: https://issues.apache.org/jira/browse/ISIS-1991
---
 .../org/apache/isis/core/plugins/environment/IsisSystemEnvironment.java | 2 +-
 .../java/org/apache/isis/core/runtime/system/context/IsisContext.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/commons/src/main/java/org/apache/isis/core/plugins/environment/IsisSystemEnvironment.java b/core/commons/src/main/java/org/apache/isis/core/plugins/environment/IsisSystemEnvironment.java
index 7c967e8..63b3664 100644
--- a/core/commons/src/main/java/org/apache/isis/core/plugins/environment/IsisSystemEnvironment.java
+++ b/core/commons/src/main/java/org/apache/isis/core/plugins/environment/IsisSystemEnvironment.java
@@ -51,7 +51,7 @@ public interface IsisSystemEnvironment {
                     "true".equalsIgnoreCase(System.getenv("PROTOTYPING"));
             
             anyVoteForPrototyping|=
-                    "server-prototype".equalsIgnoreCase(System.getProperty("isis.deploymentType"));
+                    "server_prototype".equalsIgnoreCase(System.getProperty("isis.deploymentType"));
             
             anyVoteForPrototyping|=
                     "PROTOTYPING".equalsIgnoreCase(System.getProperty("isis.deploymentType"));
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
index 296493c..1cc3804 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
@@ -131,7 +131,7 @@ public interface IsisContext {
         private static DeploymentType parseDeploymentType(String deploymentTypeLiteral) {
             
             switch(deploymentTypeLiteral) {
-            case "server-prototyping":
+            case "server_prototyping":
             case "prototyping":
                 return DeploymentType.PROTOTYPING;
             case "server":