From c7b833c595d9c9215f8b5dd8a07b1cf2a79ac689 Mon Sep 17 00:00:00 2001
From: Greg Wilkins <gregw@webtide.com>
Date: Thu, 13 Oct 2016 16:36:27 +1100
Subject: [PATCH] Issue #984 Improve module listing

Changed |= to ?= for optional property set
---
 jetty-server/src/main/config/modules/session-store-cache.mod    | 2 +-
 jetty-server/src/main/config/modules/session-store-jdbc.mod     | 2 +-
 .../src/main/java/org/eclipse/jetty/start/StartArgs.java        | 2 +-
 .../src/main/resources/org/eclipse/jetty/start/usage.txt        | 2 +-
 .../src/test/resources/usecases/basic-properties.assert.txt     | 1 +
 .../src/test/resources/usecases/basic-properties.cmdline.txt    | 2 ++
 6 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/jetty-server/src/main/config/modules/session-store-cache.mod b/jetty-server/src/main/config/modules/session-store-cache.mod
index 2d62c82a8a1..2f884a98f82 100644
--- a/jetty-server/src/main/config/modules/session-store-cache.mod
+++ b/jetty-server/src/main/config/modules/session-store-cache.mod
@@ -15,7 +15,7 @@ etc/sessions/session-data-cache/session-caching-store.xml
 
 
 [ini]
-session-data-cache|=xmemcached
+session-data-cache?=xmemcached
 
 [ini-template]
 
diff --git a/jetty-server/src/main/config/modules/session-store-jdbc.mod b/jetty-server/src/main/config/modules/session-store-jdbc.mod
index e12dadc47cf..2e3a828be6b 100644
--- a/jetty-server/src/main/config/modules/session-store-jdbc.mod
+++ b/jetty-server/src/main/config/modules/session-store-jdbc.mod
@@ -15,7 +15,7 @@ sessions/jdbc/${db-connection-type}
 etc/sessions/jdbc/session-store.xml
 
 [ini]
-db-connection-type|=datasource
+db-connection-type?=datasource
 
 [ini-template]
 ##
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java b/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
index c5b6ffff429..68904ba6107 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
@@ -1064,7 +1064,7 @@ public class StartArgs
                     source=propertySource.get(key)+","+source;
                 }
             }
-            if (key.endsWith("|"))
+            if (key.endsWith("?"))
             {
                 key = key.substring(0,key.length()-1);
                 if (getProperties().containsKey(key))
diff --git a/jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt b/jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt
index 78d8585be10..1d76986863b 100644
--- a/jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt
+++ b/jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt
@@ -157,7 +157,7 @@ Properties:
     name+=,value
       Add to an existing property as a comma separated list.
 
-    name|=value
+    name?=value
       Set a property only if it is not already set.
 
     STOP.HOST=[string]
diff --git a/jetty-start/src/test/resources/usecases/basic-properties.assert.txt b/jetty-start/src/test/resources/usecases/basic-properties.assert.txt
index e0c620efe12..52a09de9e1e 100644
--- a/jetty-start/src/test/resources/usecases/basic-properties.assert.txt
+++ b/jetty-start/src/test/resources/usecases/basic-properties.assert.txt
@@ -14,3 +14,4 @@ PROP|other=value
 PROP|jetty.http.port=9090
 PROP|add=beginningmiddleend
 PROP|list=one,two,three
+PROP|name=value
diff --git a/jetty-start/src/test/resources/usecases/basic-properties.cmdline.txt b/jetty-start/src/test/resources/usecases/basic-properties.cmdline.txt
index d69afe74ea4..119dac10057 100644
--- a/jetty-start/src/test/resources/usecases/basic-properties.cmdline.txt
+++ b/jetty-start/src/test/resources/usecases/basic-properties.cmdline.txt
@@ -6,3 +6,5 @@ add+=end
 list+=,one
 list+=,two
 list+=,three
+name?=value
+name?=enoughAlready