Skip to content

Commit

Permalink
useless [NBSP] removal
Browse files Browse the repository at this point in the history
  • Loading branch information
virgo47 committed Oct 21, 2021
1 parent 41295da commit 965e047
Show file tree
Hide file tree
Showing 17 changed files with 37 additions and 43 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ The configuration looks like this:
<modelHookEnabled>true</modelHookEnabled> <!-- this is the default -->
<processCheckInterval>10</processCheckInterval> <!-- this is the default -->
<allowCompleteOthersItems>true</allowCompleteOthersItems> <!-- this is the default -->
 <primaryChangeProcessor>
<primaryChangeProcessor>
<enabled>true</enabled> <!-- this is the default -->
<addUserAbstractRoleAssignmentAspect>
<enabled>true</enabled> <!-- this is the default -->
Expand Down
23 changes: 9 additions & 14 deletions docs/cases/workflow-3/legacy-approvals-examples.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ Examples mentioned here use legacy (pre-3.5) approach to approvals configuration
For a more up-to-date samples please visit wiki:Approval+examples[this page].
====


== Basic how-to

You can test the workflow module e.g. by importing the following files:
Expand All @@ -30,7 +29,6 @@ You can test the workflow module e.g. by importing the following files:
Then you can try to add one of the sensitive roles to any user and see what happens.
Details are described in the following sections.


== Configuring approval processes

A role can have assigned one of the following (from simple to complex):
Expand Down Expand Up @@ -64,7 +62,6 @@ When this role is to be added to a user, the administrator (oid 00000000-0000-00

Now let's have a look at more complex scenario.


=== Multi-level approval structure - Sensitive Role 2

A multi-level approval structure splits an approval process into one or more _levels_. These are passed through sequentially, from the first to the last; and at each level, participants in that level must approve creation of the assignment (otherwise, the assignment is rejected).
Expand Down Expand Up @@ -132,7 +129,6 @@ If he rejects, the level (and the whole process) is terminated without approval.
. Second, _both_ system administrator and security manager have to approve the assignment.
If one of them rejects, the whole process is terminated (even without waiting to get the opinion of the other one).


=== Dynamically defined approvers - Sensitive Role 3

What if we would want to state that a request must be approved by a boss of the person who is to be assigned a role? In that case we have to use an expression to specify the approver, like in the following example.
Expand All @@ -143,19 +139,18 @@ What if we would want to state that a request must be approved by a boss of the
xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3">
<name>Sensitive Role 3</name>
<approverExpression>
     <description>Get user's managers (except the user itself)</description>
        <script>
        <code>midpoint.getManagersOidsExceptUser(object)</code>
        </script>
    </approverExpression>
<description>Get user's managers (except the user itself)</description>
<script>
<code>midpoint.getManagersOidsExceptUser(object)</code>
</script>
</approverExpression>
<automaticallyApproved>
    <description>If the user works in F0006 (Scumm Bar), the assignment of this role is automatically approved for him.</description>
        <script>
        <code>midpoint.isMemberOf(object, midpoint.getOrgByName("F0006").getOid())</code>
<description>If the user works in F0006 (Scumm Bar), the assignment of this role is automatically approved for him.</description>
<script>
<code>midpoint.isMemberOf(object, midpoint.getOrgByName("F0006").getOid())</code>
</script>
</automaticallyApproved>
 </role>
</role>
----

Actually, we show two independent features in this example:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ The configuration looks like this:
<modelHookEnabled>true</modelHookEnabled> <!-- this is the default -->
<processCheckInterval>10</processCheckInterval> <!-- this is the default -->
<allowCompleteOthersItems>true</allowCompleteOthersItems> <!-- this is the default -->
 <primaryChangeProcessor>
<primaryChangeProcessor>
<enabled>true</enabled> <!-- this is the default -->
<addUserAbstractRoleAssignmentAspect>
<enabled>true</enabled> <!-- this is the default -->
Expand Down
2 changes: 1 addition & 1 deletion docs/cases/workflow-3/new-3-5-workflow-configuration.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ The configuration looks like this:
<workflowConfiguration>
<modelHookEnabled>true</modelHookEnabled> <!-- this is the default -->
<processCheckInterval>10</processCheckInterval> <!-- this is the default -->
 <primaryChangeProcessor>
<primaryChangeProcessor>
<enabled>true</enabled> <!-- this is the default -->
</primaryChangeProcessor>
</workflowConfiguration>
Expand Down
2 changes: 1 addition & 1 deletion docs/cases/workflow-3/workflow-notifications.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ Allocated to (before escalation): Guybrush Threepwood (guybrush)
Reason: Timed action
Deadline: Sun Nov 19 12:50:30 CET 2017 (...) 
Deadline: Sun Nov 19 12:50:30 CET 2017 (...)
----

[source]
Expand Down
2 changes: 1 addition & 1 deletion docs/concepts/iteration/unique-account-username.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ Example:

[source,xml]
----
  <postIterationCondition>
<postIterationCondition>
<variable>
<name>quote</name>
<path>$shadow/attributes/ri:quote</path>
Expand Down
16 changes: 8 additions & 8 deletions docs/diag/troubleshooting/mappings/index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ The basic flow goes like this:

[source]
----
Model -> Clockwork -+-> Projector -> Projector processors -> Mapping -> Expression  
Model -> Clockwork -+-> Projector -> Projector processors -> Mapping -> Expression
+-> Provisioning -> ConnId framework -> Connector -> Resource
----

Expand Down Expand Up @@ -102,13 +102,13 @@ Clockwork has a very convenient wiki:Useful+Loggers[logging] output:
----
###[ CLOCKWORK SUMMARY ]######################################
Triggered by focus primary delta ObjectDelta(UserType:c0c010c0-d34d-b33f-f00d-111111111111,MODIFY:
 PropertyDelta( / {.../common/common-3}organizationalUnit, REPLACE), PropertyDelta(metadata / {.../common/common-3}modifyTimestamp, REPLACE))
PropertyDelta( / {.../common/common-3}organizationalUnit, REPLACE), PropertyDelta(metadata / {.../common/common-3}modifyTimestamp, REPLACE))
Focus: focus(user:c0c010c0-d34d-b33f-f00d-111111111111(jack))
Projections (1):
 account(ID {.../connector/icf-1/resource-schema-3}uid = [ jack ], type 'default', resource:10000000-0000-0000-0000-000000000104(Dummy Resource Red)): KEEP
account(ID {.../connector/icf-1/resource-schema-3}uid = [ jack ], type 'default', resource:10000000-0000-0000-0000-000000000104(Dummy Resource Red)): KEEP
Executed:
 ObjectDelta(UserType:c0c010c0-d34d-b33f-f00d-111111111111,MODIFY: PropertyDelta( / {.../common/common-3}organizationalUnit, REPLACE), PropertyDelta(metadata / {.../common/common-3}modifyTimestamp, REPLACE)): SUCCESS
 ObjectDelta(ShadowType:a3ebbe89-227b-42ff-9d00-f42bee3cf151,MODIFY: PropertyDelta(attributes / {.../resource/instance-3}ship, REPLACE), PropertyDelta(metadata / {.../common/common-3}modifyTimestamp, REPLACE)): SUCCESS
ObjectDelta(UserType:c0c010c0-d34d-b33f-f00d-111111111111,MODIFY: PropertyDelta( / {.../common/common-3}organizationalUnit, REPLACE), PropertyDelta(metadata / {.../common/common-3}modifyTimestamp, REPLACE)): SUCCESS
ObjectDelta(ShadowType:a3ebbe89-227b-42ff-9d00-f42bee3cf151,MODIFY: PropertyDelta(attributes / {.../resource/instance-3}ship, REPLACE), PropertyDelta(metadata / {.../common/common-3}modifyTimestamp, REPLACE)): SUCCESS
##############################################################
----

Expand Down Expand Up @@ -178,13 +178,13 @@ The lens context dump looks like this:

[source]
----
 ---[ PROJECTOR (INITIAL) context projection values and credentials of resource:10000000-0000-0000-0000-000000000204(Dummy Resource Blue)(default) ]--------------------------------
---[ PROJECTOR (INITIAL) context projection values and credentials of resource:10000000-0000-0000-0000-000000000204(Dummy Resource Blue)(default) ]--------------------------------
LensContext: state=INITIAL, Wave(e=0,p=0,max=0), focus, 1 projections, 2 changes, fresh=true
Channel: null
  Options: null
Options: null
Settings: assignments=FULL
FOCUS:
  User, oid=c0c010c0-d34d-b33f-f00d-111111111116, syncIntent=null
User, oid=c0c010c0-d34d-b33f-f00d-111111111116, syncIntent=null
User old:
user: (c0c010c0-d34d-b33f-f00d-111111111116, v5, UserType) name: guybrush .....
----
Expand Down
6 changes: 3 additions & 3 deletions docs/interfaces/model-java/introduction.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ As midPoint objects are identified by wiki:Object+ID[OID] it is also the most im

[source,java]
----
 PrismObject<UserType> user = modelService.getObject(UserType.class, "6bb5c524-5c18-11e3-979a-001e8c717e5b", null, task, result);
PrismObject<UserType> user = modelService.getObject(UserType.class, "6bb5c524-5c18-11e3-979a-001e8c717e5b", null, task, result);
----

Once retrieved the object can be manipulated using any of the wiki:Prism+Objects[prism] "facets":
Expand All @@ -139,8 +139,8 @@ This works for any object of any type as long as you know wiki:Object+ID[OID]:

[source,java]
----
 PrismObject<ResourceType> resource = modelService.getObject(ResourceType.class, "750e4d3a-5c18-11e3-8174-001e8c717e5b", null, task, result);
PrismObject<ShadowType> account = modelService.getObject(ShadowType.class, "399e161c-5c19-11e3-9cd0-001e8c717e5b", null, task, result);
PrismObject<ResourceType> resource = modelService.getObject(ResourceType.class, "750e4d3a-5c18-11e3-8174-001e8c717e5b", null, task, result);
PrismObject<ShadowType> account = modelService.getObject(ShadowType.class, "399e161c-5c19-11e3-9cd0-001e8c717e5b", null, task, result);
----


Expand Down
4 changes: 2 additions & 2 deletions docs/interfaces/rest/index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,7 @@ The source files used here for the samples can be found at our git link:https://

[source,bash]
----
curl --user administrator:5ecr3t -H "Content-Type: application/xml" -X POST http://localhost:8080/midpoint/ws/rest/resources -d @pathToMidpointGit\samples\rest\opendj-resource-sync.xml -v
curl --user administrator:5ecr3t -H "Content-Type: application/xml" -X POST http://localhost:8080/midpoint/ws/rest/resources -d @pathToMidpointGit\samples\rest\opendj-resource-sync.xml -v
----


Expand All @@ -666,7 +666,7 @@ curl --user administrator:5ecr3t -X GET http://localhost:8080/midpoint/ws/rest/r
.Get Object in JSON format
[source,bash]
----
curl --user administrator:5ecr3t -H "Accept: application/json"  -X GET https://demo.evolveum.com:443/midpoint/ws/rest/resources/ef2bc95b-76e0-48e2-86d6-3d4f02d3e1a2
curl --user administrator:5ecr3t -H "Accept: application/json" -X GET https://demo.evolveum.com:443/midpoint/ws/rest/resources/ef2bc95b-76e0-48e2-86d6-3d4f02d3e1a2
----


Expand Down
2 changes: 1 addition & 1 deletion docs/legacy/reports-via-rest.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ It returns the task, as can be seen from the invocation:
<status>success</status>
<token>1000000000000010750</token>
...
 </apti:result>
</apti:result>
</t:object>
----
Expand Down
1 change: 0 additions & 1 deletion docs/legacy/sso/midpoint-and-sso-using-gluu-howto.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ ProxyRequests Off
ProxyPreserveHost On
ProxyPass /midpoint http://localhost:8080/midpoint
ProxyPassReverse /midpoint http://localhost:8080/midpoint
 
----


Expand Down
2 changes: 1 addition & 1 deletion docs/misc/notifications/configuration/index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ For the time being, here we show a sample configuration, hopefully self-explanat
. . .
</server>
 <defaultFrom>abc@gmail.com</defaultFrom>
<defaultFrom>abc@gmail.com</defaultFrom>
<debug>true</debug> <!-- standard javax.mail debugging; it is going to stdout (catalina.out)! -->
<logToFile>mail-notifications.log</logToFile> <!-- All notifications are logged to this file IN ADDITION TO sending them via mail. They are
logged in all cases: even if they eventually cannot be send. Implemented since 3.6.1. -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ E.g. the following mapping will pre-provision a disabled account 5 days before u

[source,xml]
----
  <resource>
<resource>
<schemaHandling>
<objectType>
...
Expand Down
8 changes: 4 additions & 4 deletions docs/resources/resource-configuration/synchronization.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ The configuration also includes a lot of optional elements such as `kind`, `inte
----
<resource>
...
 <synchronization>
<synchronization>
<objectSynchronization>
<name>Account sync policy</name>
Expand Down Expand Up @@ -424,7 +424,7 @@ This setup will create a new midPoint role when a new group is detected on the r
----
<resource>
...
 <synchronization>
<synchronization>
...
<objectSynchronization>
<name>Group sync policy</name>
Expand Down Expand Up @@ -490,7 +490,7 @@ Please note the specification of `intent` in the `objectSynchronization` section
.objectSynchronization condition example
[source,xml]
----
  <synchronization>
<synchronization>
<objectSynchronization>
<objectClass>ri:AccountObjectClass</objectClass>
<kind>account</kind>
Expand Down Expand Up @@ -534,7 +534,7 @@ In that case a minimal synchronization section will do:

[source,xml]
----
  <synchronization>
<synchronization>
<objectSynchronization>
<name>sync group</name>
<objectClass>ri:group</objectClass>
Expand Down
2 changes: 1 addition & 1 deletion docs/samples/configurable-transform-sample/index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ The spelling alphabet transforms are stored in the object extensions, like this:
.Org extension example
[source,xml]
----
 <org>
<org>
<name>International</name>
<extension>
<e:transformDescription>International spelling alphabet</e:transformDescription>
Expand Down
2 changes: 1 addition & 1 deletion docs/tasks/custom-task-java.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public class MyTaskHandler implements TaskHandler {
@Autowired(required=true)
private TaskManager taskManager;
  @PostConstruct
@PostConstruct
private void initialize() {
taskManager.registerHandler(HANDLER_URI, this);
}
Expand Down
2 changes: 1 addition & 1 deletion docs/upgrade/connectors/csvfile-connector-migration.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ The wiki:Shadow+Objects[shadows] in the old connector looked like this:
<icfs:name>007</icfs:name>
<icfs:uid>007</icfs:uid>
<ri:username>foo</ri:username>
 <ri:fullname>Foo Bar</ri:fullname>
<ri:fullname>Foo Bar</ri:fullname>
...
</attributes>
</shadow>
Expand Down

0 comments on commit 965e047

Please sign in to comment.