Skip to content

Commit

Permalink
few more fixes of leftover \* uses from Confluence
Browse files Browse the repository at this point in the history
  • Loading branch information
virgo47 committed Feb 1, 2022
1 parent f3225f0 commit 6a3fa1a
Show file tree
Hide file tree
Showing 18 changed files with 144 additions and 135 deletions.
14 changes: 7 additions & 7 deletions docs/cases/workflow-3/legacy-pre-3-5-workflow-configuration.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ Default: the same as for repository configuration (it is true if hibernateHbm2dd


| autoDeploymentFrom
| MidPoint automatically deploys new versions of BPMN processes at startup.
a| MidPoint automatically deploys new versions of BPMN processes at startup.
Here you can specify the location from which the deploy is done.
Default: classpath\*:processes/\*.bpmn20.xml.
Default: `classpath*:processes/*.bpmn20.xml`.


|===
Expand Down Expand Up @@ -190,22 +190,22 @@ Use at least the following content: <enabled>true</enabled>.

| addAbstractRoleAbstractRoleAssignmentAspect
| Manages creation of role/org assignment to a role/org.
| (\*2)
| (*2)


| modifyAbstractRoleAbstractRoleAssignmentAspect
| Manages modification of role/org assignment to a role/org.
| (\*2)
| (*2)


| addAbstractRoleResourceAssignmentAspect
| Manages creation of resource assignment to a role/org.
| (\*2)
| (*2)


| modifyAbstractRoleResourceAssignmentAspect
| Manages modification of resource assignment to a role/org.
| (\*2)
| (*2)


| addAbstractRoleAspect
Expand All @@ -220,7 +220,7 @@ Use at least the following content: <enabled>true</enabled>.

| addResourceAspect
| Manages creation of a new resource.
| (\*3)
| (*3)


| modifyAbstractRoleAspect
Expand Down
4 changes: 2 additions & 2 deletions docs/cases/workflow-3/new-3-5-workflow-configuration.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ Default: the same as for repository configuration (it is true if hibernateHbm2dd


| autoDeploymentFrom
| MidPoint automatically deploys new versions of BPMN processes at startup.
a| MidPoint automatically deploys new versions of BPMN processes at startup.
Here you can specify the location from which the deploy is done.
Default: classpath\*:processes/\*.bpmn20.xml.
Default: `++classpath*:processes/*.bpmn20.xml++`.


|===
Expand Down
7 changes: 4 additions & 3 deletions docs/diag/logging/log-viewer/index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ It is either current line, whole log entry, or header (first line) of the log en
If not specified, a reasonable default is used (most often "line", but e.g. in %kill-entry the whole entry is considered by default).
Text is either plain text (for containing/not-containing operator) or a regular expression (for matching/not-matching operator).
Do not forget to include .\* at beginning and end if you want to match for something inside a line/entry.
Do not forget to include `.*` at beginning and end if you want to match for something inside a line/entry.
====

Expand Down Expand Up @@ -655,11 +655,12 @@ To ensure completeness of the data it is advised to have only following class lo
----

Other class loggers of type com.evolveum.midpoint.model.\* should be removed from systems configuration as they would interfere with com.evolveum.midpoint.model classLogger.
Other class loggers of type `com.evolveum.midpoint.model.*` should be removed from systems configuration
as they would interfere with `classLogger` for `com.evolveum.midpoint.model`.


== Concluding remark

This plugin is currently just a prototype.
It may or may not work as expected.
We would be grateful for any comments, suggestions, or error reports.
We would be grateful for any comments, suggestions, or error reports.
6 changes: 3 additions & 3 deletions docs/interfaces/rest/index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -276,16 +276,16 @@ The following formats and related media types are supported:
| Format | Media type

| XML
| `application/xml`, `application/*+xml`, `text/xml`
| `application/xml`, `++application/*+xml++`, `text/xml`


| JSON
| `application/json`


| YAML
| `application/yaml`, `application/yml`, `application/\*+yaml`, `application/*+yml` +
`text/yaml`, `text/yml`, `text/\*+yaml`, `text/*+yml` +
| `application/yaml`, `application/yml`, `++application/*+yaml++`, `++application/*+yml++`,
`text/yaml`, `text/yml`, `++text/*+yaml++`, `++text/*+yml++` +
Note: There is no official registered media type.


Expand Down
59 changes: 36 additions & 23 deletions docs/legacy/demo/upgrade-howto.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -136,32 +136,45 @@ This is command what the dc=example,dc=com DIT looks like:
ldapsearch -x -LLL -H link:ldap://wiki.evolveum.com/[ldap:///] -b dc=example,dc=com dn +
----

. *Midpoint 3.0**installation.* Check also: xref:/midpoint/guides/midpoint-on-ubuntu-tomcat-postgresql-howto/[] +
. *Midpoint 3.0 installation.* Check also: xref:/midpoint/guides/midpoint-on-ubuntu-tomcat-postgresql-howto/[] +
Download midpoint last recent version via command: +
sudo wget "link:http://athena.evolveum.com/builds/master/build2781-v3.0.1devel-15-g0c62837/midpoint-3.1-SNAPSHOT-dist.tar.gz[athena.evolveum.com/builds/master/build2781-v3.0.1devel-15-g0c62837/midpoint-3.1-SNAPSHOT-dist.tar.gz]" +
+
Unpack the file via command: +
sudo tar -zxvf \*/midpoint-3.1-SNAPSHOT-dist.tar.gz +
+
Create midPoint home directory and also make sure it can be accessed by tomcat: +
+
Unpack the file via command:
+
----
sudo tar -zxvf */midpoint-3.1-SNAPSHOT-dist.tar.gz +
----
+
Create midPoint home directory and also make sure it can be accessed by tomcat:
+
----
sudo mkdir /opt/midpoint-home +
sudo chown link:http://tomcat7tomcat7[tomcat7:tomcat7] /opt/midpoint-home +
+
Add JAVA_OPTS="$JAVA_OPTS -server -Xms256m -Xmx1024m -XX:PermSize=128m -XX:MaxPermSize=256m -Dmidpoint.home=/opt/midpoint-home/" into catalina.sh file via command: +
----
+
Add `JAVA_OPTS="$JAVA_OPTS -server -Xms256m -Xmx1024m -XX:PermSize=128m -XX:MaxPermSize=256m -Dmidpoint.home=/opt/midpoint-home/"` into `catalina.sh` file via command:
+
----
sudo vim /usr/share/tomcat7/bin/catalina.sh +
+
Copy midpoint.war in tomcat7 via command: +
sudo cp \*/midpoint-3.1-SNAPSHOT/war/midpoint.war /var/lib/tomcat7/webapps +
+
NOTE: +
For stable release check: +
- the latest midpoint link:http://www.evolveum.com/downloads/midpoint/3.0/[http://www.evolveum.com/downloads/midpoint/3.0/] +
- and download midpoint-3.0-dist.zip +
+
For snapshot check: +
- the latest commit number on link:https://bamboo.evolveum.com/browse/MID-TRUNK/latestSuccessful[https://bamboo.evolveum.com/browse/MID-TRUNK/latestSuccessful] +
- and download it via link:http://athena.evolveum.com/builds/master/[http://athena.evolveum.com/builds/master/] where .zip file should be selected (midpoint-3.1-SNAPSHOT-dist.zip). +
\=================================================================================================================================================================
----
+
Copy midpoint.war in tomcat7 via command:
+
----
sudo cp */midpoint-3.1-SNAPSHOT/war/midpoint.war /var/lib/tomcat7/webapps
----
+
[NOTE]
====
For stable release check:
* the latest midpoint link:http://www.evolveum.com/downloads/midpoint/3.0/[http://www.evolveum.com/downloads/midpoint/3.0/]
* and download midpoint-3.0-dist.zip
For snapshot check:
* the latest commit number on link:https://bamboo.evolveum.com/browse/MID-TRUNK/latestSuccessful[https://bamboo.evolveum.com/browse/MID-TRUNK/latestSuccessful]
* and download it via link:http://athena.evolveum.com/builds/master/[http://athena.evolveum.com/builds/master/] where .zip file should be selected (midpoint-3.1-SNAPSHOT-dist.zip).
====

. *Apache**install.* Check also: xref:/midpoint/guides/midpoint-on-ubuntu-tomcat-postgresql-howto/[] +
Install apache2 via command: sudo apt-get install apache2 +
Expand Down Expand Up @@ -249,7 +262,7 @@ ubuntu@link:http://ubuntu-i386/opt/opendj/OpenDJ-2.5.0-Xpress1/$[ubuntu-i386:/op
+
And: +
ubuntu@link:http://ubuntu-i386/opt/opendj/OpenDJ-2.5.0-Xpress1/$[ubuntu-i386:/opt/opendj/OpenDJ-2.5.0-Xpress1/$] bin/ldapsearch -D cn=directory\ manager -w secret -h 10.0.2.15 -p 1389 +
-J "1.3.6.1.4.1.26027.1.5.4:false:;" -b "cn=changelog" '(objectclass=\*)' +
-J "1.3.6.1.4.1.26027.1.5.4:false:;" -b "cn=changelog" '(objectclass=*)' +
\=================================================================================================================================================================

. *Add further .ldif files* via, check also link:http://opendj.forgerock.org/opendj-server/doc/admin-guide/index/chap-groups.html[http://opendj.forgerock.org/opendj-server/doc/admin-guide/index/chap-groups.html]: +
Expand All @@ -268,7 +281,7 @@ ubuntu@link:http://ubuntu-i386/opt/opendj/OpenDJ-2.5.0-Xpress1/bin$[ubuntu-i386:

. In case you *need to check LDAP schema or search* some element use command: +
Check all: +
ubuntu@link:http://ubuntu-i386/opt/opendj/OpenDJ-2.5.0-Xpress1/bin$[ubuntu-i386:/opt/opendj/OpenDJ-2.5.0-Xpress1/bin$] ldapsearch -x -h localhost -p 1389 -b "dc=example,dc=com" -s sub "objectclass=\*" +
ubuntu@link:http://ubuntu-i386/opt/opendj/OpenDJ-2.5.0-Xpress1/bin$[ubuntu-i386:/opt/opendj/OpenDJ-2.5.0-Xpress1/bin$] ldapsearch -x -h localhost -p 1389 -b "dc=example,dc=com" -s sub "objectclass=*" +
+
Check selected element: +
ubuntu@link:http://ubuntu-i386/opt/opendj/OpenDJ-2.5.0-Xpress1/bin$[ubuntu-i386:/opt/opendj/OpenDJ-2.5.0-Xpress1/bin$] ldapsearch -x -h localhost -p 1389 -b "dc=example,dc=com" "cn=Testi Testini" +
Expand Down
10 changes: 5 additions & 5 deletions docs/legacy/eclipse-plugin/index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -358,16 +358,16 @@ image::image2016-9-7-17-5-0.png[]

For each file, four results are provided:

. local version of the file, normalized into midPoint representation: macros resolved, parsed and reserialized by midPoint (\*.local.xml),
. local version of the file, normalized into midPoint representation: macros resolved, parsed and reserialized by midPoint (`*.local.xml`),

. remote version of the file (\*.remote.xml),
. remote version of the file (`*.remote.xml`),

. delta from local to remote version (\*.local-to-remote.xml),
. delta from local to remote version (`*.local-to-remote.xml`),

. delta from remote to local version (\*.remote-to-local.xml).
. delta from remote to local version (`*.remote-to-local.xml`).

These files can be accessed by clicking on links in the console window, of by directly opening the files in "diff" directory.
Note that it is possible to use Eclipse mechanisms to compare local and remote versions of the file, leading to a graphical information about the changes:
Note that it is possible to use Eclipse mechanisms to compare local and remote versions of the file, leading to graphical information about the changes:

image::image2016-9-20-10-2-48.png[]

Expand Down
13 changes: 4 additions & 9 deletions docs/legacy/repo-ninja.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ Save the script and run it.

NOTE:

When extracting repo-ninja-3.1-SNAPSHOT-bin.zip file in `\*/midpoint-home/bin`, **check `repo-ninja.bat` file**, which content has to be following (please set your own path for midpoint-home):
When extracting repo-ninja-3.1-SNAPSHOT-bin.zip file in `++*/midpoint-home/bin++`, **check `repo-ninja.bat` file**,
which content has to be following (please set your own path for midpoint-home):

[source,bat]
----
Expand All @@ -45,7 +46,7 @@ BASEDIR="`dirname \"$0\"`/.."
exec java -classpath "$BASEDIR/lib/*" -Dmidpoint.home=$MIDPOINT_HOME com.evolveum.midpoint.tools.ninja.Main $*
----

Also *verify up to date repo-ninja driver version* in \*\midpoint-home\lib such as repo-ninja-3.1-SNAPSHOT.jar (*has to be only one version in lib file because of mismatch risk*).
Also *verify up to date repo-ninja driver version* in `++*\midpoint-home\lib++` such as repo-ninja-3.1-SNAPSHOT.jar (*has to be only one version in lib file because of mismatch risk*).

The script is provided mainly for restoring your previously-backed up repository (*execute script when tomcat is turned off*):

Expand All @@ -59,7 +60,6 @@ Windows:
*\midpoint-home\bin>repo-ninja.bat -i *\Downloads\export.xml
----


== Running the Repo Ninja: Sources

If for whatever reason you don't want to run Repo Ninja from distribution package, you can also run it as a runnable JAR archive.
Expand All @@ -85,7 +85,6 @@ Use it carefully.
====


== Repo Ninja Usages

The following options and examples document the usage of Repo Ninja.
Expand All @@ -102,10 +101,9 @@ Use options:
----

<hibernateHbm2ddl> option in config.xml in MidPoint configuration should be set to *validate*. +
Ninja tries to load spring contexts with Repository service.
Ninja tries to load spring contexts with Repository service.
This operation finishes with SUCCESS (if connection to database and database schema looks right) or FAILURE.


=== SQL script execution

Use options:
Expand All @@ -120,7 +118,6 @@ Use options:
-u <jdbc url>
----


=== Export midPoint objects to XML file (Create backup)

[source]
Expand All @@ -129,7 +126,6 @@ Use options:
-Dmidpoint.home=<midpoint configuration folder>
----


=== Import midPoint objects from XML file (Restore from backup)

[source]
Expand All @@ -138,7 +134,6 @@ Use options:
-Dmidpoint.home=<midpoint configuration folder>
----


=== Known problems

. Repository validation fails when MidPoint configuration uses <dataSource> and doesn't contain simple JDBC connection parameters.
Expand Down
4 changes: 2 additions & 2 deletions docs/legacy/sso/index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ MidPoit does not yet support STS and/or OAuth.
Therefore the services are still limited to username/password authentication.
However do not forget to specify SSO enforcement exceptions (e.g. non-enforcement list) for the service URLs:

.. /model/\* and /ws/\* for web services
.. `++/model/*++` and `++/ws/*++` for web services

.. /rest/\* for REST service
.. `++/rest/*++` for REST service

== See Also

Expand Down
28 changes: 14 additions & 14 deletions docs/misc/bulk/index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -234,42 +234,42 @@ Currently, there are the following actions:

| add
| Adds an object coming as input to the repository, which must be a PrismObject.
(\***)
(++***++)
| -
| -


| modify
| Modifies an object coming as input, which must be a PrismObject.
(\*) (\***)
(++*++) (++***++)
| delta
| Delta to be applied to the object.


| delete
| Deletes an object coming as input, which must be a PrismObject.
(\*) (\***)
(++*++) (++***++)
| -
| -


| enable, disable
| Enables or disables an object coming as input (must be a FocusType or ShadowType).
(\*) (\***)
(++*++) (++***++)
| -
| -


.3+| assign
.3+| Assigns a role or a resource account to a FocusType.
(\*) (\***)
(++*++) (++***++)
| resource
| Resource(s) on which account(s) have to be assigned.
\**
++**++
| role
| Role(s) to be assigned. **
| Role(s) to be assigned. ++**++
| relation
Expand All @@ -279,22 +279,22 @@ Currently, there are the following actions:
.3+| unassign
.3+| Unassigns a role or a resource account from a FocusType.
(\*) (\***)
(++*++) (++***++)
| resource
| Resource(s) to be unassigned. \**
| Resource(s) to be unassigned. ++**++
| role
| Role(s) to be unassigned.
\**
++**++
| relation
| Relation(s) defines the relation to the assignee, e.g. default, manager, any ...
| recompute
| Recomputes a user (must be PrismObject<UserType>). (\*) (\***)
| Recomputes a user (must be PrismObject<UserType>). (++*++) (++***++)
| -
| -
Expand Down Expand Up @@ -398,12 +398,12 @@ Default is "add".
|===
(\*) In the future these actions will support also PrismReferences instances as their input.
(++*++) In the future these actions will support also PrismReferences instances as their input.
(\**) These are to be specified as PrismObjects, PrismReferences, or PrismProperties encapsulating either ObjectReferenceTypes or Strings (understood as OIDs - in the future, string containing resource/role names could be accepted as well).
(++**++) These are to be specified as PrismObjects, PrismReferences, or PrismProperties encapsulating either ObjectReferenceTypes or Strings (understood as OIDs - in the future, string containing resource/role names could be accepted as well).
Since 3.7 it is possible to specify queries or search filters here, so it is possible to assign role/resource by its name (see link:https://github.com/Evolveum/midpoint/blob/master/samples/tasks/bulk-actions/assign-enduser-role-to-selected-users-no-approval.xml[this sample]).
(\***) Since 3.5, these actions support `dryRun` parameter that (if set to "true") causes executing "preview changes" instead of real modifications.
(++***++) Since 3.5, these actions support `dryRun` parameter that (if set to "true") causes executing "preview changes" instead of real modifications.
They also (except for recompute) support `raw` parameter for applying the operation in raw mode.
And since 3.7 these actions (again except for recompute) support `skipApprovals` parameter, and `options` parameter, as a generalization of these two (`raw`, `skipApprovals`) that can be used to set arbitrary model execution options (see link:https://github.com/Evolveum/midpoint/blob/master/samples/tasks/bulk-actions/assign-enduser-role-to-selected-users-no-approval.xml[this sample]).
Expand Down

0 comments on commit 6a3fa1a

Please sign in to comment.