Merge pull request #295 from OpenLiberty/staging

Merge staging to prod - fix issue 235 (#294)

README.adoc

@@ -1333,14 +1333,21 @@ Wait until the following message displays on the `system` microservice console.
 CWWKF0011I: The defaultServer server is ready to run a smarter planet. ...
 ----
 
-You can check that the `system` microservice is secured against unauthenticated requests at the https://localhost:9444/system/api/heapsize URL. You can expect to see the following error in the console of the `system` microservice:
+You can check that the `system` microservice is secured against unauthenticated requests at the https://localhost:9444/system/api/heapsize URL. Open another command-line session and run the following command:
 
-ifdef::cloud-hosted[]
-Open another command-line session and run the following command:
-```bash
-curl -k 'https://localhost:9444/system/api/heapsize'
-```
-endif::[]
+[role='command']
+----
+curl -kf 'https://localhost:9444/system/api/heapsize'
+----
+
+You should see the following response:
+
+[source, role=no_copy]
+----
+curl: (22) The requested URL returned error: 401
+----
+
+You can expect to see the following error in the console of the `system` microservice:
 
 [source]
 ----

finish/system/pom.xml

@@ -59,6 +59,9 @@
             <plugin>
                 <groupId>io.openliberty.tools</groupId>
                 <artifactId>liberty-maven-plugin</artifactId>
+                <configuration>
+                    <noPassword>true</noPassword>
+                </configuration>
             </plugin>
         </plugins>
     </build>

finish/system/src/main/liberty/config/server.xml

@@ -24,5 +24,7 @@
     <webApplication contextRoot="/system" location="system.war"/>
 
     <!-- Default SSL configuration enables trust for default certificates from the Java runtime -->
-    <ssl id="defaultSSLConfig" keyStoreRef="guideKeyStore" trustDefaultCerts="true" />
+    <ssl id="guideSSLConfig" keyStoreRef="guideKeyStore" trustDefaultCerts="true" />
+    <sslDefault sslRef="guideSSLConfig" />
+
 </server>