From 8246898f0d0f1e1dffedb90040497b4607180b92 Mon Sep 17 00:00:00 2001
From: Christof Rabensteiner <christof.rabensteiner@iaik.tugraz.at>
Date: Fri, 23 Aug 2019 15:43:11 +0200
Subject: Documentation: Fix how to refer to MOA ZS and MOA SP-SS

---
 readme.md                                  |  5 ++---
 src/test/resources/config/application.yaml | 25 ++++++++++++++-----------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/readme.md b/readme.md
index 433f5a6..2600a09 100644
--- a/readme.md
+++ b/readme.md
@@ -27,7 +27,7 @@ mvn test -P all-tests
 ```
 
 Note that some integration tests (prefix `ITSSL`) rely on a TLS connection and Client Authentication. The following guide
-expalins how to set up TLS and Client Authentication with Apache 2.
+explains how to set up TLS and Client Authentication with Apache 2.
 
 #### Quick Guide: Set Up SSL (inc. Client Authentication) in Apache 2.
 
@@ -87,7 +87,7 @@ After packaging the application to a `war` file, the application can be deployed
 1.   Copy the `war` file into the applications working directory.
 
      ```
-     cp target/moa-zs-$MZS_VERSION.war standalone/
+     cp target/moa-zs.war standalone/
      ```
 
 1.   Copy the directory `test/main/resources/config/` into the applications working directory.
@@ -98,7 +98,6 @@ After packaging the application to a `war` file, the application can be deployed
 
      The `config` folder works out of the box for test environments. You may apply changes to files in the `config` folder to fit the needs of a productive environment.
 
-
 # Footnotes
 
 [1] https://bugs.openjdk.java.net/browse/JDK-8214098
diff --git a/src/test/resources/config/application.yaml b/src/test/resources/config/application.yaml
index 0042cbd..110d9d8 100644
--- a/src/test/resources/config/application.yaml
+++ b/src/test/resources/config/application.yaml
@@ -25,11 +25,11 @@ javax.net.ssl:
 
 # Mandatory
 # Defines configuration profiles. Each profile contains all parameters
-# that are interpreted by moa-zs to determine how a delivery request
+# that are interpreted by MOA ZS to determine how a delivery request
 # should be processed. Configure parameters here and/or in
 # DeliveryRequest/Config. You can select a profile per delivery
 # request by referring to the profile id in
-# DeliveryRequest/Config/ProfileId. If a parameter is missing, moa-zs
+# DeliveryRequest/Config/ProfileId. If a parameter is missing, MOA ZS
 # falls back to "default" You can override parameters in profiles.
 # Parameter have the following (descending) priority:
 #   DeliveryRequest/Config > [chosen-profile] > default
@@ -46,12 +46,12 @@ delivery-request-configuration-profiles:
     # the service will reply with "PartialSuccess" and handle
     # responses asynchronously. A missing service-timeout means that the
     # service waits indefinitely. See also: msg-response-sinks, which
-    # allows you to configure, how moa-zs handles asynchronous
+    # allows you to configure, how MOA ZS handles asynchronous
     # responses.
     service-timeout: 60
 
     # Mandatory
-    # If true, moa-zs asks the tnvz service if the receiver is
+    # If true, MOA ZS asks the tnvz service if the receiver is
     # addressable. Requires setting up the tvnz-client.
     perform-query-person-request: false
 
@@ -93,7 +93,7 @@ delivery-request-configuration-profiles:
       receive-timeout: 0
 
     # Mandatory
-    # Specifies how moa-zs should process asynchronous responses from msg.
+    # Specifies how MOA ZS should process asynchronous responses from msg.
     msg-response-sinks:
 
       # Mandatory
@@ -147,20 +147,21 @@ delivery-request-configuration-profiles:
           type: PKCS12
 
 # Optional
-# If set to false, moa zs ignores an incomplete default DeliveryRequest-configuration
+# If set to false, MOA ZS ignores an incomplete default DeliveryRequest-configuration
 # profile and continues startup. See 'delivery-request-configuration-profiles'.
 # Default value: true
 verify-completeness-of-default-delivery-request-configuration: true
 
 # Mandatory
-# Moa Spss Configuration
+# Moa SP-SS Configuration
 moa.spss:
 
   # Mandatory
-  is-active: true
+  # If active, Moa ZS verifies signed incoming messages with MOA SP-SS.
+  is-active: false
 
   # Mandatory
-  # If active, moa spss validates manifests in xml signatures.
+  # If active, MOA SP-SS validates manifests in XML signatures.
   is-manifest-check-active: false
 
   # Mandatory
@@ -169,11 +170,13 @@ moa.spss:
     # Mandatory
     # Path that points to MoaSPSSConfiguration file; can be:
     # - absolute path (unix: starts with /), or
-    # - relative path (otherwise, relative to application's class path)
+    # - relative path (relative to application's class path
+    #    OR the applications working directory, but not relative to
+    #    application.yaml!)
     configuration: config/moa-spss/MOASPSSConfiguration.xml
 
     # Mandatory
-    # Select, which trust-profile moa spss uses to verify a signature.
+    # Select, which trust-profile MOA SP-SS uses to verify a signature.
     default-trustprofile: test-trustprofile
 
 spring:
-- 
cgit v1.2.3