Merge remote-tracking branch 'refs/remotes/origin/master'

README

@@ -40,7 +40,7 @@ For more information please go to:
 
 For bugtracking system please go to:
 
-  https://jira.evolveum.com/
+  https://support.evolveum.com/
 
 MidPoint source code is maintained on github:
 

README.md

@@ -41,7 +41,7 @@ For more information about midPoint identity manager please go to:
 https://midpoint.evolveum.com/
 
 For bugtracking system please go to:
-https://jira.evolveum.com/
+https://support.evolveum.com/
 
 MidPoint source code is maintained on github:
 https://github.com/Evolveum/midpoint

dist/src/main/bin/midpoint.sh

@@ -259,7 +259,12 @@ while read line; do
   [ "${_key: -5}" = ".FILE" ] && _key="${_key::$((${#_key} - 5))}_FILE"
   ###
 
-  echo "Processing variable (UNMAP) ... ${_key} .:. ${_val}" >&2
+  if [ "${_key: -7}" = "assword" ]
+  then
+    echo "Processing variable (UNMAP) ... ${_key} .:. *****" >&2
+  else
+    echo "Processing variable (UNMAP) ... ${_key} .:. ${_val}" >&2
+  fi
 
   JAVA_OPTS="$(echo -n "${JAVA_OPTS:-}" | sed "s/ -D${_key}=\"[^\"]*\"//g;s/ -D${_key}=[^[:space:]]*//g")"
 done < <(env | grep "^${ENV_UNMAP_PREFIX}")

dist/src/main/bin/ninja.sh

@@ -142,7 +142,12 @@ while read line; do
   [ "${_key: -5}" = ".FILE" ] && _key="${_key::$((${#_key} - 5))}_FILE"
   ###
 
-  echo "Processing variable (MAP) ... ${_key} .:. ${_val}" >&2
+  if [ "${_key: -7}" = "assword" ]
+  then
+    echo "Processing variable (MAP) ... ${_key} .:. *****" >&2
+  else
+    echo "Processing variable (MAP) ... ${_key} .:. ${_val}" >&2
+  fi
 
   if [ "${_key:0:1}" = "." ]; then
     JAVA_OPTS="${JAVA_OPTS:-} -D${_key:1}=\"${_val}\""
@@ -160,7 +165,12 @@ while read line; do
   [ "${_key: -5}" = ".FILE" ] && _key="${_key::$((${#_key} - 5))}_FILE"
   ###
 
-  echo "Processing variable (UNMAP) ... ${_key} .:. ${_val}" >&2
+  if [ "${_key: -7}" = "assword" ]
+  then
+    echo "Processing variable (UNMAP) ... ${_key} .:. *****" >&2
+  else
+    echo "Processing variable (UNMAP) ... ${_key} .:. ${_val}" >&2
+  fi
 
   JAVA_OPTS="$(echo -n "${JAVA_OPTS:-}" | sed "s/ -D${_key}=\"[^\"]*\"//g;s/ -D${_key}=[^[:space:]]*//g")"
 done < <(env | grep "^${ENV_UNMAP_PREFIX}")

docs/admin-gui/request-access/configuration.adoc

@@ -104,6 +104,11 @@ Which types of views of role catalog are allowed to be shown to user.
 |Reference to the root object of the role catalog (org. structure).
 Up to 3 levels of org. structure will be shown as menus/submenus.
 
+|roleCatalogDepth
+|positive integer
+|
+|Maximum depth of org. structure to be shown in role catalog.
+
 |collection
 |RoleCollectionViewType
 |

docs/admin-gui/request-access/index.adoc

@@ -32,7 +32,7 @@ Concrete search behaviour can be customized using `group/searchFilterTemplate` w
 Search result labels can be also configured using expression defined in `group/userDisplayName`.
 Minimum number of characters needed to start autocomplete can be configured using `group/autocompleteMinChars`.
 
-NOTE: Since 4.8 search behaviour configuration was moved to `autoCompleteConfiguration` configuration option.
+Search behaviour configuration was moved to `autoCompleteConfiguration` configuration option.
 
 In following example filter template will create substring search `givenName like '%King *<VALUE>*%'`.
 Results will be displayed in format `<USER_NAME> (<USER_OID>)`
@@ -127,7 +127,7 @@ Org. tree is then used to load hierarchical menu.
 By default, up to 3 levels, all roles on deeper levels are shown in that 3rd level menu.
 Assignable roles have to be part of this org. tree.
 
-NOTE: In 4.8 or later number of levels can be configured using `roleCatalogDepth` configuration option.
+Number of levels can be configured using `roleCatalogDepth` configuration option.
 
 === Collection of objects
 
@@ -140,7 +140,7 @@ Roles of teammate option can be disabled via configuration.
 
 Search for teammate will by default create filter using `user/name` property with `norm` poly-string matcher by default.
 
-NOTE: Since 4.8 search behaviour can be customized using `autoCompleteConfiguration` configuration option.
+Search behaviour can be customized using `autoCompleteConfiguration` configuration option.
 
 .Roles of teammate
 image::step-3-roles-of-teammate.png[Roles of teammate,100%]
@@ -164,4 +164,4 @@ image::step-4-conflict-list.png[List of conflicts,100%]
 image::step-4-conflicts-solved.png[Solved conflicts,100%]
 
 .Edit shopping cart item
-image::step-4-checkout-item-edit.png[Edit shopping cart item,100%]
+image::step-4-checkout-item-edit.png[Edit shopping cart item,100%]

docs/admin-gui/resource-wizard/index.adoc

@@ -146,7 +146,7 @@ NOTE: You do not need to use the classification at all. If unsure, do not use it
 .See also the following pages for more information:
 * xref:/midpoint/reference/resources/resource-configuration/schema-handling/changes-in-4.6/#resource-object-type-delineation[Resource Object Type Delineation]
 
-// TODO TODO we do not have better Delination example! I have created https://jira.evolveum.com/browse/MID-9404 to track this
+// TODO TODO we do not have better Delination example! I have created https://support.evolveum.com/wp/9404 to track this
 
 image::step-2-object-type-resource-data.png[link=step-2-object-type-resource-data.png, 100%,title=Resource data]
 

docs/concepts/clockwork/conflict-resolution-howto.adoc

@@ -9,7 +9,7 @@
 :page-upkeep-status: green
 
 If multiple operations are executed "at once" in parallel threads, some unexpected results might occur.
-See e.g.link:https://jira.evolveum.com/browse/MID-4112[MID-4112]: user has two assignments, both induce the same resource account.
+See e.g. bug:MID-4112[]: user has two assignments, both induce the same resource account.
 If these are deleted at the same time (each thread deleting one of them), the resource account is *not* deleted.
 The reason is that both operations see the object with one remaining assignment, and both think that the account must be kept.
 
@@ -104,4 +104,4 @@ An example:
          <delayUnit>20000</delayUnit>
       </conflictResolution>
    </defaultObjectPolicyConfiguration>
-----
+----