Merge branch 'master' of https://github.com/Evolveum/midpoint

Evolveum · Oct 21, 2019 · ffdf2e5 · ffdf2e5
2 parents 394a00e + 8c2eb4b
commit ffdf2e5
Show file tree

Hide file tree

Showing 8 changed files with 69 additions and 14 deletions.
diff --git a/config/initial-objects/000-system-configuration.xml b/config/initial-objects/000-system-configuration.xml
@@ -131,6 +131,42 @@
                     <level>normal</level>
                 </tracingTypeProfile>
             </profile>
+            <profile>
+                <name>functional-model-logging</name>
+                <displayName>Functional tracing (with model logging)</displayName>
+                <visible>true</visible>
+                <fileNamePattern>functional-trace %{timestamp} %{focusName}</fileNamePattern>
+                <createRepoObject>true</createRepoObject>
+                <compressOutput>true</compressOutput>
+                <collectLogEntries>true</collectLogEntries>
+                <loggingOverride>
+                    <levelOverride>
+                        <logger>com.evolveum.midpoint.model</logger>
+                        <level>TRACE</level>
+                    </levelOverride>
+                </loggingOverride>
+                <tracingTypeProfile>
+                    <level>normal</level>
+                </tracingTypeProfile>
+            </profile>
+            <profile>
+                <name>functional-sql-logging</name>
+                <displayName>Functional tracing (with SQL logging)</displayName>
+                <visible>true</visible>
+                <fileNamePattern>functional-trace %{timestamp} %{focusName}</fileNamePattern>
+                <createRepoObject>true</createRepoObject>
+                <compressOutput>true</compressOutput>
+                <collectLogEntries>true</collectLogEntries>
+                <loggingOverride>
+                    <levelOverride>
+                        <logger>org.hibernate.SQL</logger>
+                        <level>TRACE</level>
+                    </levelOverride>
+                </loggingOverride>
+                <tracingTypeProfile>
+                    <level>normal</level>
+                </tracingTypeProfile>
+            </profile>
         </tracing>
     </internals>
     <adminGuiConfiguration>

diff --git a/config/initial-objects/040-role-enduser.xml b/config/initial-objects/040-role-enduser.xml
@@ -7,7 +7,8 @@
   -->
 <role oid="00000000-0000-0000-0000-000000000008"
       xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-      xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3">
+      xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3"
+      xmlns:org="http://midpoint.evolveum.com/xml/ns/public/common/org-3">
     <name>End user</name>
     <description>Role authorizing end users to log in, change their passwords and review assigned accounts. Note: This role definition is just an example. It should be tailored for each specific deployment.</description>
     <!--
@@ -141,6 +142,7 @@
                 </q:equal>
             </filter>
         </target>
+        <relation>org:default</relation>        <!-- only assignments with the default (member) relation can be requested -->
     </authorization>
     <authorization>
         <name>self-execution-modify</name>
@@ -238,11 +240,16 @@
         <object>
             <type>TaskType</type>
             <filter>
-                <q:equal>
-                    <q:path>handlerUri</q:path>
-                    <q:value>http://midpoint.evolveum.com/xml/ns/public/model/synchronization/task/execute/handler-3</q:value>
-                    <q:value>http://midpoint.evolveum.com/xml/ns/public/model/iterative-scripting/handler-3</q:value>    <!-- members-related operations -->
-                </q:equal>
+                <q:or>
+                    <q:equal>
+                        <q:path>handlerUri</q:path>
+                        <q:value>http://midpoint.evolveum.com/xml/ns/public/model/synchronization/task/execute/handler-3</q:value>
+                    </q:equal>
+                    <q:equal>
+                        <q:path>handlerUri</q:path>
+                        <q:value>http://midpoint.evolveum.com/xml/ns/public/model/iterative-scripting/handler-3</q:value>    <!-- members-related operations -->
+                    </q:equal>
+                </q:or>
             </filter>
             <owner>
                 <special>self</special>

diff --git a/config/initial-objects/100-report-reconciliation.xml b/config/initial-objects/100-report-reconciliation.xml
diff --git a/config/initial-objects/130-report-certification-definitions.xml b/config/initial-objects/130-report-certification-definitions.xml
diff --git a/config/initial-objects/140-report-certification-campaigns.xml b/config/initial-objects/140-report-certification-campaigns.xml
diff --git a/config/initial-objects/150-report-certification-cases.xml b/config/initial-objects/150-report-certification-cases.xml
diff --git a/config/initial-objects/160-report-certification-decisions.xml b/config/initial-objects/160-report-certification-decisions.xml
diff --git a/.../main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueChoosePanel.java b/.../main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueChoosePanel.java
@@ -251,7 +251,7 @@ protected void initButtons(ListItem<T> item, WebMarkupContainer parent) {
         WebMarkupContainer buttonGroup = new WebMarkupContainer(ID_BUTTON_GROUP);
         buttonGroup.setOutputMarkupId(true);
 
-        AjaxLink<Void> remove = new AjaxLink<>(ID_REMOVE) {
+        AjaxLink<Void> remove = new AjaxLink<Void>(ID_REMOVE) { // Explicit <Void> needed for Java8
 
             @Override
             public void onClick(AjaxRequestTarget target) {