From fbbeafde4ceee74bc6bebc5503c3d885e22e8a50 Mon Sep 17 00:00:00 2001
From: kate <honchar@evolveum.com>
Date: Fri, 7 Sep 2018 09:53:06 +0200
Subject: [PATCH 01/11] MID-4867 type fix for org members panel query

---
 .../midpoint/web/page/admin/users/component/OrgMemberPanel.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
index 3548f0cca1f..a27fea1336d 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
@@ -77,6 +77,7 @@ protected ObjectQuery createMemberQuery(boolean indirect, Collection<QName> rela
 			else {
 				ObjectReferenceType ref = MemberOperationsHelper.createReference(getModelObject(), getSelectedRelation());
 				return QueryBuilder.queryFor(searchType.getClassDefinition(), getPageBase().getPrismContext())
+						.type(searchType.getClassDefinition())
 						.isDirectChildOf(ref.asReferenceValue()).build();
 			}
 		}
@@ -85,6 +86,7 @@ protected ObjectQuery createMemberQuery(boolean indirect, Collection<QName> rela
 
 		ObjectReferenceType ref = MemberOperationsHelper.createReference(getModelObject(), getSelectedRelation());
 		ObjectQuery query = QueryBuilder.queryFor(searchType.getClassDefinition(), getPageBase().getPrismContext())
+				.type(searchType.getClassDefinition())
 				.isChildOf(ref.asReferenceValue()).build();
 
 		if (LOGGER.isTraceEnabled()) {

From b0103971d63584183265783bb65ea34facfc87a5 Mon Sep 17 00:00:00 2001
From: Viliam Repan <vilo.repan@evolveum.com>
Date: Fri, 7 Sep 2018 10:23:48 +0200
Subject: [PATCH 02/11] pom cleanup, prepared for maven overlay. midpoint
 executable war now with classifier=executable

---
 dist/pom.xml          |  1 +
 gui/admin-gui/pom.xml | 72 ++++++++++++++++++++++++-------------------
 2 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/dist/pom.xml b/dist/pom.xml
index b26b4124a33..066b2adbfa8 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -53,6 +53,7 @@
             <artifactId>admin-gui</artifactId>
             <version>3.9-SNAPSHOT</version>
             <type>war</type>
+            <classifier>executable</classifier>
         </dependency>
         <dependency>
             <groupId>com.evolveum.midpoint.tools</groupId>
diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml
index 1fa667be097..973bf361966 100644
--- a/gui/admin-gui/pom.xml
+++ b/gui/admin-gui/pom.xml
@@ -104,35 +104,6 @@
                 </includes>
             </testResource>
         </testResources>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring.boot.version}</version>
-                <configuration>
-                    <fork>true</fork>
-                    <skip>false</skip>
-                    <jvmArguments>-Dserver.port=${server.port} -Dmidpoint.home=${midpoint.home} -Dmidpoint.schrodinger=${midpoint.schrodinger} -Djavax.net.ssl.trustStore=${javax.net.ssl.trustStore} -Djavax.net.ssl.trustStoreType=${javax.net.ssl.trustStoreType}</jvmArguments><!-- TODO question: CAN this argument be active by default, or should be there a different profile defined for this? -->
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                        <configuration>
-                            <layoutFactory implementation="com.evolveum.midpoint.tools.layout.MidPointWarLayoutFactory"/>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>com.evolveum.midpoint</groupId>
-                        <artifactId>midpoint-war-layout</artifactId>
-                        <version>${project.version}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
     </build>
 
     <dependencies>
@@ -911,13 +882,52 @@
             <version>3.9-SNAPSHOT</version>
         </dependency>
     </dependencies>
+
     <profiles>
         <profile>
-            <id>tomcat</id>
+            <id>executable</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.springframework.boot</groupId>
+                        <artifactId>spring-boot-maven-plugin</artifactId>
+                        <version>${spring.boot.version}</version>
+                        <configuration>
+                            <fork>true</fork>
+                            <skip>false</skip>
+                            <jvmArguments>-Dserver.port=${server.port} -Dmidpoint.home=${midpoint.home} -Dmidpoint.schrodinger=${midpoint.schrodinger} -Djavax.net.ssl.trustStore=${javax.net.ssl.trustStore} -Djavax.net.ssl.trustStoreType=${javax.net.ssl.trustStoreType}</jvmArguments><!-- TODO question: CAN this argument be active by default, or should be there a different profile defined for this? -->
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>repackage</goal>
+                                </goals>
+                                <configuration>
+                                    <classifier>executable</classifier>
+                                    <layoutFactory implementation="com.evolveum.midpoint.tools.layout.MidPointWarLayoutFactory"/>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <dependency>
+                                <groupId>com.evolveum.midpoint</groupId>
+                                <artifactId>midpoint-war-layout</artifactId>
+                                <version>${project.version}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
 
+        <profile>
+            <id>tomcat</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <dependencies>
                 <dependency>
                     <artifactId>jaxb-impl</artifactId>
@@ -934,8 +944,8 @@
                     <scope>runtime</scope>
                 </dependency>
             </dependencies>
-
         </profile>
+
         <profile>
             <!-- can be used for development e.g. in Intellij Idea -->
             <id>ide</id>

From 9fdee6719c971a4b3809c06786d779677d927146 Mon Sep 17 00:00:00 2001
From: Katarina Valalikova <k.valalikova@evolveum.com>
Date: Fri, 7 Sep 2018 10:57:52 +0200
Subject: [PATCH 03/11] fix for MID-4876 - resource wizard, configuration step

---
 .../web/component/prism/PrismContainerValueHeaderPanel.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.java
index 7fcb7244f84..2d44ec9f957 100755
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.java
@@ -191,9 +191,11 @@ public boolean isVisible(){
 		childContainersSelectorPanel.setOutputMarkupId(true);
 		add(childContainersSelectorPanel);
 		
+		
+		Class<C> compileTimeClass = getModelObject().getContainerValue().getCompileTimeClass();
 		DropDownChoicePanel multivalueContainersList = new DropDownChoicePanel<>(ID_CHILD_CONTAINERS_LIST,
 				Model.of(pathsList.size() > 0 ? pathsList.get(0) : null), Model.ofList(pathsList),
-				new QNameIChoiceRenderer(getModelObject().getContainerValue().getValue().getClass().getSimpleName()));
+				new QNameIChoiceRenderer(compileTimeClass != null ? compileTimeClass.getSimpleName() : ""));
 		multivalueContainersList.setOutputMarkupId(true);
 		multivalueContainersList.getBaseFormComponent().add(new EmptyOnBlurAjaxFormUpdatingBehaviour());
 		childContainersSelectorPanel.add(multivalueContainersList);

From 575aa06ccdaba952bf38251367d322fc96d3f0a2 Mon Sep 17 00:00:00 2001
From: Katarina Valalikova <k.valalikova@evolveum.com>
Date: Fri, 7 Sep 2018 11:19:08 +0200
Subject: [PATCH 04/11] fix for MID-4386 Multitab: projections

---
 .../evolveum/midpoint/web/component/prism/PrismWrapper.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismWrapper.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismWrapper.java
index 940defd0231..75386fa2b33 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismWrapper.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismWrapper.java
@@ -4,7 +4,9 @@ public abstract class PrismWrapper {
 
 	
 	 	private boolean showEmpty;
-	    private boolean minimalized;
+	 	
+	 	@Deprecated //used only for projections, after switching projection to table, remove it.
+	 	private boolean minimalized=true;
 	    private boolean sorted;
 	    private boolean showMetadata;
 	    private boolean expanded = true;

From 8d30aab651bcfbdd214025d8dfcfe641db51ed4d Mon Sep 17 00:00:00 2001
From: Katarina Valalikova <k.valalikova@evolveum.com>
Date: Fri, 7 Sep 2018 13:05:42 +0200
Subject: [PATCH 05/11] fix for MID-3518 and MID-3596

---
 .../admin/configuration/PageDebugView.java    | 42 ++++++++++++-------
 .../static/js/midpoint/ace-editor.js          |  6 ++-
 2 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
index 1376dd64053..8a5db34e4f3 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
@@ -38,10 +38,12 @@
 import com.evolveum.midpoint.web.component.AjaxButton;
 import com.evolveum.midpoint.web.component.AjaxSubmitButton;
 import com.evolveum.midpoint.web.component.input.DataLanguagePanel;
+import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
 import com.evolveum.midpoint.web.page.admin.dto.ObjectViewDto;
 import com.evolveum.midpoint.web.security.MidPointApplication;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.BooleanUtils;
 import org.apache.wicket.RestartResponseException;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
@@ -75,14 +77,14 @@ public class PageDebugView extends PageAdminConfiguration {
 
     public static final String PARAM_OBJECT_ID = "objectId";
     public static final String PARAM_OBJECT_TYPE = "objectType";
-    private AceEditor editor;
+//    private AceEditor editor;
     private final IModel<Boolean> encrypt = new Model<>(true);
     private final IModel<Boolean> saveAsRaw = new Model<>(true);
     private final IModel<Boolean> reevaluateSearchFilters = new Model<>(false);
     private final IModel<Boolean> validateSchema = new Model<>(false);
     private final IModel<Boolean> switchToPlainText = new Model<>(false);
     private TextArea<String> plainTextarea;
-    final Form mainForm = new com.evolveum.midpoint.web.component.form.Form("mainForm");
+//    final Form mainForm = new com.evolveum.midpoint.web.component.form.Form("mainForm");
     private String dataLanguage;
     private boolean isInitialized = false;
     private IModel<ObjectViewDto> objectViewDtoModel;
@@ -186,6 +188,7 @@ protected ObjectViewDto load() {
     }
 
     private void initLayout() {
+    	final Form mainForm = new com.evolveum.midpoint.web.component.form.Form("mainForm");
         add(mainForm);
 
         mainForm.add(new AjaxCheckBox("encrypt", encrypt) {
@@ -220,13 +223,13 @@ protected void onUpdate(AjaxRequestTarget target) {
 
             @Override
             protected void onUpdate(AjaxRequestTarget target) {
-                if (switchToPlainText.getObject()){
-                    editor.setVisible(false);
-                    plainTextarea.setVisible(true);
-                } else {
-                    editor.setVisible(true);
-                    plainTextarea.setVisible(false);
-                }
+//                if (switchToPlainText.getObject()){
+//                    editor.setVisible(false);
+//                    plainTextarea.setVisible(true);
+//                } else {
+//                    editor.setVisible(true);
+//                    plainTextarea.setVisible(false);
+//                }
                 target.add(mainForm);
             }
         });
@@ -236,24 +239,35 @@ protected void onUpdate(AjaxRequestTarget target) {
 
         mainForm.add(plainTextarea);
 
-        addOrReplaceEditor();
+        addOrReplaceEditor(mainForm);
 
         initButtons(mainForm);
         initViewButton(mainForm);
 
     }
 
-    private void addOrReplaceEditor(){
-        editor = new AceEditor("aceEditor", new PropertyModel<>(objectViewDtoModel, ObjectViewDto.F_XML));
+    private void addOrReplaceEditor(Form mainForm){
+        AceEditor editor = new AceEditor("aceEditor", new PropertyModel<>(objectViewDtoModel, ObjectViewDto.F_XML));
         editor.setModeForDataLanguage(dataLanguage);
+        editor.add(new AjaxFormComponentUpdatingBehavior("change") {
+            private static final long serialVersionUID = 1L;
+
+            @Override
+            protected void onUpdate(AjaxRequestTarget target) {
+            	System.out.println("change");
+            }
+        });
         editor.add(new AjaxFormComponentUpdatingBehavior("blur") {
             private static final long serialVersionUID = 1L;
 
             @Override
             protected void onUpdate(AjaxRequestTarget target) {
+            	System.out.println("blur");
             }
         });
-        mainForm.addOrReplace(editor);
+        
+        editor.add(new VisibleBehaviour(() -> !BooleanUtils.isTrue(switchToPlainText.getObject())));
+        mainForm.add(editor);
     }
 
     private void initViewButton(Form mainForm) {
@@ -266,7 +280,7 @@ protected void onLanguageSwitched(AjaxRequestTarget target, int updatedIndex, St
 			                String objectString) {
 		                objectViewDtoModel.getObject().setXml(objectString);
 		                dataLanguage = updatedLanguage;
-		                addOrReplaceEditor();
+//		                addOrReplaceEditor();
 		                target.add(mainForm);
 	                }
 	                @Override
diff --git a/gui/admin-gui/src/main/resources/static/js/midpoint/ace-editor.js b/gui/admin-gui/src/main/resources/static/js/midpoint/ace-editor.js
index e013b12751a..0e57a174d43 100644
--- a/gui/admin-gui/src/main/resources/static/js/midpoint/ace-editor.js
+++ b/gui/admin-gui/src/main/resources/static/js/midpoint/ace-editor.js
@@ -50,7 +50,7 @@ function initEditor(textAreaId, readonly, resize, height, minHeight, mode) {
         enableBasicAutocompletion: true
     });
 
-    editor.getSession().setTabSize(4);
+    editor.getSession().setTabSize(3);
 
     editor.setTheme("ace/theme/eclipse");
     if (mode != null) {
@@ -63,6 +63,10 @@ function initEditor(textAreaId, readonly, resize, height, minHeight, mode) {
         $(jqTextArea).val(editor.getSession().getValue());
         $(jqTextArea).trigger('onBlur');
     });
+    editor.on('change', function () {
+        $(jqTextArea).val(editor.getSession().getValue());
+        $(jqTextArea).trigger('onChange');
+    });
 
     //add editor to global map, so we can find it later
     $.aceEditors[editorId] = editor;

From 0b1d980b32430c50ed4dd69de0d9404d3a49d724 Mon Sep 17 00:00:00 2001
From: Viliam Repan <vilo.repan@evolveum.com>
Date: Fri, 7 Sep 2018 14:52:03 +0200
Subject: [PATCH 06/11] another fix for page header (ajax progress icon)

---
 .../src/main/resources/static/less/midpoint-theme.less          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gui/admin-gui/src/main/resources/static/less/midpoint-theme.less b/gui/admin-gui/src/main/resources/static/less/midpoint-theme.less
index 9d4d559be7d..9747cb2979c 100644
--- a/gui/admin-gui/src/main/resources/static/less/midpoint-theme.less
+++ b/gui/admin-gui/src/main/resources/static/less/midpoint-theme.less
@@ -729,7 +729,7 @@ body .treeview-menu > li > span:hover {
 }
 
 .navbar-ajax {
-	display: inline-block;
+	float: left;
 
 	& #ajax_busy {
 		margin-top: 12px;

From e9f9f1f19bd623243c76d4fdd23cb495d431c33f Mon Sep 17 00:00:00 2001
From: Katarina Valalikova <k.valalikova@evolveum.com>
Date: Fri, 7 Sep 2018 14:57:43 +0200
Subject: [PATCH 07/11] page debug view - cleanup

---
 .../admin/configuration/PageDebugView.html    |  87 ++++--
 .../admin/configuration/PageDebugView.java    | 292 ++++++++----------
 2 files changed, 184 insertions(+), 195 deletions(-)

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.html
index 884ed427d61..10de5c73fc7 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.html
@@ -19,39 +19,59 @@
 <body>
 <wicket:extend>
     <form wicket:id="mainForm" class="form-horizontal">
-        <div class="row form-group">
-            <div class="col-lg-2" wicket:id="viewButtonPanel" ></div>
-            <label class="col-lg-2 control-label"><wicket:message key="pageDebugView.options"/></label>
-
-            <div class="col-lg-8">
-                <div class="container">
-                    <label class="col-lg-3 checkbox-inline">
-                        <input type="checkbox" wicket:id="encrypt">
-                        <wicket:message key="pageDebugView.encrypt"/>
-                    </label>
-                    <label class="col-lg-3 checkbox-inline">
-                        <input type="checkbox" wicket:id="validateSchema">
-                        <wicket:message key="pageDebugView.validateSchema"/>
-                    </label>
-                    <label class="col-lg-3 checkbox-inline">
-                        <input type="checkbox" wicket:id="saveAsRaw">
-                        <wicket:message key="pageDebugView.saveAsRaw"/>
-                    </label>
-                </div>
-                <div class="container">
-                    <label class="col-lg-3 checkbox-inline">
-                        <input type="checkbox" wicket:id="reevaluateSearchFilters">
-                        <wicket:message key="pageDebugView.reevaluateSearchFilters"/>
-                    </label>
-                    <label class="col-lg-3 checkbox-inline">
-                        <input type="checkbox" wicket:id="switchToPlainText">
-                        <wicket:message key="pageDebugView.switchToPlainText"/>
-                    </label>
-                </div>
-            </div>
+    
+    <div class="box">
+    	<div class="box-header with-border">
+        	<h3 class="box-title"><wicket:message key="pageDebugView.options"/></h3>
         </div>
+	    <div class="box-body">
+	        <div class="option-checkbox" wicket:id="encrypt"/>
+	        <div class="option-checkbox" wicket:id="validateSchema"/>
+	        <div class="option-checkbox" wicket:id="saveAsRaw"/>
+	        <div class="option-checkbox" wicket:id="reevaluateSearchFilters"/>
+	        <div class="option-checkbox" wicket:id="switchToPlainText"/>
+	    </div>
+	</div>
+<!--         <div class="row form-group"> -->
+            
+<!--             <label class="col-lg-2 control-label"><wicket:message key="pageDebugView.options"/></label> -->
 
-        <div class="form-group">
+<!--             <div class="col-lg-8"> -->
+<!--                 <div class="container"> -->
+<!--                     <label class="col-lg-3 checkbox-inline"> -->
+<!--                         <input type="checkbox" wicket:id="encrypt"> -->
+<!--                         <wicket:message key="pageDebugView.encrypt"/> -->
+<!--                     </label> -->
+<!--                     <label class="col-lg-3 checkbox-inline"> -->
+<!--                         <input type="checkbox" wicket:id="validateSchema"> -->
+<!--                         <wicket:message key="pageDebugView.validateSchema"/> -->
+<!--                     </label> -->
+<!--                     <label class="col-lg-3 checkbox-inline"> -->
+<!--                         <input type="checkbox" wicket:id="saveAsRaw"> -->
+<!--                         <wicket:message key="pageDebugView.saveAsRaw"/> -->
+<!--                     </label> -->
+<!--                 </div> -->
+<!--                 <div class="container"> -->
+<!--                     <label class="col-lg-3 checkbox-inline"> -->
+<!--                         <input type="checkbox" wicket:id="reevaluateSearchFilters"> -->
+<!--                         <wicket:message key="pageDebugView.reevaluateSearchFilters"/> -->
+<!--                     </label> -->
+<!--                     <label class="col-lg-3 checkbox-inline"> -->
+<!--                         <input type="checkbox" wicket:id="switchToPlainText"> -->
+<!--                         <wicket:message key="pageDebugView.switchToPlainText"/> -->
+<!--                     </label> -->
+<!--                 </div> -->
+<!--             </div> -->
+<!--         </div> -->
+        
+     <div class="box">
+    	<div class="box-header with-border">
+        	<div class="form-group">
+        		<div class="col-lg-2" wicket:id="viewButtonPanel" ></div>
+        	</div>
+        </div>
+	    <div class="box-body">
+	         <div class="form-group">
             <div class="col-lg-12">
                 <textarea wicket:id="aceEditor"></textarea>
             </div>
@@ -61,6 +81,11 @@
                 <textarea class="text-area"  wicket:id="plain-textarea"/>
             </div>
         </div>
+	    </div>
+	</div>
+        
+       
+       
 
         <div class="main-button-bar">
             <span class="button-group">
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
index 8a5db34e4f3..6d06dfbde20 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
@@ -16,6 +16,22 @@
 
 package com.evolveum.midpoint.web.page.admin.configuration;
 
+import java.util.Collection;
+
+import javax.xml.namespace.QName;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.wicket.RestartResponseException;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
+import org.apache.wicket.markup.html.form.TextArea;
+import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.util.string.StringValue;
+
+import com.evolveum.midpoint.gui.api.component.form.CheckBoxPanel;
 import com.evolveum.midpoint.gui.api.model.LoadableModel;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
@@ -24,7 +40,9 @@
 import com.evolveum.midpoint.prism.PrismContext;
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.prism.delta.ObjectDelta;
-import com.evolveum.midpoint.schema.*;
+import com.evolveum.midpoint.schema.GetOperationOptions;
+import com.evolveum.midpoint.schema.SchemaConstantsGenerated;
+import com.evolveum.midpoint.schema.SelectorOptions;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.security.api.AuthorizationConstants;
 import com.evolveum.midpoint.task.api.Task;
@@ -37,27 +55,12 @@
 import com.evolveum.midpoint.web.component.AceEditor;
 import com.evolveum.midpoint.web.component.AjaxButton;
 import com.evolveum.midpoint.web.component.AjaxSubmitButton;
+import com.evolveum.midpoint.web.component.form.Form;
 import com.evolveum.midpoint.web.component.input.DataLanguagePanel;
 import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
 import com.evolveum.midpoint.web.page.admin.dto.ObjectViewDto;
 import com.evolveum.midpoint.web.security.MidPointApplication;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang3.BooleanUtils;
-import org.apache.wicket.RestartResponseException;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
-import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.TextArea;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.util.string.StringValue;
-
-import javax.xml.namespace.QName;
-import java.util.Collection;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
 
 @PageDescriptor(url = "/admin/config/debug", action = {
         @AuthorizationAction(actionUri = PageAdminConfiguration.AUTH_CONFIGURATION_ALL,
@@ -72,23 +75,18 @@ public class PageDebugView extends PageAdminConfiguration {
     private static final String OPERATION_SAVE_OBJECT = DOT_CLASS + "saveObject";
     private static final String ID_PLAIN_TEXTAREA = "plain-textarea";
     private static final String ID_VIEW_BUTTON_PANEL = "viewButtonPanel";
+    
+    private static final String ID_FORM = "mainForm";
 
     private static final Trace LOGGER = TraceManager.getTrace(PageDebugView.class);
 
     public static final String PARAM_OBJECT_ID = "objectId";
     public static final String PARAM_OBJECT_TYPE = "objectType";
-//    private AceEditor editor;
-    private final IModel<Boolean> encrypt = new Model<>(true);
-    private final IModel<Boolean> saveAsRaw = new Model<>(true);
-    private final IModel<Boolean> reevaluateSearchFilters = new Model<>(false);
-    private final IModel<Boolean> validateSchema = new Model<>(false);
-    private final IModel<Boolean> switchToPlainText = new Model<>(false);
-    private TextArea<String> plainTextarea;
-//    final Form mainForm = new com.evolveum.midpoint.web.component.form.Form("mainForm");
     private String dataLanguage;
-    private boolean isInitialized = false;
-    private IModel<ObjectViewDto> objectViewDtoModel;
-
+    
+    private IModel<ObjectViewDto<?>> objectViewDtoModel;
+    private DebugViewOptions debugViewConfiguration = new DebugViewOptions();
+   
     public PageDebugView() {
 
     }
@@ -97,42 +95,31 @@ public PageDebugView() {
     protected void onInitialize(){
         super.onInitialize();
         dataLanguage = determineDataLanguage();
-        initObjectViewObject();
+        objectViewDtoModel = initObjectViewObject();
         initLayout();
     }
 
     @Override
     protected IModel<String> createPageTitleModel() {
-        return new AbstractReadOnlyModel<String>() {
-            private static final long serialVersionUID = 1L;
-
-            @Override
-            public String getObject() {
-                if (objectViewDtoModel == null || objectViewDtoModel.getObject() == null) {
-                    return "";
-                }
-//                ObjectViewDto object;
-//                try {
-//                    object = objectViewModel.getObject();
-//                } catch (RuntimeException e) {
-//                    // e.g. when the object is unreadable
-//                    LoggingUtils.logUnexpectedException(LOGGER, "Couldn't get object", e);
-//                    return "";
-//                }
-//                if (object == null) {
-//            		return "";
-//            	} else {
-                    return createStringResource("PageDebugView.title", objectViewDtoModel.getObject().getName()).getString();
-//                }
-            }
-        };
+    	return createStringResource("PageDebugView.title", getName());
+        
     }
+    
+    private String getName() {
+    	if (objectViewDtoModel == null || objectViewDtoModel.getObject() == null) {
+    		return "";
+    	}
+    	
+    	return objectViewDtoModel.getObject().getName();
+    }
+    private LoadableModel<ObjectViewDto<?>> initObjectViewObject() {
+        return new LoadableModel<ObjectViewDto<?>>(false) {
+           
+        	private static final long serialVersionUID = 1L;
 
-    private void initObjectViewObject() {
-        objectViewDtoModel = new LoadableModel<ObjectViewDto>(false) {
-            @Override
-            protected ObjectViewDto load() {
-                ObjectViewDto objectViewDto = new ObjectViewDto();
+			@Override
+            protected ObjectViewDto<?> load() {
+                ObjectViewDto<?> objectViewDto = new ObjectViewDto<>();
                 StringValue objectOid = getPageParameters().get(PARAM_OBJECT_ID);
                 if (objectOid == null || StringUtils.isEmpty(objectOid.toString())) {
                     getSession().error(getString("pageDebugView.message.oidNotDefined"));
@@ -151,31 +138,23 @@ protected ObjectViewDto load() {
                     Collection<SelectorOptions<GetOperationOptions>> options = SelectorOptions.createCollection(rootOptions);
                     // FIXME: ObjectType.class will not work well here. We need more specific type.
                     //todo on page debug list create page params, put there oid and class for object type and send that to this page....read it here
-                    Class type = ObjectType.class;
-                    StringValue objectType = getPageParameters().get(PARAM_OBJECT_TYPE);
-                    if (objectType != null && StringUtils.isNotBlank(objectType.toString())) {
-                        type = getPrismContext().getSchemaRegistry().determineCompileTimeClass(new QName(SchemaConstantsGenerated.NS_COMMON, objectType.toString()));
-                    }
+                    Class<? extends ObjectType> type = getTypeFromParameters();
+                    
 
                     // TODO make this configurable (or at least do not show campaign cases in production)
                     WebModelServiceUtils.addIncludeOptionsForExportOrView(options, type);
-                    PrismObject<ObjectType> object = getModelService().getObject(type, objectOid.toString(), options, task, result);
+                    PrismObject<? extends ObjectType> object = getModelService().getObject(type, objectOid.toString(), options, task, result);
 
                     PrismContext context = application.getPrismContext();
 
                     String lex = context.serializerFor(dataLanguage).serialize(object);
-                    objectViewDto = new ObjectViewDto(object.getOid(), WebComponentUtil.getName(object), object, lex);
+                    objectViewDto = new ObjectViewDto<>(object.getOid(), WebComponentUtil.getName(object), object, lex);
 
                     result.recomputeStatus();
                 } catch (Exception ex) {
                     result.recordFatalError("Couldn't load object.", ex);
                 }
 
-                if (objectViewDto == null) {
-                    showResult(result);
-                    throw new RestartResponseException(PageDebugList.class);
-                }
-
                 showResult(result, false);
 
                 if (!WebComponentUtil.isSuccessOrHandledErrorOrWarning(result)) {
@@ -186,87 +165,68 @@ protected ObjectViewDto load() {
             }
         };
     }
+    
+    private Class<? extends ObjectType> getTypeFromParameters() {
+    	StringValue objectType = getPageParameters().get(PARAM_OBJECT_TYPE);
+        if (objectType != null && StringUtils.isNotBlank(objectType.toString())) {
+            return getPrismContext().getSchemaRegistry().determineCompileTimeClass(new QName(SchemaConstantsGenerated.NS_COMMON, objectType.toString()));
+        }
+        
+        return ObjectType.class;
+    }
 
     private void initLayout() {
-    	final Form mainForm = new com.evolveum.midpoint.web.component.form.Form("mainForm");
+    	final Form<?> mainForm = new Form<>(ID_FORM);
         add(mainForm);
+        mainForm.add(createOptionCheckbox(DebugViewOptions.ID_ENCRYPT, new PropertyModel<>(debugViewConfiguration, DebugViewOptions.ID_ENCRYPT), "pageDebugView.encrypt", "pageDebugView.encrypt.help"));
+        mainForm.add(createOptionCheckbox(DebugViewOptions.ID_VALIDATE_SCHEMA, new PropertyModel<>(debugViewConfiguration, DebugViewOptions.ID_VALIDATE_SCHEMA), "pageDebugView.validateSchema", "pageDebugView.validateSchema.help"));
+        mainForm.add(createOptionCheckbox(DebugViewOptions.ID_SAVE_AS_RAW, new PropertyModel<>(debugViewConfiguration, DebugViewOptions.ID_SAVE_AS_RAW), "pageDebugView.saveAsRaw", "pageDebugView.saveAsRaw.help"));
+        mainForm.add(createOptionCheckbox(DebugViewOptions.ID_REEVALUATE_SEARCH_FILTERS, new PropertyModel<>(debugViewConfiguration, DebugViewOptions.ID_REEVALUATE_SEARCH_FILTERS), "pageDebugView.reevaluateSearchFilters", "pageDebugView.reevaluateSearchFilters.help"));
+        mainForm.add(createOptionCheckbox(DebugViewOptions.ID_SWITCH_TO_PLAINTEXT, new PropertyModel<>(debugViewConfiguration, DebugViewOptions.ID_SWITCH_TO_PLAINTEXT), "pageDebugView.switchToPlainText", "pageDebugView.switchToPlainText.help"));
+
+        TextArea<String> plainTextarea = new TextArea<>(ID_PLAIN_TEXTAREA, new PropertyModel<>(objectViewDtoModel, ObjectViewDto.F_XML));
+        plainTextarea.add(new VisibleBehaviour(() -> isTrue(DebugViewOptions.ID_SWITCH_TO_PLAINTEXT)));
+        mainForm.add(plainTextarea);
 
-        mainForm.add(new AjaxCheckBox("encrypt", encrypt) {
-
-			@Override
-			protected void onUpdate(AjaxRequestTarget target) {
-			}
-        });
-
-        mainForm.add(new AjaxCheckBox("saveAsRaw", saveAsRaw) {
+        initAceEditor(mainForm);
 
-            @Override
-            protected void onUpdate(AjaxRequestTarget target) {
-            }
-        });
-
-        mainForm.add(new AjaxCheckBox("reevaluateSearchFilters", reevaluateSearchFilters) {
+        initButtons(mainForm);
+        initViewButton(mainForm);
 
-            @Override
-            protected void onUpdate(AjaxRequestTarget target) {
-            }
-        });
+    }
+    
+    private CheckBoxPanel createOptionCheckbox(String id, IModel<Boolean> model, String labelKey, String helpKey) {
+    	
+      	return new CheckBoxPanel(id, model, null, createStringResource(labelKey), createStringResource(helpKey)) {
 
-        mainForm.add(new AjaxCheckBox("validateSchema", validateSchema) {
+			private static final long serialVersionUID = 1L;
 
 			@Override
-			protected void onUpdate(AjaxRequestTarget target) {
+			public void onUpdate(AjaxRequestTarget target) {
+				if (DebugViewOptions.ID_SWITCH_TO_PLAINTEXT.equals(id)) {
+					target.add(getMainForm());
+				}
 			}
-        });
-
-        mainForm.add(new AjaxCheckBox("switchToPlainText", switchToPlainText) {
-
-            @Override
-            protected void onUpdate(AjaxRequestTarget target) {
-//                if (switchToPlainText.getObject()){
-//                    editor.setVisible(false);
-//                    plainTextarea.setVisible(true);
-//                } else {
-//                    editor.setVisible(true);
-//                    plainTextarea.setVisible(false);
-//                }
-                target.add(mainForm);
-            }
-        });
-
-        plainTextarea = new TextArea<>(ID_PLAIN_TEXTAREA, new PropertyModel<>(objectViewDtoModel, ObjectViewDto.F_XML));
-        plainTextarea.setVisible(false);
-
-        mainForm.add(plainTextarea);
-
-        addOrReplaceEditor(mainForm);
-
-        initButtons(mainForm);
-        initViewButton(mainForm);
-
+        };
+    }
+    
+    private boolean isTrue(String panelId) {
+    	CheckBoxPanel panel = (CheckBoxPanel) get(createComponentPath(ID_FORM, panelId));
+    	if (panel == null) {
+    		LOGGER.error("Cannot find panel: {}", panelId);
+    		 return false;
+    	}
+    	
+    	return panel.getValue();
+    }
+    private Form<?> getMainForm() {
+    	return (Form<?>) get(ID_FORM);
     }
 
-    private void addOrReplaceEditor(Form mainForm){
+    private void initAceEditor(Form<?> mainForm){
         AceEditor editor = new AceEditor("aceEditor", new PropertyModel<>(objectViewDtoModel, ObjectViewDto.F_XML));
         editor.setModeForDataLanguage(dataLanguage);
-        editor.add(new AjaxFormComponentUpdatingBehavior("change") {
-            private static final long serialVersionUID = 1L;
-
-            @Override
-            protected void onUpdate(AjaxRequestTarget target) {
-            	System.out.println("change");
-            }
-        });
-        editor.add(new AjaxFormComponentUpdatingBehavior("blur") {
-            private static final long serialVersionUID = 1L;
-
-            @Override
-            protected void onUpdate(AjaxRequestTarget target) {
-            	System.out.println("blur");
-            }
-        });
-        
-        editor.add(new VisibleBehaviour(() -> !BooleanUtils.isTrue(switchToPlainText.getObject())));
+        editor.add(new VisibleBehaviour(() -> !isTrue(DebugViewOptions.ID_SWITCH_TO_PLAINTEXT)));
         mainForm.add(editor);
     }
 
@@ -280,7 +240,6 @@ protected void onLanguageSwitched(AjaxRequestTarget target, int updatedIndex, St
 			                String objectString) {
 		                objectViewDtoModel.getObject().setXml(objectString);
 		                dataLanguage = updatedLanguage;
-//		                addOrReplaceEditor();
 		                target.add(mainForm);
 	                }
 	                @Override
@@ -289,25 +248,25 @@ protected String getObjectStringRepresentation() {
 	                }
 	                @Override
 	                protected boolean isValidateSchema() {
-		                return validateSchema.getObject();
+		                return isTrue(DebugViewOptions.ID_VALIDATE_SCHEMA);
 	                }
                 };
         dataLanguagePanel.setOutputMarkupId(true);
         mainForm.add(dataLanguagePanel);
     }
 
-    private void initButtons(final Form mainForm) {
+    private void initButtons(final Form<?> mainForm) {
         AjaxSubmitButton saveButton = new AjaxSubmitButton("saveButton",
                 createStringResource("pageDebugView.button.save")) {
             private static final long serialVersionUID = 1L;
-
+            
             @Override
-            protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+            protected void onSubmit(AjaxRequestTarget target, org.apache.wicket.markup.html.form.Form<?> form) {
                 savePerformed(target);
             }
 
             @Override
-            protected void onError(AjaxRequestTarget target, Form<?> form) {
+            protected void onError(AjaxRequestTarget target, org.apache.wicket.markup.html.form.Form<?> form) {
                 target.add(getFeedbackPanel());
             }
         };
@@ -325,18 +284,6 @@ public void onClick(AjaxRequestTarget target) {
         mainForm.add(backButton);
     }
     
-    private boolean isReport(PrismObject object){
-    	if (object.getCompileTimeClass() != null && object.getCompileTimeClass() == ReportType.class){
-    		return true;
-    	}
-    	
-    	if (object.getDefinition() != null && object.getDefinition().getName().equals(ReportType.COMPLEX_TYPE)){
-    		return true;
-    	}
-    	
-    	return false;
-    }
-
     public void savePerformed(AjaxRequestTarget target) {
         if (StringUtils.isEmpty(objectViewDtoModel.getObject().getXml())) {
             error(getString("pageDebugView.message.cantSaveEmpty"));
@@ -348,16 +295,16 @@ public void savePerformed(AjaxRequestTarget target) {
         OperationResult result = task.getResult();
         try {
 
-            PrismObject<ObjectType> oldObject = objectViewDtoModel.getObject().getObject();
+            PrismObject<? extends ObjectType> oldObject = objectViewDtoModel.getObject().getObject();
             oldObject.revive(getPrismContext());
 
-            Holder<Objectable> objectHolder = new Holder<>(null);
-            validateObject(result, objectHolder);
+            Holder<? extends ObjectType> objectHolder = new Holder<>(null);
+            validateObject(result, (Holder) objectHolder);
 
 			if (result.isAcceptable()) {
-                PrismObject<ObjectType> newObject = (PrismObject<ObjectType>) objectHolder.getValue().asPrismObject();
+                PrismObject<? extends ObjectType> newObject = objectHolder.getValue().asPrismObject();
 
-				ObjectDelta<ObjectType> delta = oldObject.diff(newObject, true, true);
+				ObjectDelta<? extends ObjectType> delta = oldObject.diff((PrismObject) newObject, true, true);
 
                 if (delta.getPrismContext() == null) {
                 	LOGGER.warn("No prism context in delta {} after diff, adding it", delta);
@@ -375,13 +322,13 @@ public void savePerformed(AjaxRequestTarget target) {
 
                 Collection<ObjectDelta<? extends ObjectType>> deltas = (Collection) MiscUtil.createCollection(delta);
                 ModelExecuteOptions options = new ModelExecuteOptions();
-                if (saveAsRaw.getObject()) {
+                if (isTrue(DebugViewOptions.ID_SAVE_AS_RAW)) {
                     options.setRaw(true);
                 }
-                if (reevaluateSearchFilters.getObject()) {
+                if (isTrue(DebugViewOptions.ID_REEVALUATE_SEARCH_FILTERS)) {
                     options.setReevaluateSearchFilters(true);
                 }
-                if(!encrypt.getObject()) {
+                if(!isTrue(DebugViewOptions.ID_ENCRYPT)) {
                 	options.setNoCrypt(true);
                 }
 
@@ -408,7 +355,24 @@ public void savePerformed(AjaxRequestTarget target) {
     }
 
     private void validateObject(OperationResult result, Holder<Objectable> objectHolder) {
-	    parseObject(objectViewDtoModel.getObject().getXml(), objectHolder, dataLanguage, validateSchema.getObject(), false, Objectable.class, result);
+	    parseObject(objectViewDtoModel.getObject().getXml(), (Holder<Objectable>) objectHolder, dataLanguage, isTrue(DebugViewOptions.ID_VALIDATE_SCHEMA), false, Objectable.class, result);
+    }
+    
+    
+ class DebugViewOptions {
+    	
+    	private final static String ID_ENCRYPT = "encrypt";
+    	private final static String ID_SAVE_AS_RAW = "saveAsRaw";
+    	private final static String ID_REEVALUATE_SEARCH_FILTERS = "reevaluateSearchFilters";
+    	private final static String ID_VALIDATE_SCHEMA = "validateSchema";
+    	private final static String ID_SWITCH_TO_PLAINTEXT = "switchToPlainText";
+    	
+    	private final boolean encrypt=true;
+        private final boolean saveAsRaw=true;
+        private final boolean reevaluateSearchFilters = false;
+        private final boolean validateSchema = false;
+        private final boolean switchToPlainText = false;
+    	
     }
 
 }

From 40bf68e9bb287746ebc9e371b3288949712d4603 Mon Sep 17 00:00:00 2001
From: Viliam Repan <vilo.repan@evolveum.com>
Date: Fri, 7 Sep 2018 16:31:45 +0200
Subject: [PATCH 08/11] MID-4570 npe fix, minor copy and paste fixes

---
 .../api/ChangeNotificationDispatcher.java     | 25 +++++-----
 .../ChangeNotificationDispatcherImpl.java     | 47 ++++++++++++-------
 2 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ChangeNotificationDispatcher.java b/provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ChangeNotificationDispatcher.java
index 71c80abf32a..debf3b1a01c 100644
--- a/provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ChangeNotificationDispatcher.java
+++ b/provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ChangeNotificationDispatcher.java
@@ -17,27 +17,24 @@
 
 /**
  * Dispatcher of change notifications.
- * 
+ *
  * Instances that implement this interface relay notification from the source of the change notification to the
  * destinations. The destinations are chosen dynamically, using a publish-subscribe mechanism.
- * 
+ *
  * This interface also includes ResourceObjectChangeListener. By invoking the notifyChange(..) operation of this
  * interface the change will be relayed to all registered listeners.
- * 
+ *
  * @author Katka Valalikova
  * @author Radovan Semancik
  *
  */
 public interface ChangeNotificationDispatcher extends ResourceObjectChangeListener, ResourceOperationListener, ResourceEventListener {
-	
-	public  void registerNotificationListener(ResourceObjectChangeListener listener);
-	public  void registerNotificationListener(ResourceOperationListener listener);
-	public  void registerNotificationListener(ResourceEventListener listener);
-		
-	public  void unregisterNotificationListener(ResourceObjectChangeListener listener);
-	public  void unregisterNotificationListener(ResourceOperationListener listener);
-	public  void unregisterNotificationListener(ResourceEventListener listener);
-	
-	
-	
+
+    void registerNotificationListener(ResourceObjectChangeListener listener);
+    void registerNotificationListener(ResourceOperationListener listener);
+    void registerNotificationListener(ResourceEventListener listener);
+
+    void unregisterNotificationListener(ResourceObjectChangeListener listener);
+    void unregisterNotificationListener(ResourceOperationListener listener);
+    void unregisterNotificationListener(ResourceEventListener listener);
 }
diff --git a/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ChangeNotificationDispatcherImpl.java b/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ChangeNotificationDispatcherImpl.java
index c349a73c7d7..09286f75933 100644
--- a/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ChangeNotificationDispatcherImpl.java
+++ b/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ChangeNotificationDispatcherImpl.java
@@ -69,6 +69,8 @@ public void setFilterProtectedObjects(boolean filterProtectedObjects) {
 	 */
 	@Override
 	public synchronized void registerNotificationListener(ResourceObjectChangeListener listener) {
+		Validate.notNull(listener);
+
 		if (changeListeners.contains(listener)) {
 			LOGGER.warn(
 					"Resource object change listener '{}' is already registered. Subsequent registration is ignored",
@@ -84,6 +86,8 @@ public synchronized void registerNotificationListener(ResourceObjectChangeListen
 	 */
 	@Override
 	public synchronized void registerNotificationListener(ResourceOperationListener listener) {
+		Validate.notNull(listener);
+
 		if (operationListeners.contains(listener)) {
 			LOGGER.warn(
 					"Resource operation listener '{}' is already registered. Subsequent registration is ignored",
@@ -95,6 +99,8 @@ public synchronized void registerNotificationListener(ResourceOperationListener
 	}
 	@Override
 	public synchronized void registerNotificationListener(ResourceEventListener listener) {
+		Validate.notNull(listener);
+
 		if (eventListeners.contains(listener)) {
 			LOGGER.warn(
 					"Resource event listener '{}' is already registered. Subsequent registration is ignored",
@@ -147,7 +153,8 @@ public void notifyChange(ResourceObjectShadowChangeDescription change, Task task
 				} catch (RuntimeException e) {
 					LOGGER.error("Exception {} thrown by object change listener {}: {}", e.getClass(), listener.getName(),
 							e.getMessage(), e);
-					parentResult.createSubresult(CLASS_NAME_WITH_DOT + "notifyChange").recordWarning("Change listener has thrown unexpected exception", e);
+					parentResult.createSubresult(CLASS_NAME_WITH_DOT + "notifyChange")
+							.recordWarning("Change listener has thrown unexpected exception", e);
                     throw e;
 				}
 			}
@@ -170,7 +177,7 @@ public void notifyFailure(ResourceOperationDescription failureDescription,
 
 		failureDescription.checkConsistence();
 
-		if ((null != changeListeners) && (!changeListeners.isEmpty())) {
+		if ((null != operationListeners) && (!operationListeners.isEmpty())) {
 			for (ResourceOperationListener listener : new ArrayList<>(operationListeners)) {		// sometimes there is registration/deregistration from within
 				//LOGGER.trace("Listener: {}", listener.getClass().getSimpleName());
 				try {
@@ -178,7 +185,8 @@ public void notifyFailure(ResourceOperationDescription failureDescription,
 				} catch (RuntimeException e) {
 					LOGGER.error("Exception {} thrown by operation failure listener {}: {}-{}", new Object[]{
 							e.getClass(), listener.getName(), e.getMessage(), e });
-                    parentResult.createSubresult(CLASS_NAME_WITH_DOT + "notifyFailure").recordWarning("Operation failure listener has thrown unexpected exception", e);
+                    parentResult.createSubresult(CLASS_NAME_WITH_DOT + "notifyFailure")
+							.recordWarning("Operation failure listener has thrown unexpected exception", e);
 				}
 			}
 		} else {
@@ -190,25 +198,26 @@ public void notifyFailure(ResourceOperationDescription failureDescription,
 	 * @see com.evolveum.midpoint.provisioning.api.ResourceObjectChangeListener#notifyFailure(com.evolveum.midpoint.provisioning.api.ResourceObjectShadowFailureDescription, com.evolveum.midpoint.task.api.Task, com.evolveum.midpoint.schema.result.OperationResult)
 	 */
 	@Override
-	public void notifySuccess(ResourceOperationDescription failureDescription,
+	public void notifySuccess(ResourceOperationDescription successDescription,
 			Task task, OperationResult parentResult) {
-		Validate.notNull(failureDescription, "Operation description of resource object shadow must not be null.");
+		Validate.notNull(successDescription, "Operation description of resource object shadow must not be null.");
 
 		if (LOGGER.isTraceEnabled()) {
-			LOGGER.trace("Resource operation success notification\n{} ", failureDescription.debugDump());
+			LOGGER.trace("Resource operation success notification\n{} ", successDescription.debugDump());
 		}
 
-		failureDescription.checkConsistence();
+		successDescription.checkConsistence();
 
-		if ((null != changeListeners) && (!changeListeners.isEmpty())) {
+		if ((null != operationListeners) && (!operationListeners.isEmpty())) {
 			for (ResourceOperationListener listener : new ArrayList<>(operationListeners)) {		// sometimes there is registration/deregistration from within
 				//LOGGER.trace("Listener: {}", listener.getClass().getSimpleName());
 				try {
-					listener.notifySuccess(failureDescription, task, parentResult);
+					listener.notifySuccess(successDescription, task, parentResult);
 				} catch (RuntimeException e) {
 					LOGGER.error("Exception {} thrown by operation success listener {}: {}-{}", new Object[]{
 							e.getClass(), listener.getName(), e.getMessage(), e });
-                    parentResult.createSubresult(CLASS_NAME_WITH_DOT + "notifySuccess").recordWarning("Operation success listener has thrown unexpected exception", e);
+                    parentResult.createSubresult(CLASS_NAME_WITH_DOT + "notifySuccess")
+							.recordWarning("Operation success listener has thrown unexpected exception", e);
 				}
 			}
 		} else {
@@ -220,25 +229,26 @@ public void notifySuccess(ResourceOperationDescription failureDescription,
 	 * @see com.evolveum.midpoint.provisioning.api.ResourceObjectChangeListener#notifyFailure(com.evolveum.midpoint.provisioning.api.ResourceObjectShadowFailureDescription, com.evolveum.midpoint.task.api.Task, com.evolveum.midpoint.schema.result.OperationResult)
 	 */
 	@Override
-	public void notifyInProgress(ResourceOperationDescription failureDescription,
+	public void notifyInProgress(ResourceOperationDescription inProgressDescription,
 			Task task, OperationResult parentResult) {
-		Validate.notNull(failureDescription, "Operation description of resource object shadow must not be null.");
+		Validate.notNull(inProgressDescription, "Operation description of resource object shadow must not be null.");
 
 		if (LOGGER.isTraceEnabled()) {
-			LOGGER.trace("Resource operation in-progress notification\n{} ", failureDescription.debugDump());
+			LOGGER.trace("Resource operation in-progress notification\n{} ", inProgressDescription.debugDump());
 		}
 
-		failureDescription.checkConsistence();
+		inProgressDescription.checkConsistence();
 
-		if ((null != changeListeners) && (!changeListeners.isEmpty())) {
+		if ((null != operationListeners) && (!operationListeners.isEmpty())) {
 			for (ResourceOperationListener listener : new ArrayList<>(operationListeners)) {		// sometimes there is registration/deregistration from within
 				//LOGGER.trace("Listener: {}", listener.getClass().getSimpleName());
 				try {
-					listener.notifyInProgress(failureDescription, task, parentResult);
+					listener.notifyInProgress(inProgressDescription, task, parentResult);
 				} catch (RuntimeException e) {
 					LOGGER.error("Exception {} thrown by operation in-progress listener {}: {}-{}", new Object[]{
 							e.getClass(), listener.getName(), e.getMessage(), e });
-                    parentResult.createSubresult(CLASS_NAME_WITH_DOT + "notifyInProgress").recordWarning("Operation in-progress listener has thrown unexpected exception", e);
+                    parentResult.createSubresult(CLASS_NAME_WITH_DOT + "notifyInProgress")
+							.recordWarning("Operation in-progress listener has thrown unexpected exception", e);
 				}
 			}
 		} else {
@@ -281,7 +291,8 @@ public void notifyEvent(ResourceEventDescription eventDescription,
 				} catch (RuntimeException e) {
 					LOGGER.error("Exception {} thrown by event listener {}: {}-{}", new Object[]{
 							e.getClass(), listener.getName(), e.getMessage(), e });
-                    parentResult.createSubresult(CLASS_NAME_WITH_DOT + "notifyEvent").recordWarning("Event listener has thrown unexpected exception", e);
+                    parentResult.createSubresult(CLASS_NAME_WITH_DOT + "notifyEvent")
+							.recordWarning("Event listener has thrown unexpected exception", e);
                     throw e;
 				}
 			}

From 75a3dde754b5de386fb97b810e576d2fb46b7507 Mon Sep 17 00:00:00 2001
From: Viliam Repan <vilo.repan@evolveum.com>
Date: Fri, 7 Sep 2018 16:50:32 +0200
Subject: [PATCH 09/11] removed logback deprecated configuration warnings

---
 .../src/main/resources/logback-console.xml    |  4 +--
 gui/admin-gui/src/main/resources/logback.xml  | 27 +++++++++----------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/gui/admin-gui/src/main/resources/logback-console.xml b/gui/admin-gui/src/main/resources/logback-console.xml
index 0502cdb5d6b..0d048d1cdad 100644
--- a/gui/admin-gui/src/main/resources/logback-console.xml
+++ b/gui/admin-gui/src/main/resources/logback-console.xml
@@ -20,9 +20,9 @@
 	<define name="consoleTimezone" class="com.evolveum.midpoint.common.LogbackPropertyDefinerForConsoleTimezone" />
 
 	<appender name="DEFAULT_CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-		<layout class="ch.qos.logback.classic.PatternLayout">
+		<encoder>
 			<pattern>${consolePrefix}%date{ISO8601, ${consoleTimezone}} [%X{subsystem}] [%thread] %level \(%logger\): %msg%n</pattern>
-		</layout>
+		</encoder>
 	</appender>
 
 </included>
\ No newline at end of file
diff --git a/gui/admin-gui/src/main/resources/logback.xml b/gui/admin-gui/src/main/resources/logback.xml
index 75901fbbcf4..d4e7a1986d1 100644
--- a/gui/admin-gui/src/main/resources/logback.xml
+++ b/gui/admin-gui/src/main/resources/logback.xml
@@ -20,40 +20,39 @@
     <include resource="logback-console.xml" />
 
     <appender name="MIDPOINT_LOG" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!--See http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
-        <!--and http://logback.qos.ch/manual/appenders.html#TimeBasedRollingPolicy-->
-        <!--for further documentation-->
+        <!-- See http://logback.qos.ch/manual/appenders.html#RollingFileAppender -->
+        <!-- and http://logback.qos.ch/manual/appenders.html#SizeAndTimeBasedRollingPolicy -->
+        <!-- for further documentation -->
         <Append>true</Append>
         <File>${midpoint.home}/log/midpoint.log</File>
         <encoder>
             <pattern>%date [%X{subsystem}] [%thread] %level \(%logger\): %msg%n</pattern>
         </encoder>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <fileNamePattern>${midpoint.home}/log/midpoint-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>100MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
+            <maxFileSize>100MB</maxFileSize>
             <maxHistory>10</maxHistory>
+            <totalSizeCap>1GB</totalSizeCap>
             <cleanHistoryOnStart>true</cleanHistoryOnStart>
         </rollingPolicy>
     </appender>
 
     <!-- Appender for profiling purposes -->
     <appender name="MIDPOINT_PROFILE_LOG" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!--See http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
-        <!--and http://logback.qos.ch/manual/appenders.html#TimeBasedRollingPolicy-->
-        <!--for further documentation-->
+        <!-- See http://logback.qos.ch/manual/appenders.html#RollingFileAppender -->
+        <!-- and http://logback.qos.ch/manual/appenders.html#SizeAndTimeBasedRollingPolicy -->
+        <!-- for further documentation -->
         <Append>true</Append>
         <File>${midpoint.home}/log/midpoint-profile.log</File>
         <encoder>
             <pattern>%date %level: %msg%n</pattern>
         </encoder>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <fileNamePattern>${midpoint.home}/log/midpoint-profile-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>100MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
+            <maxFileSize>100MB</maxFileSize>
             <maxHistory>10</maxHistory>
+            <totalSizeCap>1GB</totalSizeCap>
+            <cleanHistoryOnStart>true</cleanHistoryOnStart>
         </rollingPolicy>
     </appender>
     <!-- Appender for profiling purposes -->

From e92269a350377d3065f689c1c92515a998a31db1 Mon Sep 17 00:00:00 2001
From: Viliam Repan <vilo.repan@evolveum.com>
Date: Fri, 7 Sep 2018 17:09:10 +0200
Subject: [PATCH 10/11] MID-4591 removed logback deprecated configuration
 warnings, updated logging manager

---
 .../midpoint/common/LoggingConfigurationManager.java   | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/infra/common/src/main/java/com/evolveum/midpoint/common/LoggingConfigurationManager.java b/infra/common/src/main/java/com/evolveum/midpoint/common/LoggingConfigurationManager.java
index 1a4e3c67deb..56b32115be1 100644
--- a/infra/common/src/main/java/com/evolveum/midpoint/common/LoggingConfigurationManager.java
+++ b/infra/common/src/main/java/com/evolveum/midpoint/common/LoggingConfigurationManager.java
@@ -296,7 +296,7 @@ private static void prepareFileAppenderConfiguration(StringBuilder sb, FileAppen
 
 		if (isRolling) {
 			//rolling policy
-			sb.append("\t\t<rollingPolicy class=\"ch.qos.logback.core.rolling.TimeBasedRollingPolicy\">\n");
+			sb.append("\t\t<rollingPolicy class=\"ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy\">\n");
 			sb.append("\t\t\t<fileNamePattern>");
 			sb.append(filePattern);
 			sb.append("</fileNamePattern>\n");
@@ -305,16 +305,12 @@ private static void prepareFileAppenderConfiguration(StringBuilder sb, FileAppen
 				sb.append(appender.getMaxHistory());
 				sb.append("</maxHistory>\n");
 			}
-			sb.append("\t\t\t<cleanHistoryOnStart>true</cleanHistoryOnStart>");
+			sb.append("\t\t\t<cleanHistoryOnStart>true</cleanHistoryOnStart>\n");
 
-			// file triggering
-			// if max size is defined
 			if (!StringUtils.isEmpty(appender.getMaxFileSize())) {
-				sb.append("\t\t\t<timeBasedFileNamingAndTriggeringPolicy class=\"ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP\">\n");
-				sb.append("\t\t\t\t<maxFileSize>");
+				sb.append("\t\t\t<maxFileSize>");
 				sb.append(appender.getMaxFileSize());
 				sb.append("</maxFileSize>\n");
-				sb.append("\t\t\t</timeBasedFileNamingAndTriggeringPolicy>\n");
 			}
 			sb.append("\t\t</rollingPolicy>\n");
 		}

From 4af350c64b7ec3fde7b5f334cb808eb10261804f Mon Sep 17 00:00:00 2001
From: Katarina Valalikova <k.valalikova@evolveum.com>
Date: Fri, 7 Sep 2018 17:14:44 +0200
Subject: [PATCH 11/11] fix for MID-3225 (Tried to retrieve a localized string
 for a component that has not yet been added to the page), dashboard search
 panel cleanup

---
 .../self/component/DashboardSearchPanel.html  |  33 +--
 .../self/component/DashboardSearchPanel.java  | 228 +++++++++---------
 2 files changed, 132 insertions(+), 129 deletions(-)

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/DashboardSearchPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/DashboardSearchPanel.html
index 1a65265f2ab..60a4320d44c 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/DashboardSearchPanel.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/DashboardSearchPanel.html
@@ -17,22 +17,23 @@
 <wicket:panel xmlns:wicket="http://wicket.apache.org">
 	<form wicket:id="searchForm">
 	   <div class="input-group">
-	        <input wicket:id="searchInput" class="form-control" type="text" />
-	        <div class="input-group-btn">
-	            <button wicket:id="searchButton" class="btn btn-primary">
-	                <i class="fa fa-search"/>&nbsp;
-	                <span wicket:id="buttonLabel"/>
-	            </button>
-	            <button aria-expanded="false" type="button" class="btn btn-primary dropdown-toggle"
-	                    data-toggle="dropdown">
-	                <span class="caret"></span>
-	                <span class="sr-only">Toggle Dropdown</span>
-	            </button>
-	            <ul class="dropdown-menu" role="menu">
-	                <li wicket:id="searchTypes"><a wicket:id="searchTypeItem" href="#">
-                    </a></li>
-	            </ul>
-	        </div>
+	   		<wicket:enclosure child="searchInput">
+		        <input wicket:id="searchInput" wicket:message="placeholder:PageDashboard.search.input" class="form-control" type="text" />
+		        <div class="input-group-btn">
+		            <button wicket:id="searchButton" class="btn btn-primary">
+		                <i class="fa fa-search"/>
+		            </button>
+		            <button aria-expanded="false" type="button" class="btn btn-primary dropdown-toggle"
+		                    data-toggle="dropdown">
+		                <span class="caret"></span>
+		                <span class="sr-only">Toggle Dropdown</span>
+		            </button>
+		            <ul class="dropdown-menu" role="menu">
+		                <li wicket:id="searchTypes"><a wicket:id="searchTypeItem" href="#">
+	                    </a></li>
+		            </ul>
+		        </div>
+			</wicket:enclosure>
 	    </div>
 	</form>
 </wicket:panel>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/DashboardSearchPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/DashboardSearchPanel.java
index c51b7857084..3debaf4eda7 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/DashboardSearchPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/DashboardSearchPanel.java
@@ -1,17 +1,13 @@
 package com.evolveum.midpoint.web.page.self.component;
 
-import com.evolveum.midpoint.gui.api.component.BasePanel;
-import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
-import com.evolveum.midpoint.security.api.AuthorizationConstants;
-import com.evolveum.midpoint.web.page.admin.resources.PageResources;
-import com.evolveum.midpoint.web.page.admin.server.PageTasks;
-import com.evolveum.midpoint.web.page.admin.users.PageUsers;
-import com.evolveum.midpoint.web.page.admin.users.dto.UsersDto;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.poi.ss.formula.functions.T;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
-import org.apache.wicket.markup.ComponentTag;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.form.TextField;
@@ -19,28 +15,41 @@
 import org.apache.wicket.markup.html.list.ListView;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
+import org.apache.wicket.model.util.ListModel;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import com.evolveum.midpoint.gui.api.component.BasePanel;
+import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
+import com.evolveum.midpoint.security.api.AuthorizationConstants;
+import com.evolveum.midpoint.util.logging.Trace;
+import com.evolveum.midpoint.util.logging.TraceManager;
+import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
+import com.evolveum.midpoint.web.page.admin.resources.PageResources;
+import com.evolveum.midpoint.web.page.admin.server.PageTasks;
+import com.evolveum.midpoint.web.page.admin.users.PageUsers;
 
 /**
  * Created by honchar.
  */
 public class DashboardSearchPanel extends BasePanel<T> {
+	
+	private static final long serialVersionUID = 1L;
+
+	private static final Trace LOGGER = TraceManager.getTrace(DashboardSearchPanel.class);
 
     private final String ID_SEARCH_INPUT = "searchInput";
     private final String ID_SEARCH_BUTTON = "searchButton";
     private final String ID_SEARCH_TYPE_ITEM = "searchTypeItem";
     private final String ID_SEARCH_TYPES = "searchTypes";
-    private final String ID_BUTTON_LABEL = "buttonLabel";
     private final String ID_SEARCH_FORM = "searchForm";
-    private List<String> SEARCH_TYPES;
-    private final int USER_INDEX = 0;
-    private final int RESOURCE_INDEX = 1;
-    private final int TASK_INDEX = 2;
-    private int selectedSearchType = 0;
+    
+    private static Map<SearchType, IModel<String>> SEARCH_TYPES = new HashMap<>(); 
 
+    private SearchType selectedSearchType = SearchType.USERS;
+    
+    private enum SearchType {
+    	USERS, RESOURCES, TASKS;
+    }
+    
     public DashboardSearchPanel(String id) {
         super(id);
     }
@@ -48,120 +57,113 @@ public DashboardSearchPanel(String id) {
     @Override
     protected void onInitialize(){
         super.onInitialize();
-        SEARCH_TYPES = Arrays.asList(
-                createStringResource("PageDashboard.search.users").getString(),
-                createStringResource("PageDashboard.search.resources").getString(),
-                createStringResource("PageDashboard.search.tasks").getString()
-        );
-
         initLayout();
+        setOutputMarkupId(true);
     }
 
     protected void initLayout() {
-        final Form searchForm = new com.evolveum.midpoint.web.component.form.Form(ID_SEARCH_FORM);
+        final Form<?> searchForm = new com.evolveum.midpoint.web.component.form.Form<>(ID_SEARCH_FORM);
         add(searchForm);
         searchForm.setOutputMarkupId(true);
 
-        final List<String> accessibleSearchTypes = new ArrayList<>();
         if (WebComponentUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_USERS_ALL_URL,
                 AuthorizationConstants.AUTZ_UI_USERS_URL)) {
-            accessibleSearchTypes.add(SEARCH_TYPES.get(USER_INDEX));
+        	SEARCH_TYPES.put(SearchType.USERS, createStringResource("PageDashboard.search.users"));
         }
         if (WebComponentUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_RESOURCES_ALL_URL,
                 AuthorizationConstants.AUTZ_UI_RESOURCES_URL)) {
-            accessibleSearchTypes.add(SEARCH_TYPES.get(RESOURCE_INDEX));
+        	SEARCH_TYPES.put(SearchType.RESOURCES, createStringResource("PageDashboard.search.resources"));
         }
         if (WebComponentUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_TASKS_ALL_URL,
                 AuthorizationConstants.AUTZ_UI_TASKS_URL)) {
-            accessibleSearchTypes.add(SEARCH_TYPES.get(TASK_INDEX));
-        }
-        if (accessibleSearchTypes.size() == 0) {
-            searchForm.setVisible(false);
-        } else {
-            final TextField searchInput = new TextField(ID_SEARCH_INPUT, Model.of("")) {
-                @Override
-                protected void onComponentTag(final ComponentTag tag) {
-                    super.onComponentTag(tag);
-                    tag.put("placeholder", createStringResource("PageDashboard.search.input").getString());
-                }
-            };
-            searchForm.add(searchInput);
-            final Label buttonLabel = new Label(ID_BUTTON_LABEL, new Model<String>() {
-                public String getObject() {
-                    return accessibleSearchTypes.get(selectedSearchType);
-                }
-            });
-            buttonLabel.setOutputMarkupId(true);
-
-            final AjaxSubmitLink searchButton = new AjaxSubmitLink(ID_SEARCH_BUTTON) {
-                @Override
-                protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
-                    String searchType = buttonLabel.getDefaultModel().getObject().toString();
-                    String searchText = searchInput.getValue();
-                    performSearch(searchType, searchText == null ? "" : searchText);
-                }
-            };
-            searchButton.setOutputMarkupId(true);
-            searchButton.add(buttonLabel);
-            searchForm.add(searchButton);
-            searchForm.setDefaultButton(searchButton);
-
-            ListView<String> li = new ListView<String>(ID_SEARCH_TYPES, new IModel<List<String>>() {
-                @Override
-                public void detach() {
-                }
-
-                @Override
-                public List<String> getObject() {
-                    return accessibleSearchTypes;
-                }
-
-                @Override
-                public void setObject(List<String> list) {
-                }
-            }) {
-
-                @Override
-                protected void populateItem(final ListItem<String> item) {
-                    final AjaxLink searchTypeLink = new AjaxLink(ID_SEARCH_TYPE_ITEM) {
-                        @Override
-                        public IModel<?> getBody() {
-                            return new Model<>(item.getModel().getObject());
-                        }
-
-                        @Override
-                        public void onClick(AjaxRequestTarget target) {
-                            selectedSearchType = accessibleSearchTypes.indexOf(item.getModelObject());
-                            target.add(DashboardSearchPanel.this.get(createComponentPath(ID_SEARCH_FORM, ID_SEARCH_BUTTON)));
-                        }
-
-                        @Override
-                        protected void onComponentTag(final ComponentTag tag) {
-                            super.onComponentTag(tag);
-                            tag.put("value", item.getModelObject());
-                        }
-
-                    };
-                    searchTypeLink.setOutputMarkupId(true);
-                    item.add(searchTypeLink);
-                }
-            };
-            li.setOutputMarkupId(true);
-            searchForm.add(li);
-
-
+        	SEARCH_TYPES.put(SearchType.TASKS, createStringResource("PageDashboard.search.tasks"));
         }
+        
+		TextField<String> searchInput = new TextField<>(ID_SEARCH_INPUT, Model.of(""));
+		searchInput.add(new VisibleBehaviour(() -> !SEARCH_TYPES.isEmpty()));
+		searchInput.setOutputMarkupId(true);
+		searchInput.setOutputMarkupPlaceholderTag(true);
+		searchForm.add(searchInput);
+
+		final AjaxSubmitLink searchButton = new AjaxSubmitLink(ID_SEARCH_BUTTON) {
+
+			private static final long serialVersionUID = 1L;
+
+			public IModel<?> getBody() {
+				return SEARCH_TYPES.get(selectedSearchType);
+			};
+			
+			@Override
+			protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+				performSearch(getSearchText());
+			}
+		};
+		searchButton.setOutputMarkupId(true);
+		searchButton.setOutputMarkupPlaceholderTag(true);
+		searchForm.add(searchButton);
+		searchForm.setDefaultButton(searchButton);
+
+		ListView<SearchType> li = new ListView<SearchType>(ID_SEARCH_TYPES,
+				new ListModel<SearchType>(new ArrayList<>(SEARCH_TYPES.keySet()))) {
+
+			private static final long serialVersionUID = 1L;
+
+			@Override
+			protected void populateItem(final ListItem<SearchType> item) {
+				final AjaxLink<String> searchTypeLink = new AjaxLink<String>(ID_SEARCH_TYPE_ITEM) {
+
+					private static final long serialVersionUID = 1L;
+
+					@Override
+					public IModel<String> getBody() {
+						return SEARCH_TYPES.get(item.getModelObject());
+					}
+
+					@Override
+					public void onClick(AjaxRequestTarget target) {
+						selectedSearchType = item.getModelObject();
+						target.add(DashboardSearchPanel.this.get(createComponentPath(ID_SEARCH_FORM, ID_SEARCH_BUTTON)));
+					}
+					
+
+				};
+				searchTypeLink.setOutputMarkupId(true);
+				item.add(searchTypeLink);
+			}
+		};
+		li.setOutputMarkupId(true);
+		searchForm.add(li);
+
+        
     }
 
-    private void performSearch(String searchType, String text) {
-        if (SEARCH_TYPES.indexOf(searchType) == USER_INDEX) {
-            setResponsePage(new PageUsers(text));
-        } else if (SEARCH_TYPES.indexOf(searchType) == RESOURCE_INDEX) {
-            setResponsePage(new PageResources(text));
-        } else if (SEARCH_TYPES.indexOf(searchType) == TASK_INDEX) {
-            setResponsePage(new PageTasks(text));
-        }
-
+ private  String getSearchText() {
+	 TextField<String> searchInput =  (TextField<String>) get(createComponentPath(ID_SEARCH_FORM, ID_SEARCH_INPUT));
+	 if (searchInput == null) {
+		 LOGGER.error("cannot find search input component");
+		 return null;
+	 }
+	 
+	 return searchInput.getModelObject();
+ }
+	
+
+    private void performSearch(String text) {
+    	
+    	switch (selectedSearchType) {
+			case USERS:
+				setResponsePage(new PageUsers(text));
+				break;
+			case RESOURCES:
+				setResponsePage(new PageResources(text));
+				break;
+			case TASKS:
+				setResponsePage(new PageTasks(text));
+				break;
+			default:
+				setResponsePage(new PageUsers(text));
+		}
+    	
     }
 
 }