diff --git a/build-system/pom.xml b/build-system/pom.xml
index 7aa63316247..221fa110309 100644
--- a/build-system/pom.xml
+++ b/build-system/pom.xml
@@ -1396,6 +1396,9 @@
 										<ignoredUnusedDeclaredDependency>org.testng:testng</ignoredUnusedDeclaredDependency>
 										<ignoredUnusedDeclaredDependency>commons-lang:commons-lang</ignoredUnusedDeclaredDependency>
 										
+										<!-- Declared, but not used if building only with the "default" profile -->
+										<ignoredUnusedDeclaredDependency>org.aspectj:aspectjweaver</ignoredUnusedDeclaredDependency>
+										
 										<!-- There is some kind of conflict between these. TODO: clean up -->
 										<ignoredUnusedDeclaredDependency>xml-apis:xml-apis</ignoredUnusedDeclaredDependency>
 										<ignoredUnusedDeclaredDependency>stax:stax-api</ignoredUnusedDeclaredDependency>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
index fc02bc7a5ef..9287c9f07bb 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
@@ -33,7 +33,7 @@ public class GuiStyleConstants {
 	public static final String STYLES_OBJECT_SERVICE_ICON = "fa fa-cloud";
 	public static final String STYLES_OBJECT_SERVICE_ICON_COLORED = STYLES_OBJECT_SERVICE_ICON + " object-service-color";
 	
-	public static final String STYLES_OBJECT_RESOURCE_ICON = "fa fa-laptop";
+	public static final String STYLES_OBJECT_RESOURCE_ICON = "fa fa-database";
 	public static final String STYLES_OBJECT_RESOURCE_ICON_COLORED = STYLES_OBJECT_RESOURCE_ICON + " object-resource-color";
 	
 	public static final String STYLES_OBJECT_TASK_ICON = "fa fa-tasks";
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
index ee8f9d10775..e497c99859c 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) 2016 Evolveum
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.evolveum.midpoint.gui.api.component;
 
 import java.util.Collection;
@@ -21,8 +36,10 @@
 import com.evolveum.midpoint.web.page.admin.configuration.PageImportObject;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
 
+/**
+ * @author katkav
+ */
 public abstract class MainObjectListPanel<T extends ObjectType> extends ObjectListPanel<T> {
-
 	private static final long serialVersionUID = 1L;
 	
 	private static final String ID_REFRESH = "refresh";
@@ -42,7 +59,7 @@ protected void onClickPerformed(AjaxRequestTarget target) {
 		};
 		add(refreshIcon);
 		
-LinkIconPanel newObjectIcon = new LinkIconPanel(ID_NEW_OBJECT, new Model<String>("fa fa-edit")){
+		LinkIconPanel newObjectIcon = new LinkIconPanel(ID_NEW_OBJECT, new Model<String>("fa fa-edit")){
 			
 			@Override
 			protected void onClickPerformed(AjaxRequestTarget target) {
@@ -51,7 +68,7 @@ protected void onClickPerformed(AjaxRequestTarget target) {
 		};
 		add(newObjectIcon);
 		
-LinkIconPanel importObject = new LinkIconPanel(ID_IMPORT_OBJECT, new Model<String>("fa fa-download")){
+		LinkIconPanel importObject = new LinkIconPanel(ID_IMPORT_OBJECT, new Model<String>("fa fa-download")){
 			
 			@Override
 			protected void onClickPerformed(AjaxRequestTarget target) {
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
index 4a067f7abe9..bc18aaf8718 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
@@ -49,6 +49,12 @@
 import com.evolveum.midpoint.web.component.search.SearchFormPanel;
 import com.evolveum.midpoint.web.component.util.ListDataProvider2;
 import com.evolveum.midpoint.web.component.util.SelectableBean;
+import com.evolveum.midpoint.web.page.admin.reports.PageReports;
+import com.evolveum.midpoint.web.page.admin.resources.PageResources;
+import com.evolveum.midpoint.web.page.admin.roles.PageRoles;
+import com.evolveum.midpoint.web.page.admin.services.PageService;
+import com.evolveum.midpoint.web.page.admin.services.PageServices;
+import com.evolveum.midpoint.web.page.admin.users.PageUsers;
 import com.evolveum.midpoint.web.session.PageStorage;
 import com.evolveum.midpoint.web.session.SessionStorage;
 import com.evolveum.midpoint.web.session.UserProfileStorage.TableId;
@@ -58,12 +64,12 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
 
+/**
+ * @author katkav
+ */
 public abstract class ObjectListPanel<T extends ObjectType> extends BasePanel<T> {
-
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = 1L;
+
 	// private static final String ID_SEARCH_FORM = "searchForm";
 	private static final String ID_MAIN_FORM = "mainForm";
 	private static final String ID_BUTTON_CANCEL = "cancelButton";
@@ -95,10 +101,11 @@ public Class<T> getType() {
 
 	static {
 		storageMap = new HashMap<Class, String>();
-		storageMap.put(UserType.class, SessionStorage.KEY_USERS);
-		storageMap.put(ResourceType.class, SessionStorage.KEY_RESOURCES);
-		storageMap.put(ReportType.class, SessionStorage.KEY_REPORTS);
-		storageMap.put(RoleType.class, SessionStorage.KEY_ROLES);
+		storageMap.put(PageUsers.class, SessionStorage.KEY_USERS);
+		storageMap.put(PageResources.class, SessionStorage.KEY_RESOURCES);
+		storageMap.put(PageReports.class, SessionStorage.KEY_REPORTS);
+		storageMap.put(PageRoles.class, SessionStorage.KEY_ROLES);
+		storageMap.put(PageServices.class, SessionStorage.KEY_SERVICES);
 		// storageMap.put(ObjectType.class, SessionStorage.KEY_CONFIGURATION);
 		// storageMap.put(FocusType.class, SessionStorage.KEY_ROLE_MEMBERS);
 
@@ -159,7 +166,7 @@ private void initLayout() {
 
 			@Override
 			public Search load() {
-				String storageKey = storageMap.get(type);
+				String storageKey = getStorageKey();//storageMap.get(parentPage.getClass());
 				Search search = null;
 				if (StringUtils.isNotEmpty(storageKey)) {
 					PageStorage storage = getSession().getSessionStorage().getPageStorageMap()
@@ -189,7 +196,7 @@ protected BaseSortableDataProvider<SelectableBean<T>> getProvider() {
 				parentPage, type) {
 			@Override
 			protected void saveProviderPaging(ObjectQuery query, ObjectPaging paging) {
-				String storageKey = storageMap.get(type);
+				String storageKey = getStorageKey();//storageMap.get(type);
 				if (StringUtils.isNotEmpty(storageKey)) {
 					PageStorage storage = getSession().getSessionStorage().getPageStorageMap()
 							.get(storageKey);
@@ -242,7 +249,7 @@ protected void searchPerformed(ObjectQuery query, AjaxRequestTarget target) {
 
 		};
 		table.setOutputMarkupId(true);
-		String storageKey = storageMap.get(type);
+		String storageKey = getStorageKey();//storageMap.get(type);
 		if (StringUtils.isNotEmpty(storageKey)) {
 			PageStorage storage = getSession().getSessionStorage().getPageStorageMap().get(storageKey);
 			if (storage != null) {
@@ -264,13 +271,20 @@ private BaseSortableDataProvider<SelectableBean<T>> getDataProvider() {
 	protected BoxedTablePanel<SelectableBean<T>> getTable() {
 		return (BoxedTablePanel<SelectableBean<T>>) get(createComponentPath(ID_MAIN_FORM, ID_TABLE));
 	}
+	
+	private String getStorageKey(){
+		return storageMap.get(parentPage.getClass());
+	}
 
 	private void searchPerformed(ObjectQuery query, AjaxRequestTarget target) {
 		BaseSortableDataProvider<SelectableBean<T>> provider = getDataProvider();
 		provider.setQuery(query);
-		String storageKey = storageMap.get(type);
+		String storageKey = getStorageKey();
 		if (StringUtils.isNotEmpty(storageKey)) {
 			PageStorage storage = getSession().getSessionStorage().getPageStorageMap().get(storageKey);
+			if (storage == null) {
+				storage = getSession().getSessionStorage().initPageStorage(storageKey);
+			}
 			if (storage != null) {
 				storage.setSearch(searchModel.getObject());
 				storage.setPaging(null);
@@ -304,10 +318,6 @@ public StringResourceModel createStringResource(String resourceKey, Object... ob
 		return PageBase.createStringResourceStatic(this, resourceKey, objects);
 	}
 
-	protected void onCheckboxUpdate(AjaxRequestTarget target) {
-
-	}
-
 	protected abstract IColumn<SelectableBean<T>, String> createCheckboxColumn();
 
 	protected abstract IColumn<SelectableBean<T>, String> createNameColumn();
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/PopupObjectListPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/PopupObjectListPanel.java
index a906d712ac1..a36e0afb9df 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/PopupObjectListPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/PopupObjectListPanel.java
@@ -1,9 +1,9 @@
 package com.evolveum.midpoint.gui.api.component;
 
-import java.util.Collection;
 import java.util.List;
 
 import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
 import org.apache.wicket.model.IModel;
@@ -26,7 +26,19 @@ public PopupObjectListPanel(String id, Class<T> type, boolean multiselect, PageB
 	@Override
 	protected IColumn<SelectableBean<T>, String> createCheckboxColumn() {
 		if (isMultiselect()) {
-			return new CheckBoxHeaderColumn<SelectableBean<T>>();
+			return new CheckBoxHeaderColumn<SelectableBean<T>>() {
+				@Override
+				protected void onUpdateRow(AjaxRequestTarget target, DataTable table, IModel<SelectableBean<T>> rowModel) {
+					super.onUpdateRow(target, table, rowModel);
+					onUpdateCheckbox(target);
+				};
+				
+				@Override
+				protected void onUpdateHeader(AjaxRequestTarget target, boolean selected, DataTable table) {
+					super.onUpdateHeader(target, selected, table);
+					onUpdateCheckbox(target);
+				}
+			};
 		}
 		return null;
 	}
@@ -65,5 +77,9 @@ protected void onSelectPerformed(AjaxRequestTarget target, T object){
 	protected List<InlineMenuItem> createInlineMenu() {
 		return null;
 	}
+	
+	protected void onUpdateCheckbox(AjaxRequestTarget target){
+		
+	}
 
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.html
index 195a07ea416..a52b69484ad 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.html
@@ -17,28 +17,37 @@
 <wicket:panel xmlns:wicket="http://wicket.apache.org">
 
 	<div class="form-inline search-form">
-
-		<div class="form-group">
+<div class="row">
+		<div class="form-group col-md-12">
 			<label><wicket:message key="roleMemberPanel.type" /></label> 
 			<select class="form-control input-sm" wicket:id="type" />
 		</div>
-		
-		<div class="form-group col-md-4">
-			<label><wicket:message key="typedAssignablePanel.selectedResources" /></label> 
-			<label class="form-control input-sm" wicket:id="resourcesSelected" />
-		</div>
-		<div class="form-group col-md-4">
-			<label><wicket:message key="typedAssignablePanel.selectedRoles" /></label> 
-			<label class="form-control input-sm" wicket:id="rolesSelected" />
-		</div>
-		<div class="form-group col-md-4">
-			<label><wicket:message key="typedAssignablePanel.selectedOrgs" /></label> 
-			<label class="form-control input-sm" wicket:id="orgSelected" />
+</div>
+		<div wicket:id="countContainer">
+			<div class="form-group col-md-3">
+				<label><wicket:message key="typedAssignablePanel.selectedResources" /></label> 
+				<label wicket:id="resourcesSelected" />
+			</div>
+			<div class="form-group col-md-3">
+				<label><wicket:message key="typedAssignablePanel.selectedRoles" /></label> 
+				<label wicket:id="rolesSelected" />
+			</div>
+			<div class="form-group col-md-3">
+				<label><wicket:message key="typedAssignablePanel.selectedOrgs" /></label> 
+				<label wicket:id="orgSelected" />
+			</div>
+			<div class="form-group col-md-3">
+				<label><wicket:message key="typedAssignablePanel.selectedServices" /></label> 
+				<label wicket:id="servicesSelected" />
+			</div>
 		</div>
 	</div>
 
-	<div wicket:id="roleTable"></div>
-	<div wicket:id="resourceTable"></div>
-	<div wicket:id="orgTable"></div>
+	<div wicket:id="tablesContainer">
+		<div wicket:id="roleTable"></div>
+		<div wicket:id="resourceTable"></div>
+		<div wicket:id="orgTable"></div>
+		<div wicket:id="serviceTable"></div>
+	</div>
 	<a class="btn btn-sm btn-primary"  wicket:id="assignButton"/>
 </wicket:panel>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.java
index 7d52ec0df59..045f9a2cdb8 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.java
@@ -21,6 +21,7 @@
 
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
+import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.DropDownChoice;
 import org.apache.wicket.model.IModel;
@@ -38,6 +39,7 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.OrgType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ServiceType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
 
 public class TypedAssignablePanel<T extends ObjectType> extends BasePanel<T> {
@@ -51,6 +53,11 @@ public class TypedAssignablePanel<T extends ObjectType> extends BasePanel<T> {
 	private static final String ID_SELECTED_RESOURCES = "resourcesSelected";
 	private static final String ID_SELECTED_ORGS = "orgSelected";
 
+	private static final String ID_TABLES_CONTAINER = "tablesContainer";
+	private static final String ID_COUNT_CONTAINER = "countContainer";
+	private static final String ID_SERVICE_TABLE = "serviceTable";
+	private static final String ID_SELECTED_SERVICES = "servicesSelected";
+	
 	private static final String ID_BUTTON_ASSIGN = "assignButton";
 
 	private IModel<QName> typeModel;
@@ -73,7 +80,7 @@ protected QName load() {
 	}
 	
 	private List<T> getSelectedData(String id){
-		return ((ObjectListPanel) get(id)).getSelectedObjects();
+		return ((ObjectListPanel) get(createComponentPath(ID_TABLES_CONTAINER, id))).getSelectedObjects();
 	}
 	
 	private Label  createCountLabel(String id, ObjectListPanel panel){
@@ -81,6 +88,7 @@ private Label  createCountLabel(String id, ObjectListPanel panel){
 		label.setOutputMarkupId(true);
 		return label;
 	}
+	
 
 	private void initLayout(Class<T> type, final boolean multiselect) {
 		DropDownChoice<QName> typeSelect = new DropDownChoice(ID_TYPE, typeModel,
@@ -89,37 +97,46 @@ private void initLayout(Class<T> type, final boolean multiselect) {
 
 			@Override
 			protected void onUpdate(AjaxRequestTarget target) {
-				ObjectListPanel<T> listRolePanel = (ObjectListPanel<T>) get(ID_ROLE_TABLE);
-//				listRolePanel.setVisible(false);
-				ObjectListPanel<T> listResourcePanel = (ObjectListPanel<T>) get(ID_RESOURCE_TABLE);
-				ObjectListPanel<T> listOrgPanel = (ObjectListPanel<T>) get(ID_ORG_TABLE);
+//				ObjectListPanel<T> listRolePanel = (ObjectListPanel<T>) get(ID_ROLE_TABLE);
+////				listRolePanel.setVisible(false);
+//				ObjectListPanel<T> listResourcePanel = (ObjectListPanel<T>) get(ID_RESOURCE_TABLE);
+//				ObjectListPanel<T> listOrgPanel = (ObjectListPanel<T>) get(ID_ORG_TABLE);
 				
+				target.add(get(ID_TABLES_CONTAINER));
+				target.add(addOrReplace(createCountContainer()));
 //				listRolePanel.setVisible(true);
 				
 //				addOrReplace(listRolePanel);
 //				addOrReplace(listResourcePanel);
-				target.add(addOrReplace(listRolePanel));
-				target.add(addOrReplace(listResourcePanel));
-				target.add(addOrReplace(listOrgPanel));
-				target.add(addOrReplace(createCountLabel(ID_SELECTED_ORGS, listOrgPanel)));
-				target.add(addOrReplace(createCountLabel(ID_SELECTED_RESOURCES, listResourcePanel)));
-				target.add(addOrReplace(createCountLabel(ID_SELECTED_ROLES, listRolePanel)));
+//				target.add(addOrReplace(listRolePanel));
+//				target.add(addOrReplace(listResourcePanel));
+//				target.add(addOrReplace(listOrgPanel));
+//				target.add(addOrReplace(createCountLabel(ID_SELECTED_ORGS, listOrgPanel)));
+//				target.add(addOrReplace(createCountLabel(ID_SELECTED_RESOURCES, listResourcePanel)));
+//				target.add(addOrReplace(createCountLabel(ID_SELECTED_ROLES, listRolePanel)));
 			}
 		});
 		typeSelect.setOutputMarkupId(true);
 		add(typeSelect);
-
-		ObjectListPanel<T> listRolePanel = createObjectListPanel(ID_ROLE_TABLE, ID_SELECTED_ROLES, RoleType.COMPLEX_TYPE);
-		add(listRolePanel);
-		ObjectListPanel<T> listResourcePanel = createObjectListPanel(ID_RESOURCE_TABLE, ID_SELECTED_RESOURCES, ResourceType.COMPLEX_TYPE);
-		add(listResourcePanel);
-		ObjectListPanel<T> listOrgPanel = createObjectListPanel(ID_ORG_TABLE, ID_SELECTED_ORGS, OrgType.COMPLEX_TYPE);
-		add(listOrgPanel);
 		
+		WebMarkupContainer tablesContainer = new WebMarkupContainer(ID_TABLES_CONTAINER);
+		tablesContainer.setOutputMarkupId(true);
+		add(tablesContainer);
+
+		PopupObjectListPanel<T> listRolePanel = createObjectListPanel(ID_ROLE_TABLE, ID_SELECTED_ROLES, RoleType.COMPLEX_TYPE);
+		tablesContainer.add(listRolePanel);
+		PopupObjectListPanel<T> listResourcePanel = createObjectListPanel(ID_RESOURCE_TABLE, ID_SELECTED_RESOURCES, ResourceType.COMPLEX_TYPE);
+		tablesContainer.add(listResourcePanel);
+		PopupObjectListPanel<T> listOrgPanel = createObjectListPanel(ID_ORG_TABLE, ID_SELECTED_ORGS, OrgType.COMPLEX_TYPE);
+		tablesContainer.add(listOrgPanel);
+		PopupObjectListPanel<T> listServicePanel = createObjectListPanel(ID_SERVICE_TABLE, ID_SELECTED_SERVICES, ServiceType.COMPLEX_TYPE);
+		tablesContainer.add(listServicePanel);
+		
+		
+		
+		WebMarkupContainer countContainer = createCountContainer();
+		add(countContainer);
 		
-		add(createCountLabel(ID_SELECTED_ORGS, listOrgPanel));
-		add(createCountLabel(ID_SELECTED_RESOURCES, listResourcePanel));
-		add(createCountLabel(ID_SELECTED_ROLES, listRolePanel));
 		
 		AjaxButton addButton = new AjaxButton(ID_BUTTON_ASSIGN,
 				createStringResource("userBrowserDialog.button.addButton")) {
@@ -129,6 +146,7 @@ public void onClick(AjaxRequestTarget target) {
 				List<T> selected = getSelectedData(ID_ROLE_TABLE);
 				selected.addAll(getSelectedData(ID_RESOURCE_TABLE));
 				selected.addAll(getSelectedData(ID_ORG_TABLE));
+				selected.addAll(getSelectedData(ID_SERVICE_TABLE));
 				TypedAssignablePanel.this.addPerformed(target, selected);
 			}
 		};
@@ -143,14 +161,27 @@ public boolean isVisible() {
 
 		add(addButton);
 	}
+	
+	private WebMarkupContainer createCountContainer(){
+		WebMarkupContainer countContainer = new WebMarkupContainer(ID_COUNT_CONTAINER);
+		countContainer.setOutputMarkupId(true);
+		countContainer.add(createCountLabel(ID_SELECTED_ORGS, (PopupObjectListPanel<T>)get(createComponentPath(ID_TABLES_CONTAINER, ID_ORG_TABLE))));
+		countContainer.add(createCountLabel(ID_SELECTED_RESOURCES, (PopupObjectListPanel<T>)get(createComponentPath(ID_TABLES_CONTAINER, ID_RESOURCE_TABLE))));
+		countContainer.add(createCountLabel(ID_SELECTED_ROLES, (PopupObjectListPanel<T>)get(createComponentPath(ID_TABLES_CONTAINER, ID_ROLE_TABLE))));
+		countContainer.add(createCountLabel(ID_SELECTED_SERVICES, (PopupObjectListPanel<T>)get(createComponentPath(ID_TABLES_CONTAINER, ID_SERVICE_TABLE))));
+		return countContainer;
+	}
 
 	protected void onClick(AjaxRequestTarget target, T focus) {
 		parentPage.hideMainPopup(target);
 	}
 
-	private ObjectListPanel<T> createObjectListPanel(String id, final String countId, final QName type) {
+	private PopupObjectListPanel<T> createObjectListPanel(String id, final String countId, final QName type) {
 		PopupObjectListPanel<T> listPanel = new PopupObjectListPanel<T>(id, qnameToCompileTimeClass(type), true, parentPage) {
-			
+			@Override
+			protected void onUpdateCheckbox(AjaxRequestTarget target) {
+				target.add(getParent().getParent().addOrReplace(createCountContainer()));
+			}
 		
 		};
 //		ObjectListPanel<T> listPanel = new ObjectListPanel<T>(id, qnameToCompileTimeClass(type), parentPage) {
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OperationResultPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OperationResultPanel.java
index aea5b2c7915..92533ce197d 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OperationResultPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OperationResultPanel.java
@@ -103,10 +103,10 @@ public Object getObject() {
 				case SUCCESS:
 					sb.append(" fa-check");
 					break;
-				case PARTIAL_ERROR:
 				case FATAL_ERROR:
 					sb.append(" fa-ban");
 					break;
+				case PARTIAL_ERROR:
 				case UNKNOWN:
 				case WARNING:
 				case HANDLED_ERROR:
@@ -541,9 +541,10 @@ public String getObject() {
 				case SUCCESS:
 					return " box-success";
 				case FATAL_ERROR:
-				case PARTIAL_ERROR:
+				
 					return " box-danger";
 				case UNKNOWN:
+				case PARTIAL_ERROR:
 				case HANDLED_ERROR: // TODO:
 				case WARNING:
 				default:
@@ -606,9 +607,10 @@ private String getLabelCss(final IModel<OpResult> model) {
 		case SUCCESS:
 			return "left-success";
 		case FATAL_ERROR:
-		case PARTIAL_ERROR:
+		
 			return "left-danger";
 		case UNKNOWN:
+		case PARTIAL_ERROR:
 		case HANDLED_ERROR: // TODO:
 		case WARNING:
 		default:
@@ -630,9 +632,10 @@ private String getIconCss(final IModel<OpResult> model) {
 		case SUCCESS:
 			return "fa-check-circle-o text-success";
 		case FATAL_ERROR:
-		case PARTIAL_ERROR:
+		
 			return "fa-times-circle-o text-danger";
 		case UNKNOWN:
+		case PARTIAL_ERROR:
 		case HANDLED_ERROR: // TODO:
 		case WARNING:
 		default:
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
index 41b8c06800b..d67f62748ca 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -16,6 +16,7 @@
 
 package com.evolveum.midpoint.gui.api.util;
 
+import com.evolveum.midpoint.gui.api.GuiStyleConstants;
 import com.evolveum.midpoint.gui.api.model.LoadableModel;
 import com.evolveum.midpoint.gui.api.page.PageBase;
 import com.evolveum.midpoint.prism.*;
@@ -192,6 +193,7 @@ public static List<QName> createAssignableTypesList() {
 		focusTypeList.add(ResourceType.COMPLEX_TYPE);
 		focusTypeList.add(OrgType.COMPLEX_TYPE);
 		focusTypeList.add(RoleType.COMPLEX_TYPE);
+		focusTypeList.add(ServiceType.COMPLEX_TYPE);
 
 		return focusTypeList;
 	}
@@ -732,37 +734,51 @@ public static String createUserIcon(PrismObject<UserType> object) {
 				continue;
 			}
 			if (StringUtils.equals(targetRef.getOid(), SystemObjectsType.ROLE_SUPERUSER.value())) {
-				return "fa fa-male text-danger";
+				return GuiStyleConstants.STYLES_OBJECT_USER_ICON + " text-danger";
 			}
 		}
 
-		ActivationType activation = user.getActivation();
-		if (activation != null && ActivationStatusType.DISABLED.equals(activation.getEffectiveStatus())) {
-			return "fa fa-male text-muted";
-		}
-
-		return "fa fa-male";
+		return getIconEnabledDisabled(object, GuiStyleConstants.STYLES_OBJECT_USER_ICON);
 	}
 	
 	
 	public static String createRoleIcon(PrismObject<RoleType> object) {
-		return "fa fa-street-view";
+		return getIconEnabledDisabled(object, GuiStyleConstants.STYLES_OBJECT_ROLE_ICON);
 	}
 	
 	public static String createOrgIcon(PrismObject<OrgType> object) {
-		return "fa fa-building";
+		return getIconEnabledDisabled(object, GuiStyleConstants.STYLES_OBJECT_ORG_ICON);
 	}
 	
 	public static String createServiceIcon(PrismObject<ServiceType> object) {
-		return "fa fa-building";
+		return getIconEnabledDisabled(object, GuiStyleConstants.STYLES_OBJECT_SERVICE_ICON);
 	}
-	
+
+	private static <F extends FocusType> String getIconEnabledDisabled(PrismObject<F> object, String baseIcon) {
+		ActivationType activation = object.asObjectable().getActivation();
+		if (activation != null && ActivationStatusType.DISABLED.equals(activation.getEffectiveStatus())) {
+			return baseIcon + " text-muted";
+		}
+
+		return baseIcon;
+	}
+
 	public static String createResourceIcon(PrismObject<ResourceType> object) {
-		return "fa fa-laptop";
+		OperationalStateType operationalState = object.asObjectable().getOperationalState();
+		if (operationalState != null) {
+			AvailabilityStatusType lastAvailabilityStatus = operationalState.getLastAvailabilityStatus();
+			if (lastAvailabilityStatus == AvailabilityStatusType.UP) {
+				return GuiStyleConstants.STYLES_OBJECT_RESOURCE_ICON + " text-success";
+			}
+			if (lastAvailabilityStatus == AvailabilityStatusType.DOWN) {
+				return GuiStyleConstants.STYLES_OBJECT_RESOURCE_ICON + " text-danger";
+			}
+		}
+		return GuiStyleConstants.STYLES_OBJECT_RESOURCE_ICON;
 	}
 	
 	public static String createTaskIcon(PrismObject<TaskType> object) {
-		return "fa fa-tasks";
+		return GuiStyleConstants.STYLES_OBJECT_TASK_ICON;
 	}
 	
 	public static String createShadowIcon(PrismObject<ShadowType> object) {
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
index 16dc201e401..1913eecd4c5 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
@@ -121,7 +121,7 @@ public AssignmentEditorDto(UserDtoStatus status, AssignmentType assignment, Page
 	public static AssignmentEditorDto createDtoAddFromSelectedObject(ObjectType object, PageBase pageBase) {
 		AssignmentEditorDto dto = createDtoFromObject(object, UserDtoStatus.ADD,
 				pageBase);
-		dto.setMinimized(false);
+		dto.setMinimized(true);
 		dto.setShowEmpty(true);
 		
 		return dto;
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDtoType.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDtoType.java
index 61bba3dcc11..855e7b8c67e 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDtoType.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDtoType.java
@@ -19,6 +19,7 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.OrgType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ServiceType;
 
 import javax.xml.namespace.QName;
 
@@ -30,6 +31,8 @@ public enum AssignmentEditorDtoType {
     ORG_UNIT(OrgType.class, OrgType.COMPLEX_TYPE),
 
     ROLE(RoleType.class, RoleType.COMPLEX_TYPE),
+    
+    SERVICE(ServiceType.class, ServiceType.COMPLEX_TYPE),
 
     ACCOUNT_CONSTRUCTION(null, null);
 
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelectorPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelectorPanel.java
index 880b4bbe3b3..b594460c821 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelectorPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelectorPanel.java
@@ -83,6 +83,7 @@ public class MultipleAssignmentSelectorPanel<F extends FocusType, H extends Focu
     private List<OrgType> tenantEditorObject = new ArrayList<>();
     private List<OrgType> orgEditorObject = new ArrayList<>();
     private PrismObject<UserType> user;
+    private ObjectQuery dataProviderQuery;
     private ObjectFilter authorizedRolesFilter = null;
     private IModel<ObjectFilter> filterModel = null;
     private static final Trace LOGGER = TraceManager.getTrace(MultipleAssignmentSelectorPanel.class);
@@ -223,22 +224,31 @@ private void deleteFromAssignmentsModel(AjaxRequestTarget target, MultipleAssign
     }
 
     public ObjectDataProvider getAvailableAssignmentsDataProvider() {
-        return new ObjectDataProvider<AssignmentEditorDto, F>(this, type) {
+        ObjectDataProvider<AssignmentEditorDto, F> provider = new ObjectDataProvider<AssignmentEditorDto, F>(this, type) {
 
             @Override
             public AssignmentEditorDto createDataObjectWrapper(PrismObject<F> obj) {
                 return AssignmentEditorDto.createDtoFromObject(obj.asObjectable(), UserDtoStatus.MODIFY, getPageBase());
             }
 
+            @Override
+            public void setQuery(ObjectQuery query) {
+                super.setQuery(query);
+                dataProviderQuery = query;
+            }
+
             @Override
             public ObjectQuery getQuery() {
-                ObjectQuery query = new ObjectQuery();
+                if (dataProviderQuery == null){
+                    dataProviderQuery = new ObjectQuery();
+                }
                 if (filterModel != null && filterModel.getObject() != null){
-                    query.addFilter(filterModel.getObject());
+                    dataProviderQuery.addFilter(filterModel.getObject());
                 }
-                return query;
+                return dataProviderQuery;
             }
         };
+        return provider;
     }
 
     private  IModel<ObjectFilter> getFilterModel(){
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.java
index b877bdc5eb1..4370f73c0ef 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.java
@@ -237,7 +237,7 @@ public Component getFooterMenu(){
         }
 
         public Component getFooterCountLabel(){
-            return get(ID_COUNT);
+            return get(ID_FOOTER_CONTAINER).get(ID_COUNT);
         }
 
         public Component getFooterPaging(){
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/CheckBoxHeaderColumn.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/CheckBoxHeaderColumn.java
index a87110d69c3..8b1fdfdba24 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/CheckBoxHeaderColumn.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/CheckBoxHeaderColumn.java
@@ -61,8 +61,6 @@ public void onUpdate(AjaxRequestTarget target) {
                 boolean selected = model.getObject() != null ? model.getObject() : false;
 
                 onUpdateHeader(target, selected, table);
-                
-                onCheckboxUpdate(target);
             }
         };
         panel.setOutputMarkupId(true);
@@ -78,9 +76,6 @@ public boolean isVisible() {
         return panel;
     }
     
-    protected void onCheckboxUpdate(AjaxRequestTarget target){
-    	
-    }
 
     @Override
     public String getCssClass() {
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java
index 9a8d5151c88..e7f9e4142c8 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java
@@ -368,7 +368,7 @@ public static <T extends ObjectType> List<IColumn<SelectableBean<T>, String>> ge
 		List<IColumn<SelectableBean<T>, String>> columns = new ArrayList<IColumn<SelectableBean<T>, String>>();
 		
 
-		columns.addAll((Collection)getDefaultAbstractRoleColumns());
+		columns.addAll((Collection)getDefaultAbstractRoleColumns(RoleType.COMPLEX_TYPE));
 
 		return columns;
 	}
@@ -376,7 +376,7 @@ public static <T extends ObjectType> List<IColumn<SelectableBean<T>, String>> ge
 	public static <T extends ObjectType> List<IColumn<SelectableBean<T>, String>> getDefaultServiceColumns() {
 		List<IColumn<SelectableBean<T>, String>> columns = new ArrayList<IColumn<SelectableBean<T>, String>>();
 	
-		columns.addAll((Collection)getDefaultAbstractRoleColumns());
+		columns.addAll((Collection)getDefaultAbstractRoleColumns(ServiceType.COMPLEX_TYPE));
 
 		return columns;
 	}
@@ -384,21 +384,27 @@ public static <T extends ObjectType> List<IColumn<SelectableBean<T>, String>> ge
 	public static <T extends ObjectType> List<IColumn<SelectableBean<T>, String>> getDefaultOrgColumns() {
 		List<IColumn<SelectableBean<T>, String>> columns = new ArrayList<IColumn<SelectableBean<T>, String>>();
 
-		columns.addAll((Collection)getDefaultAbstractRoleColumns());
+		columns.addAll((Collection)getDefaultAbstractRoleColumns(OrgType.COMPLEX_TYPE));
 
 		return columns;
 	}
 
-	private static <T extends ObjectType> List<IColumn<SelectableBean<T>, String>> getDefaultAbstractRoleColumns() {
+	private static <T extends ObjectType> List<IColumn<SelectableBean<T>, String>> getDefaultAbstractRoleColumns(QName type) {
 
+		String sortByDisplayName = null;
+		String sortByIdentifer = null;
+		if (OrgType.COMPLEX_TYPE.equals(type)) {
+			sortByDisplayName = AbstractRoleType.F_DISPLAY_NAME.getLocalPart();
+			sortByIdentifer = AbstractRoleType.F_IDENTIFIER.getLocalPart();
+		}
 		List<ColumnTypeDto> columnsDefs = Arrays.asList(
 				new ColumnTypeDto("AbstractRoleType.displayName",
-						AbstractRoleType.F_DISPLAY_NAME.getLocalPart(),
+						sortByDisplayName,
 						SelectableBean.F_VALUE + ".displayName", false),
 				new ColumnTypeDto("AbstractRoleType.description",
-						AbstractRoleType.F_DESCRIPTION.getLocalPart(),
+						null,
 						SelectableBean.F_VALUE + ".description", false),
-				new ColumnTypeDto("AbstractRoleType.identifier", AbstractRoleType.F_IDENTIFIER.getLocalPart(),
+				new ColumnTypeDto("AbstractRoleType.identifier", sortByIdentifer,
 						SelectableBean.F_VALUE + ".identifier", false)
 
 		);
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItemPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItemPanel.java
index 4dbd2c1b82a..eecf443a951 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItemPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItemPanel.java
@@ -27,10 +27,12 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
 import org.apache.commons.lang.StringUtils;
 import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.Component;
 import org.apache.wicket.MarkupContainer;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.behavior.Behavior;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.DropDownChoice;
@@ -366,6 +368,14 @@ protected void onUpdate(AjaxRequestTarget target) {
                     //nothing to do, just update model data
                 }
             });
+            input.add(new Behavior() {
+                @Override
+                public void bind(Component component) {
+                    super.bind( component );
+
+                    component.add( AttributeModifier.replace( "onkeydown", Model.of( "if(event.keyCode == 13) {event.preventDefault();}" ) ) );
+                }
+            });
             input.setOutputMarkupId(true);
             add(input);
         }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
index e34569c839c..5dd132923e3 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
@@ -38,6 +38,7 @@
 import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
 import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.behavior.Behavior;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.CheckBox;
@@ -48,6 +49,7 @@
 import org.apache.wicket.markup.html.list.ListView;
 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.time.Duration;
 
@@ -331,6 +333,15 @@ public boolean isVisible() {
         propList.add(properties);
 
         TextField addText = new TextField(ID_ADD_TEXT, new PropertyModel(moreDialogModel, MoreDialogDto.F_NAME_FILTER));
+        addText.add(new Behavior() {
+            @Override
+            public void bind(Component component) {
+                super.bind( component );
+
+                component.add( AttributeModifier.replace( "onkeydown", Model.of("if(event.keyCode == 13) {event.preventDefault();}") ) );
+            }
+        });
+
         popover.add(addText);
         addText.add(new AjaxFormComponentUpdatingBehavior("keyup") {
 
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageAdminResources.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageAdminResources.java
index 2e1ed86c38c..55c4c93a66e 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageAdminResources.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageAdminResources.java
@@ -108,9 +108,9 @@ protected PrismObject<ResourceType> loadResource(Collection<SelectorOptions<GetO
         return resource;
     }
 
-    protected void deleteSyncTokenPerformed(AjaxRequestTarget target, IModel<ResourceDto> model){
-        ResourceDto dto = model.getObject();
-        String resourceOid = dto.getOid();
+    protected void deleteSyncTokenPerformed(AjaxRequestTarget target, ResourceType resourceType){
+//        ResourceDto dto = model.getObject();
+        String resourceOid = resourceType.getOid();
         String handlerUri = "http://midpoint.evolveum.com/xml/ns/public/model/synchronization/task/live-sync/handler-3";
         ObjectReferenceType resourceRef = new ObjectReferenceType();
         resourceRef.setOid(resourceOid);
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceOld.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceOld.java
deleted file mode 100644
index 92524a7d5b1..00000000000
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceOld.java
+++ /dev/null
@@ -1,472 +0,0 @@
-/*
- * Copyright (c) 2010-2016 Evolveum
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.evolveum.midpoint.web.page.admin.resources;
-
-import com.evolveum.midpoint.common.refinery.RefinedResourceSchema;
-import com.evolveum.midpoint.gui.api.model.LoadableModel;
-import com.evolveum.midpoint.gui.api.page.PageBase;
-import com.evolveum.midpoint.prism.PrismObject;
-import com.evolveum.midpoint.schema.GetOperationOptions;
-import com.evolveum.midpoint.schema.SelectorOptions;
-import com.evolveum.midpoint.schema.result.OperationResult;
-import com.evolveum.midpoint.schema.result.OperationResultStatus;
-import com.evolveum.midpoint.schema.util.ResourceTypeUtil;
-import com.evolveum.midpoint.security.api.AuthorizationConstants;
-import com.evolveum.midpoint.task.api.Task;
-import com.evolveum.midpoint.util.exception.*;
-import com.evolveum.midpoint.util.logging.LoggingUtils;
-import com.evolveum.midpoint.util.logging.Trace;
-import com.evolveum.midpoint.util.logging.TraceManager;
-import com.evolveum.midpoint.web.application.AuthorizationAction;
-import com.evolveum.midpoint.web.application.PageDescriptor;
-import com.evolveum.midpoint.web.component.AjaxButton;
-import com.evolveum.midpoint.web.component.data.TablePanel;
-import com.evolveum.midpoint.web.component.util.ListDataProvider;
-import com.evolveum.midpoint.web.page.admin.home.PageDashboard;
-import com.evolveum.midpoint.web.page.admin.resources.dto.ResourceController;
-import com.evolveum.midpoint.web.page.admin.resources.dto.ResourceDto;
-import com.evolveum.midpoint.web.page.admin.resources.dto.ResourceObjectTypeDto;
-import com.evolveum.midpoint.web.page.admin.server.dto.OperationResultStatusIcon;
-import com.evolveum.midpoint.web.session.UserProfileStorage;
-import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.LayerType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ProvisioningScriptHostType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowKindType;
-import com.evolveum.midpoint.xml.ns._public.resource.capabilities_3.ScriptCapabilityType;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.wicket.AttributeModifier;
-import org.apache.wicket.RestartResponseException;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.extensions.markup.html.repeater.data.sort.SortOrder;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
-import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.namespace.QName;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * @author lazyman
- * @author Michal Serbak
- */
-//@PageDescriptor(url = "/admin/resource", encoder = OnePageParameterEncoder.class, action = {
-//        @AuthorizationAction(actionUri = PageAdminResources.AUTH_RESOURCE_ALL,
-//                label = PageAdminResources.AUTH_RESOURCE_ALL_LABEL,
-//                description = PageAdminResources.AUTH_RESOURCE_ALL_DESCRIPTION),
-//        @AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_RESOURCE_URL,
-//                label = "PageResource.auth.resource.label",
-//                description = "PageResource.auth.resource.description")})
-public class PageResourceOld extends PageAdminResources {
-
-    private static final Trace LOGGER = TraceManager.getTrace(PageResourceOld.class);
-
-    private static final String DOT_CLASS = PageResourceOld.class.getName() + ".";
-    private static final String OPERATION_IMPORT_FROM_RESOURCE = DOT_CLASS + "importFromResource";
-    private static final String TEST_CONNECTION = DOT_CLASS + "testConnection";
-
-    private static final String ID_FORM_MAIN = "mainForm";
-    private static final String ID_RESOURCE_OID = "resourceOid";
-    private static final String ID_RESOURCE_NAME = "resourceName";
-    private static final String ID_RESOURCE_TYPE = "resourceType";
-    private static final String ID_RESOURCE_VERSION = "resourceVersion";
-    private static final String ID_RESOURCE_PROGRESS = "resourceProgress";
-    private static final String ID_CONNECTORS = "connectors";
-    private static final String ID_OVERALL_STATUS = "overallStatus";
-    private static final String ID_CONF_VALIDATION = "confValidation";
-    private static final String ID_CON_INITIALIZATION = "conInitialization";
-    private static final String ID_CON_CONNECTION = "conConnection";
-    private static final String ID_CON_SCHEMA = "conSchema";
-    private static final String ID_LIST_CAPABILITIES = "listCapabilities";
-    private static final String ID_CAPABILITIES = "capabilities";
-    private static final String ID_TABLE_OBJECT_TYPE = "objectTypesTable";
-    private static final String ID_BUTTON_BACK = "back";
-    private static final String ID_BUTTON_EDIT = "editResource";
-    private static final String ID_BUTTON_TEST = "test";
-    private static final String ID_BUTTON_IMPORT_ACCOUNTS = "importAccounts";
-    private static final String ID_BUTTON_DELETE_SYNC_TOKEN = "deleteSyncToken";
-
-    private IModel<ResourceDto> model;
-    private PrismObject<ResourceType> resource;
-
-    public PageResourceOld() {
-        initialize();
-    }
-
-    public PageResourceOld(PageParameters parameters, PageBase previousPage) {
-        getPageParameters().overwriteWith(parameters);
-        setPreviousPage(previousPage);
-        initialize();
-    }
-
-    private void initialize() {
-        model = new LoadableModel<ResourceDto>() {
-
-            @Override
-            protected ResourceDto load() {
-                return loadResourceDto();
-            }
-        };
-        initLayout();
-    }
-
-    private ResourceDto loadResourceDto() {
-        if (!isResourceOidAvailable()) {
-            getSession().error(getString("pageResource.message.oidNotDefined"));
-            throw new RestartResponseException(PageResources.class);
-        }
-
-        Collection<SelectorOptions<GetOperationOptions>> options =
-                SelectorOptions.createCollection(ResourceType.F_CONNECTOR, GetOperationOptions.createResolve());
-
-        resource = loadResource(options);
-        return new ResourceDto(resource, getPrismContext(), resource.asObjectable().getConnector(),
-                initCapabilities(resource.asObjectable()));
-    }
-
-    private void initLayout() {
-        Form mainForm = new Form(ID_FORM_MAIN);
-        add(mainForm);
-
-        SortableDataProvider<ResourceObjectTypeDto, String> provider = new ListDataProvider<>(this,
-                new PropertyModel<List<ResourceObjectTypeDto>>(model, "objectTypes"));
-        provider.setSort("displayName", SortOrder.ASCENDING);
-        TablePanel objectTypes = new TablePanel<>(ID_TABLE_OBJECT_TYPE, provider, initObjectTypesColumns(),
-                UserProfileStorage.TableId.PAGE_RESOURCE_PANEL, getItemsPerPage(UserProfileStorage.TableId.PAGE_RESOURCE_PANEL));
-        objectTypes.setShowPaging(true);
-        objectTypes.setOutputMarkupId(true);
-        mainForm.add(objectTypes);
-
-        initResourceColumns(mainForm);
-        initConnectorDetails(mainForm);
-        createCapabilitiesList(mainForm);
-
-        initButtons(mainForm);
-    }
-
-    private void initResourceColumns(Form mainForm) {
-        mainForm.add(new Label(ID_RESOURCE_OID, new PropertyModel<>(model, "oid")));
-        mainForm.add(new Label(ID_RESOURCE_NAME, new PropertyModel<>(model, "name")));
-        mainForm.add(new Label(ID_RESOURCE_TYPE, new PropertyModel<>(model, "type")));
-        mainForm.add(new Label(ID_RESOURCE_VERSION, new PropertyModel<>(model, "version")));
-        mainForm.add(new Label(ID_RESOURCE_PROGRESS, new PropertyModel<>(model, "progress")));
-    }
-
-    private IModel<String> createTestConnectionStateTooltip(final String expression) {
-        return new AbstractReadOnlyModel<String>() {
-
-            @Override
-            public String getObject() {
-                PropertyModel<OperationResultStatus> pModel = new PropertyModel<OperationResultStatus>(model, expression);
-                OperationResultStatus status = pModel.getObject();
-                if (status == null) {
-                    return "";
-                }
-
-                return PageResourceOld.this.getString(OperationResultStatus.class.getSimpleName() + "." + status.name());
-            }
-        };
-    }
-
-    private Label createImageLabel(String id, IModel<String> title, IModel<String> cssClass) {
-        Label label = new Label(id);
-        label.add(AttributeModifier.replace("class", cssClass));
-        label.add(AttributeModifier.replace("title", title));
-
-        return label;
-    }
-
-    private void initConnectorDetails(Form mainForm) {
-        WebMarkupContainer container = new WebMarkupContainer(ID_CONNECTORS);
-        container.setOutputMarkupId(true);
-        mainForm.add(container);
-
-        container.add(createImageLabel(ID_OVERALL_STATUS, createTestConnectionStateTooltip("state.overall"),
-                new AbstractReadOnlyModel<String>() {
-
-                    @Override
-                    public String getObject() {
-                        return OperationResultStatusIcon.parseOperationalResultStatus(model.getObject().getState().getOverall()).getIcon();
-                    }
-                }
-        ));
-        container.add(createImageLabel(ID_CONF_VALIDATION, createTestConnectionStateTooltip("state.confValidation"),
-                new AbstractReadOnlyModel<String>() {
-
-                    @Override
-                    public String getObject() {
-                        return OperationResultStatusIcon.parseOperationalResultStatus(model.getObject().getState().getConfValidation()).getIcon();
-                    }
-                }
-        ));
-        container.add(createImageLabel(ID_CON_INITIALIZATION, createTestConnectionStateTooltip("state.conInitialization"),
-                new AbstractReadOnlyModel<String>() {
-
-                    @Override
-                    public String getObject() {
-                        return OperationResultStatusIcon.parseOperationalResultStatus(model.getObject().getState().getConInitialization()).getIcon();
-                    }
-                }
-        ));
-        container.add(createImageLabel(ID_CON_CONNECTION, createTestConnectionStateTooltip("state.conConnection"),
-                new AbstractReadOnlyModel<String>() {
-
-                    @Override
-                    public String getObject() {
-                        return OperationResultStatusIcon.parseOperationalResultStatus(model.getObject().getState().getConConnection()).getIcon();
-                    }
-                }
-        ));
-
-        container.add(createImageLabel(ID_CON_SCHEMA, createTestConnectionStateTooltip("state.conSchema"),
-                new AbstractReadOnlyModel<String>() {
-
-                    @Override
-                    public String getObject() {
-                        return OperationResultStatusIcon.parseOperationalResultStatus(model.getObject().getState().getConSchema()).getIcon();
-                    }
-                }
-        ));
-    }
-
-    private List<String> initCapabilities(ResourceType resource) {
-        OperationResult result = new OperationResult("Load resource capabilities");
-        List<String> capabilitiesName = new ArrayList<>();
-        try {
-            List<Object> capabilitiesList = ResourceTypeUtil.getEffectiveCapabilities(resource);
-
-            if (capabilitiesList != null && !capabilitiesList.isEmpty()) {
-                for (int i = 0; i < capabilitiesList.size(); i++) {
-                    capabilitiesName.add(getCapabilityName(capabilitiesList.get(i)));
-                }
-            }
-        } catch (Exception ex) {
-            result.recordFatalError("Couldn't load resource capabilities for resource'"
-                    + new PropertyModel<>(model, "name") + ".", ex);
-
-        }
-        return capabilitiesName;
-    }
-
-    private String getCapabilityName(Object capability) {
-        if (capability instanceof JAXBElement) {
-            capability = ((JAXBElement) capability).getValue();
-        }
-
-        StringBuilder sb = new StringBuilder();
-
-        String className = capability.getClass().getSimpleName();
-        if (className.endsWith("CapabilityType")) {
-            sb.append(className.substring(0, className.length() - "CapabilityType".length()));
-        } else {
-            sb.append(className);
-        }
-
-        if (capability instanceof ScriptCapabilityType) {
-            ScriptCapabilityType script = (ScriptCapabilityType) capability;
-            sb.append(": ");
-            List<ProvisioningScriptHostType> hosts = new ArrayList<>();
-            for (ScriptCapabilityType.Host host : script.getHost()) {
-                hosts.add(host.getType());
-            }
-
-            sb.append(StringUtils.join(hosts, ", "));
-        }
-
-        return sb.toString();
-    }
-
-    private List<IColumn<ResourceObjectTypeDto, String>> initObjectTypesColumns() {
-        List<IColumn<ResourceObjectTypeDto, String>> columns = new ArrayList<IColumn<ResourceObjectTypeDto, String>>();
-
-        columns.add(new PropertyColumn(createStringResource("pageResource.objectTypes.displayName"),
-                "displayName", "displayName"));
-        columns.add(new PropertyColumn(createStringResource("pageResource.objectTypes.nativeObjectClass"),
-                "nativeObjectClass"));
-        columns.add(new PropertyColumn(createStringResource("pageResource.objectTypes.help"), "help"));
-        columns.add(new PropertyColumn(createStringResource("pageResource.objectTypes.type"), "type"));
-
-        return columns;
-    }
-
-    private void createCapabilitiesList(Form mainForm) {
-        ListView<String> listCapabilities = new ListView<String>(ID_LIST_CAPABILITIES, createCapabilitiesModel(model)) {
-
-            @Override
-            protected void populateItem(ListItem<String> item) {
-                item.add(new Label(ID_CAPABILITIES, item.getModel()));
-
-            }
-        };
-        mainForm.add(listCapabilities);
-    }
-
-    private IModel<List<String>> createCapabilitiesModel(final IModel<ResourceDto> model) {
-        return new LoadableModel<List<String>>(false) {
-
-            @Override
-            protected List<String> load() {
-                ResourceDto resource = model.getObject();
-                return resource.getCapabilities();
-            }
-        };
-    }
-
-    private void initButtons(Form mainForm) {
-        AjaxButton back = new AjaxButton(ID_BUTTON_BACK, createStringResource("pageResource.button.back")) {
-
-            @Override
-            public void onClick(AjaxRequestTarget target) {
-                if (getPreviousPage() != null) {
-                    goBack(PageDashboard.class);            // the parameter is never used really
-                } else {
-                    setResponsePage(new PageResources(false));
-                }
-            }
-        };
-        mainForm.add(back);
-
-        AjaxButton test = new AjaxButton(ID_BUTTON_TEST, createStringResource("pageResource.button.test")) {
-
-            @Override
-            public void onClick(AjaxRequestTarget target) {
-                testConnectionPerformed(target);
-            }
-        };
-        mainForm.add(test);
-
-        AjaxButton importAccounts = new AjaxButton(ID_BUTTON_IMPORT_ACCOUNTS,
-                createStringResource("pageResource.button.importAccounts")) {
-
-            @Override
-            public void onClick(AjaxRequestTarget target) {
-                importFromResourcePerformed(target);
-            }
-        };
-        mainForm.add(importAccounts);
-
-        AjaxButton link = new AjaxButton(ID_BUTTON_EDIT, createStringResource("pageResource.editResource")) {
-
-            @Override
-            public void onClick(AjaxRequestTarget target) {
-                PageParameters parameters = new PageParameters();
-                parameters.add(OnePageParameterEncoder.PARAMETER, model.getObject().getOid());
-                setResponsePage(new PageResourceWizard(parameters));
-            }
-        };
-        mainForm.add(link);
-
-        AjaxButton deleteToken = new AjaxButton(ID_BUTTON_DELETE_SYNC_TOKEN, createStringResource("pageResource.deleteSyncToken")) {
-            @Override
-            public void onClick(AjaxRequestTarget target) {
-                deleteSyncTokenPerformed(target, model);
-            }
-        };
-        mainForm.add(deleteToken);
-    }
-
-    private void testConnectionPerformed(AjaxRequestTarget target) {
-        ResourceDto dto = model.getObject();
-        if (dto == null || StringUtils.isEmpty(dto.getOid())) {
-            error(getString("pageResource.message.oidNotDefined"));
-            target.add(getFeedbackPanel());
-            return;
-        }
-
-        Task task = createSimpleTask(TEST_CONNECTION);
-        OperationResult result = new OperationResult(TEST_CONNECTION);
-        try {
-            result = getModelService().testResource(dto.getOid(), task);
-            ResourceController.updateResourceState(dto.getState(), result);
-
-            // this provides some additional tests, namely a test for schema handling section
-            getModelService().getObject(ResourceType.class, dto.getOid(), null, task, result);
-        } catch (ObjectNotFoundException ex) {
-            result.recordFatalError("Failed to test resource connection", ex);
-        } catch (ConfigurationException e) {
-            result.recordFatalError("Failed to test resource connection", e);
-        } catch (SchemaException e) {
-            result.recordFatalError("Failed to test resource connection", e);
-        } catch (CommunicationException e) {
-            result.recordFatalError("Failed to test resource connection", e);
-        } catch (SecurityViolationException e) {
-            result.recordFatalError("Failed to test resource connection", e);
-        }
-
-        // a bit of hack: result of TestConnection contains a result of getObject as a subresult
-        // so in case of TestConnection succeeding we recompute the result to show any (potential) getObject problems
-        if (result.isSuccess()) {
-            result.recomputeStatus();
-        }
-
-        WebMarkupContainer connectors = (WebMarkupContainer) get(ID_FORM_MAIN + ":" + ID_CONNECTORS);
-        target.add(connectors);
-
-        if (!result.isSuccess()) {
-            showResult(result);
-            target.add(getFeedbackPanel());
-        }
-    }
-
-    private void importFromResourcePerformed(AjaxRequestTarget target) {
-        ResourceDto dto = model.getObject();
-        LOGGER.debug("Import accounts from resource {} ({}), object class {}",
-                new Object[]{dto.getName(), dto.getOid(), dto.getDefaultAccountObjectClass()});
-
-        OperationResult result = new OperationResult(OPERATION_IMPORT_FROM_RESOURCE);
-        try {
-            Task task = createSimpleTask(OPERATION_IMPORT_FROM_RESOURCE);
-            QName objectClass =  dto.getDefaultAccountObjectClass();
-            if (objectClass == null){
-                RefinedResourceSchema refinedSchema = RefinedResourceSchema.getRefinedSchema(resource,
-                        LayerType.MODEL, getPrismContext());
-                if (refinedSchema == null) {
-                    error("No refined schema for " + resource);
-                    LOGGER.debug("No refined schema for " + resource);
-                } else {
-                    objectClass = refinedSchema.getDefaultRefinedDefinition(ShadowKindType.ACCOUNT).getObjectClassDefinition()
-                            .getTypeName();
-                }
-
-            }
-            getModelService().importFromResource(dto.getOid(), objectClass, task, result);
-        } catch (Exception ex) {
-            LoggingUtils.logException(LOGGER, "Error occurred during accounts import from resource {} ({}), class {}",
-                    ex, dto.getName(), dto.getOid(), dto.getDefaultAccountObjectClass());
-            result.recordFatalError("Error occurred during importing accounts from resource.", ex);
-        }
-
-        result.computeStatus();
-
-        showResult(result);
-        target.add(getFeedbackPanel());
-    }
-}
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
index bf041ff1b74..6f50da284da 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
@@ -17,33 +17,30 @@
 package com.evolveum.midpoint.web.page.admin.resources;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.repeater.Item;
 import org.apache.wicket.model.AbstractReadOnlyModel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 
+import com.evolveum.midpoint.gui.api.component.MainObjectListPanel;
 import com.evolveum.midpoint.gui.api.model.LoadableModel;
 import com.evolveum.midpoint.gui.api.page.PageBase;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
-import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.prism.delta.ObjectDelta;
-import com.evolveum.midpoint.prism.query.ObjectPaging;
 import com.evolveum.midpoint.prism.query.ObjectQuery;
 import com.evolveum.midpoint.schema.GetOperationOptions;
+import com.evolveum.midpoint.schema.RetrieveOption;
 import com.evolveum.midpoint.schema.SelectorOptions;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.schema.result.OperationResultStatus;
@@ -63,7 +60,6 @@
 import com.evolveum.midpoint.web.component.data.column.ColumnMenuAction;
 import com.evolveum.midpoint.web.component.data.column.InlineMenuHeaderColumn;
 import com.evolveum.midpoint.web.component.data.column.LinkColumn;
-import com.evolveum.midpoint.web.component.data.column.LinkIconColumn;
 import com.evolveum.midpoint.web.component.dialog.ConfirmationDialog;
 import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem;
 import com.evolveum.midpoint.web.component.search.Search;
@@ -72,12 +68,6 @@
 import com.evolveum.midpoint.web.component.util.SelectableBean;
 import com.evolveum.midpoint.web.page.admin.configuration.PageDebugView;
 import com.evolveum.midpoint.web.page.admin.configuration.component.HeaderMenuAction;
-import com.evolveum.midpoint.web.page.admin.resources.component.ContentPanel;
-import com.evolveum.midpoint.web.page.admin.resources.content.PageContentEntitlements;
-import com.evolveum.midpoint.web.page.admin.resources.dto.ResourceController;
-import com.evolveum.midpoint.web.page.admin.resources.dto.ResourceDto;
-import com.evolveum.midpoint.web.page.admin.resources.dto.ResourceState;
-import com.evolveum.midpoint.web.page.admin.server.dto.OperationResultStatusIcon;
 import com.evolveum.midpoint.web.session.ResourcesStorage;
 import com.evolveum.midpoint.web.session.UserProfileStorage;
 import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
@@ -88,592 +78,541 @@
  * @author lazyman
  */
 @PageDescriptor(url = "/admin/resources", action = {
-        @AuthorizationAction(actionUri = PageAdminResources.AUTH_RESOURCE_ALL,
-                label = PageAdminResources.AUTH_RESOURCE_ALL_LABEL,
-                description = PageAdminResources.AUTH_RESOURCE_ALL_DESCRIPTION),
-        @AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_RESOURCES_URL,
-                label = "PageResources.auth.resources.label",
-                description = "PageResources.auth.resources.description")})
+		@AuthorizationAction(actionUri = PageAdminResources.AUTH_RESOURCE_ALL, label = PageAdminResources.AUTH_RESOURCE_ALL_LABEL, description = PageAdminResources.AUTH_RESOURCE_ALL_DESCRIPTION),
+		@AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_RESOURCES_URL, label = "PageResources.auth.resources.label", description = "PageResources.auth.resources.description") })
 public class PageResources extends PageAdminResources {
 
-    private static final Trace LOGGER = TraceManager.getTrace(PageResources.class);
-    private static final String DOT_CLASS = PageResources.class.getName() + ".";
-    private static final String OPERATION_TEST_RESOURCE = DOT_CLASS + "testResource";
-    private static final String OPERATION_SYNC_STATUS = DOT_CLASS + "syncStatus";
-    private static final String OPERATION_DELETE_RESOURCES = DOT_CLASS + "deleteResources";
-    private static final String OPERATION_DELETE_HOSTS = DOT_CLASS + "deleteHosts";
-    private static final String OPERATION_CONNECTOR_DISCOVERY = DOT_CLASS + "connectorDiscovery";
-
-    private static final String ID_DELETE_RESOURCES_POPUP = "deleteResourcesPopup";
-    private static final String ID_DELETE_HOSTS_POPUP = "deleteHostsPopup";
-    private static final String ID_MAIN_FORM = "mainForm";
-    private static final String ID_TABLE = "table";
-    private static final String ID_CONNECTOR_TABLE = "connectorTable";
-
-    private IModel<Search> searchModel;
-    private IModel<Search> chSearchModel;
-    private ResourceDto singleDelete;
-
-    public PageResources() {
-        this(true);
-    }
-
-    public PageResources(boolean clearSessionPaging) {
-        this(clearSessionPaging, "");
-    }
-
-    public PageResources(String searchText) {
-        this(true, searchText);
-    }
-
-    public PageResources(boolean clearSessionPaging, final String searchText) {
-        searchModel = new LoadableModel<Search>(false) {
-
-            @Override
-            protected Search load() {
-                ResourcesStorage storage = getSessionStorage().getResources();
-                Search dto = storage.getSearch();
-
-                if (dto == null) {
-                    dto = SearchFactory.createSearch(ResourceType.class, getPrismContext(), true);
-                }
-
-                return dto;
-            }
-        };
-
-        chSearchModel = new LoadableModel<Search>(false) {
-
-            @Override
-            protected Search load() {
-                return SearchFactory.createSearch(ConnectorHostType.class, getPrismContext(), true);
-            }
-        };
-
-        initLayout();
-    }
-
-    private void initLayout() {
-        Form mainForm = new Form(ID_MAIN_FORM);
-        add(mainForm);
-
-        BoxedTablePanel resources = new BoxedTablePanel(ID_TABLE, initResourceDataProvider(), initResourceColumns(),
-                UserProfileStorage.TableId.PAGE_RESOURCES_PANEL,
-                (int) getItemsPerPage(UserProfileStorage.TableId.PAGE_RESOURCES_PANEL)) {
-
-            @Override
-            protected WebMarkupContainer createHeader(String headerId) {
-                return new SearchFormPanel(headerId, searchModel) {
-
-                    @Override
-                    protected void searchPerformed(ObjectQuery query, AjaxRequestTarget target) {
-                        PageResources.this.searchPerformed(query, target);
-                    }
-                };
-            }
-        };
-        resources.setOutputMarkupId(true);
-
-        ResourcesStorage storage = getSessionStorage().getResources();
-        resources.setCurrentPage(storage.getPaging());
-
-        mainForm.add(resources);
-
-        BoxedTablePanel connectorHosts = new BoxedTablePanel(ID_CONNECTOR_TABLE,
-                new ObjectDataProvider(PageResources.this, ConnectorHostType.class), initConnectorHostsColumns(),
-                UserProfileStorage.TableId.PAGE_RESOURCES_CONNECTOR_HOSTS,
-                (int) getItemsPerPage(UserProfileStorage.TableId.PAGE_RESOURCES_CONNECTOR_HOSTS)) {
-
-            @Override
-            protected WebMarkupContainer createHeader(String headerId) {
-                return new SearchFormPanel(headerId, chSearchModel) {
-
-                    @Override
-                    protected void searchPerformed(ObjectQuery query, AjaxRequestTarget target) {
-                        PageResources.this.searchHostPerformed(query, target);
-                    }
-                };
-            }
-        };
-        connectorHosts.setOutputMarkupId(true);
-        mainForm.add(connectorHosts);
-
-        add(new ConfirmationDialog(ID_DELETE_RESOURCES_POPUP,
-                createStringResource("pageResources.dialog.title.confirmDelete"),
-                createDeleteConfirmString("pageResources.message.deleteResourceConfirm",
-                        "pageResources.message.deleteResourcesConfirm", true)) {
-
-            @Override
-            public void yesPerformed(AjaxRequestTarget target) {
-                close(target);
-                deleteResourceConfirmedPerformed(target);
-            }
-        });
-
-        add(new ConfirmationDialog(ID_DELETE_HOSTS_POPUP,
-                createStringResource("pageResources.dialog.title.confirmDelete"),
-                createDeleteConfirmString("pageResources.message.deleteHostConfirm",
-                        "pageResources.message.deleteHostsConfirm", false)) {
-
-            @Override
-            public void yesPerformed(AjaxRequestTarget target) {
-                close(target);
-                deleteHostConfirmedPerformed(target);
-            }
-        });
-    }
-
-    private BaseSortableDataProvider initResourceDataProvider() {
-        ObjectDataProvider provider = new ObjectDataProvider<ResourceDto, ResourceType>(this, ResourceType.class) {
-
-            @Override
-            public ResourceDto createDataObjectWrapper(PrismObject<ResourceType> obj) {
-                return createRowDto(obj);
-            }
-
-            @Override
-            protected void saveProviderPaging(ObjectQuery query, ObjectPaging paging) {
-                ResourcesStorage storage = getSessionStorage().getResources();
-                storage.setPaging(paging);
-            }
-
-            @Override
-            protected void handleNotSuccessOrHandledErrorInIterator(OperationResult result) {
-                if (result.isPartialError()) {
-                    showResult(result);
-                } else {
-                    super.handleNotSuccessOrHandledErrorInIterator(result);
-                }
-            }
-        };
-
-        Search search = searchModel.getObject();
-        ObjectQuery query = search.createObjectQuery(getPrismContext());
-        provider.setQuery(query);
-        provider.setOptions(SelectorOptions.createCollection(GetOperationOptions.createNoFetch()));
-        
-        return provider;
-    }
-
-    private ResourceDto createRowDto(PrismObject<ResourceType> object) {
-        ResourceDto dto = new ResourceDto(object);
-        dto.getMenuItems().add(new InlineMenuItem(createStringResource("PageBase.button.delete"),
-                new ColumnMenuAction<ResourceDto>() {
-
-                    @Override
-                    public void onClick(AjaxRequestTarget target) {
-                        ResourceDto rowDto = getRowModel().getObject();
-                        deleteResourcePerformed(target, rowDto);
-                    }
-                }));
-
-        dto.getMenuItems().add(new InlineMenuItem(createStringResource("pageResources.inlineMenuItem.deleteSyncToken"),
-                new ColumnMenuAction<ResourceDto>() {
-
-                    @Override
-                    public void onClick(AjaxRequestTarget target) {
-                        deleteResourceSyncTokenPerformed(target, getRowModel());
-                    }
-
-                }));
-
-        dto.getMenuItems().add(new InlineMenuItem(createStringResource("pageResources.inlineMenuItem.editResource"),
-                new ColumnMenuAction<ResourceDto>() {
-
-                    @Override
-                    public void onClick(AjaxRequestTarget target) {
-                        editResourcePerformed(getRowModel());
-                    }
-                }));
-        dto.getMenuItems().add(new InlineMenuItem(createStringResource("pageResources.button.editAsXml"),
-                new ColumnMenuAction<ResourceDto>() {
-
-                    @Override
-                    public void onClick(AjaxRequestTarget target) {
-                        editAsXmlPerformed(getRowModel());
-                    }
-                }));
-
-        return dto;
-    }
-
-    private List<IColumn<ResourceDto, String>> initResourceColumns() {
-        List<IColumn<ResourceDto, String>> columns = new ArrayList<>();
-
-        IColumn column = new CheckBoxHeaderColumn<ResourceDto>();
-        columns.add(column);
-
-        column = new LinkColumn<ResourceDto>(createStringResource("pageResources.name"),
-                "name", "name") {
-
-            @Override
-            public void onClick(AjaxRequestTarget target, IModel<ResourceDto> rowModel) {
-                ResourceDto resource = rowModel.getObject();
-                resourceDetailsPerformed(target, resource.getOid());
-            }
-        };
-        columns.add(column);
-
-        columns.add(new PropertyColumn(createStringResource("pageResources.connectorType"), "type"));
-        columns.add(new PropertyColumn(createStringResource("pageResources.version"), "version"));
-
-        column = new LinkIconColumn<ResourceDto>(createStringResource("pageResources.status")) {
-
-            @Override
-            protected IModel<String> createIconModel(final IModel<ResourceDto> rowModel) {
-                return new AbstractReadOnlyModel<String>() {
-
-                    @Override
-                    public String getObject() {
-//                        testResourcePerformed(getRequestCycle().find(AjaxRequestTarget.class), rowModel);
-                        ResourceDto dto = rowModel.getObject();
-                        ResourceController.updateLastAvailabilityState(dto.getState(),
-                                dto.getLastAvailabilityStatus());
-                        ResourceState state = dto.getState();
-                        return OperationResultStatusIcon.parseOperationalResultStatus(state.getLastAvailability()).getIcon();
-                    }
-                };
-            }
-
-            @Override
-            protected IModel<String> createTitleModel(final IModel<ResourceDto> rowModel) {
-                return new AbstractReadOnlyModel<String>() {
-
-                    @Override
-                    public String getObject() {
-                        ResourceState state = rowModel.getObject().getState();
-                        return PageResources.this.getString(OperationResultStatus.class.getSimpleName() + "." + state
-                                .getLastAvailability().name());
-                    }
-                };
-            }
-
-            @Override
-            protected void onClickPerformed(AjaxRequestTarget target, IModel<ResourceDto> rowModel,
-                                            AjaxLink link) {
-                testResourcePerformed(target, rowModel);
-                target.add(link);
-            }
-        };
-        columns.add(column);
-
-        InlineMenuHeaderColumn menu = new InlineMenuHeaderColumn(initInlineMenu());
-        columns.add(menu);
-
-        return columns;
-    }
-
-    private List<InlineMenuItem> initInlineMenu() {
-        List<InlineMenuItem> headerMenuItems = new ArrayList<>();
-        headerMenuItems.add(new InlineMenuItem(createStringResource("PageBase.button.delete"),
-                new HeaderMenuAction(this) {
-
-                    @Override
-                    public void onClick(AjaxRequestTarget target) {
-                        deleteResourcePerformed(target, null);
-                    }
-                }));
-
-        return headerMenuItems;
-    }
-
-    private List<IColumn<ConnectorHostType, String>> initConnectorHostsColumns() {
-        List<IColumn<ConnectorHostType, String>> columns = new ArrayList<>();
-
-        IColumn column = new CheckBoxHeaderColumn<ConnectorHostType>();
-        columns.add(column);
-
-        column = new LinkColumn<SelectableBean<ConnectorHostType>>(createStringResource("pageResources.connector.name"),
-                "name", "value.name") {
-
-            @Override
-            public void onClick(AjaxRequestTarget target, IModel<SelectableBean<ConnectorHostType>> rowModel) {
-                ConnectorHostType host = rowModel.getObject().getValue();
-                //resourceDetailsPerformed(target, host.getOid());
-            }
-        };
-        columns.add(column);
-
-        columns.add(new PropertyColumn(createStringResource("pageResources.connector.hostname"),
-                "value.hostname"));
-        columns.add(new PropertyColumn(createStringResource("pageResources.connector.port"),
-                "value.port"));
-        columns.add(new PropertyColumn(createStringResource("pageResources.connector.timeout"),
-                "value.timeout"));
-        columns.add(new CheckBoxColumn(createStringResource("pageResources.connector.protectConnection"),
-                "value.protectConnection"));
-
-        InlineMenuHeaderColumn menu = new InlineMenuHeaderColumn(initInlineHostsMenu());
-        columns.add(menu);
-
-        return columns;
-    }
-
-    private List<InlineMenuItem> initInlineHostsMenu() {
-        List<InlineMenuItem> headerMenuItems = new ArrayList<>();
-        headerMenuItems.add(new InlineMenuItem(createStringResource("PageBase.button.delete"),
-                new HeaderMenuAction(this) {
-
-                    @Override
-                    public void onClick(AjaxRequestTarget target) {
-                        deleteHostPerformed(target);
-                    }
-                }));
-        headerMenuItems.add(new InlineMenuItem(createStringResource("pageResources.button.discoveryRemote"),
-                new HeaderMenuAction(this) {
-
-                    @Override
-                    public void onClick(AjaxRequestTarget target) {
-                        discoveryRemotePerformed(target);
-                    }
-                }));
-
-        return headerMenuItems;
-    }
-
-    private void resourceDetailsPerformed(AjaxRequestTarget target, String oid) {
-        PageParameters parameters = new PageParameters();
-        parameters.add(OnePageParameterEncoder.PARAMETER, oid);
-        setResponsePage(PageResource.class, parameters);
-    }
-
-    private void deleteHostPerformed(AjaxRequestTarget target) {
-        List<SelectableBean<ConnectorHostType>> selected = WebComponentUtil.getSelectedData(getConnectorHostTable());
-        if (selected.isEmpty()) {
-            warn(getString("pageResources.message.noHostSelected"));
-            target.add(getFeedbackPanel());
-            return;
-        }
-
-        ModalWindow dialog = (ModalWindow) get(ID_DELETE_HOSTS_POPUP);
-        dialog.show(target);
-    }
-
-    private List<ResourceDto> isAnyResourceSelected(AjaxRequestTarget target, ResourceDto single) {
-        return WebComponentUtil.isAnythingSelected(target, single, getResourceTable(), this,
-                "pageResources.message.noResourceSelected");
-    }
-
-    private void deleteResourcePerformed(AjaxRequestTarget target, ResourceDto single) {
-        List<ResourceDto> selected = isAnyResourceSelected(target, single);
-        singleDelete = single;
-
-        if (selected.isEmpty()) {
-            return;
-        }
-
-        ModalWindow dialog = (ModalWindow) get(ID_DELETE_RESOURCES_POPUP);
-        dialog.show(target);
-    }
-
-    private Table getResourceTable() {
-        return (Table) get(createComponentPath(ID_MAIN_FORM, ID_TABLE));
-    }
-
-    private Table getConnectorHostTable() {
-        return (Table) get(createComponentPath(ID_MAIN_FORM, ID_CONNECTOR_TABLE));
-    }
-
-    /**
-     * @param oneDeleteKey  message if deleting one item
-     * @param moreDeleteKey message if deleting more items
-     * @param resources     if true selecting resources if false selecting from hosts
-     */
-    private IModel<String> createDeleteConfirmString(final String oneDeleteKey, final String moreDeleteKey,
-                                                     final boolean resources) {
-        return new AbstractReadOnlyModel<String>() {
-
-            @Override
-            public String getObject() {
-                Table table = resources ? getResourceTable() : getConnectorHostTable();
-                List selected = new ArrayList();
-
-                if (singleDelete != null) {
-                    selected.add(singleDelete);
-                } else {
-                    selected = WebComponentUtil.getSelectedData(table);
-                }
-
-                switch (selected.size()) {
-                    case 1:
-                        Object first = selected.get(0);
-                        String name = resources ? ((ResourceDto) first).getName() :
-                                WebComponentUtil.getName(((SelectableBean<ConnectorHostType>) first).getValue());
-                        return createStringResource(oneDeleteKey, name).getString();
-                    default:
-                        return createStringResource(moreDeleteKey, selected.size()).getString();
-                }
-            }
-        };
-    }
-
-    private void deleteHostConfirmedPerformed(AjaxRequestTarget target) {
-        Table hostTable = getConnectorHostTable();
-        List<SelectableBean<ConnectorHostType>> selected = WebComponentUtil.getSelectedData(hostTable);
-
-        OperationResult result = new OperationResult(OPERATION_DELETE_HOSTS);
-        for (SelectableBean<ConnectorHostType> selectable : selected) {
-            try {
-                Task task = createSimpleTask(OPERATION_DELETE_HOSTS);
-
-                ObjectDelta<ConnectorHostType> delta = ObjectDelta.createDeleteDelta(ConnectorHostType.class,
-                        selectable.getValue().getOid(), getPrismContext());
-                getModelService().executeChanges(WebComponentUtil.createDeltaCollection(delta), null, task, result);
-            } catch (Exception ex) {
-                result.recordPartialError("Couldn't delete host.", ex);
-                LoggingUtils.logException(LOGGER, "Couldn't delete host", ex);
-            }
-        }
-
-        result.recomputeStatus();
-        if (result.isSuccess()) {
-            result.recordStatus(OperationResultStatus.SUCCESS, "The resource(s) have been successfully deleted.");
-        }
-
-        BaseSortableDataProvider provider = (BaseSortableDataProvider) hostTable.getDataTable().getDataProvider();
-        provider.clearCache();
-
-        showResult(result);
-        target.add(getFeedbackPanel(), (Component) hostTable);
-    }
-
-    private void deleteResourceConfirmedPerformed(AjaxRequestTarget target) {
-        List<ResourceDto> selected = new ArrayList<>();
-
-        if (singleDelete != null) {
-            selected.add(singleDelete);
-        } else {
-            selected = WebComponentUtil.getSelectedData(getResourceTable());
-        }
-
-        OperationResult result = new OperationResult(OPERATION_DELETE_RESOURCES);
-        for (ResourceDto resource : selected) {
-            try {
-                Task task = createSimpleTask(OPERATION_DELETE_RESOURCES);
-
-                ObjectDelta<ResourceType> delta = ObjectDelta.createDeleteDelta(ResourceType.class, resource.getOid(),
-                        getPrismContext());
-                getModelService().executeChanges(WebComponentUtil.createDeltaCollection(delta), null, task, result);
-            } catch (Exception ex) {
-                result.recordPartialError("Couldn't delete resource.", ex);
-                LoggingUtils.logException(LOGGER, "Couldn't delete resource", ex);
-            }
-        }
-
-        result.recomputeStatus();
-        if (result.isSuccess()) {
-            result.recordStatus(OperationResultStatus.SUCCESS, "The resource(s) have been successfully deleted.");
-        }
-
-        Table resourceTable = getResourceTable();
-        ObjectDataProvider provider = (ObjectDataProvider) resourceTable.getDataTable().getDataProvider();
-        provider.clearCache();
-
-        showResult(result);
-        target.add(getFeedbackPanel(), (Component) resourceTable);
-    }
-
-    private void discoveryRemotePerformed(AjaxRequestTarget target) {
-        target.add(getFeedbackPanel());
-
-        PageBase page = (PageBase) getPage();
-        Task task = page.createSimpleTask(OPERATION_CONNECTOR_DISCOVERY);
-        OperationResult result = task.getResult();
-        List<SelectableBean<ConnectorHostType>> selected = WebComponentUtil.getSelectedData(getConnectorHostTable());
-        if (selected.isEmpty()) {
-            warn(getString("pageResources.message.noHostSelected"));
-            return;
-        }
-
-        for (SelectableBean<ConnectorHostType> bean : selected) {
-            ConnectorHostType host = bean.getValue();
-            try {
-                getModelService().discoverConnectors(host, task, result);
-            } catch (Exception ex) {
-                result.recordFatalError("Fail to discover connectors on host '" + host.getHostname()
-                        + ":" + host.getPort() + "'", ex);
-            }
-        }
-
-        result.recomputeStatus();
-        showResult(result);
-    }
-
-    private void testResourcePerformed(AjaxRequestTarget target, IModel<ResourceDto> rowModel) {
-
-        OperationResult result = new OperationResult(OPERATION_TEST_RESOURCE);
-
-        ResourceDto dto = rowModel.getObject();
-        if (StringUtils.isEmpty(dto.getOid())) {
-            result.recordFatalError("Resource oid not defined in request");
-        }
-
-        Task task = createSimpleTask(OPERATION_TEST_RESOURCE);
-        try {
-            result = getModelService().testResource(dto.getOid(), task);
-            ResourceController.updateResourceState(dto.getState(), result);
-
-            // todo de-duplicate code (see the same operation in PageResource)
-            // this provides some additional tests, namely a test for schema handling section
-            getModelService().getObject(ResourceType.class, dto.getOid(), null, task, result);
-        } catch (Exception ex) {
-            result.recordFatalError("Failed to test resource connection", ex);
-        }
-
-        // a bit of hack: result of TestConnection contains a result of getObject as a subresult
-        // so in case of TestConnection succeeding we recompute the result to show any (potential) getObject problems
-        if (result.isSuccess()) {
-            result.recomputeStatus();
-        }
-
-        if (!result.isSuccess()) {
-            showResult(result);
-            target.add(getFeedbackPanel());
-        }
-    }
-
-    private void searchHostPerformed(ObjectQuery query, AjaxRequestTarget target) {
-        target.add(getFeedbackPanel());
-
-        Table panel = getConnectorHostTable();
-        DataTable table = panel.getDataTable();
-        ObjectDataProvider provider = (ObjectDataProvider) table.getDataProvider();
-        provider.setQuery(query);
-        provider.setOptions(SelectorOptions.createCollection(GetOperationOptions.createNoFetch()));
-
-        target.add((Component) panel);
-    }
-
-    private void searchPerformed(ObjectQuery query, AjaxRequestTarget target) {
-        target.add(getFeedbackPanel());
-
-        Table panel = getResourceTable();
-        DataTable table = panel.getDataTable();
-        ObjectDataProvider provider = (ObjectDataProvider) table.getDataProvider();
-        provider.setQuery(query);
-        provider.setOptions(SelectorOptions.createCollection(GetOperationOptions.createNoFetch()));
-
-        ResourcesStorage storage = getSessionStorage().getResources();
-        storage.setSearch(searchModel.getObject());
-        panel.setCurrentPage(storage.getPaging());
-
-        target.add((Component) panel);
-    }
-
-    private void deleteResourceSyncTokenPerformed(AjaxRequestTarget target, IModel<ResourceDto> model) {
-        deleteSyncTokenPerformed(target, model);
-    }
-
-    private void editResourcePerformed(IModel<ResourceDto> model) {
-        PageParameters parameters = new PageParameters();
-        parameters.add(OnePageParameterEncoder.PARAMETER, model.getObject().getOid());
-        setResponsePage(new PageResourceWizard(parameters));
-    }
-
-    private void editAsXmlPerformed(IModel<ResourceDto> model) {
-        PageParameters parameters = new PageParameters();
-        parameters.add(PageDebugView.PARAM_OBJECT_ID, model.getObject().getOid());
-        parameters.add(PageDebugView.PARAM_OBJECT_TYPE, ResourceType.class.getSimpleName());
-        setResponsePage(PageDebugView.class, parameters);
-    }
+	private static final Trace LOGGER = TraceManager.getTrace(PageResources.class);
+	private static final String DOT_CLASS = PageResources.class.getName() + ".";
+	private static final String OPERATION_TEST_RESOURCE = DOT_CLASS + "testResource";
+	private static final String OPERATION_SYNC_STATUS = DOT_CLASS + "syncStatus";
+	private static final String OPERATION_DELETE_RESOURCES = DOT_CLASS + "deleteResources";
+	private static final String OPERATION_DELETE_HOSTS = DOT_CLASS + "deleteHosts";
+	private static final String OPERATION_CONNECTOR_DISCOVERY = DOT_CLASS + "connectorDiscovery";
+
+	private static final String ID_DELETE_RESOURCES_POPUP = "deleteResourcesPopup";
+	private static final String ID_DELETE_HOSTS_POPUP = "deleteHostsPopup";
+	private static final String ID_MAIN_FORM = "mainForm";
+	private static final String ID_TABLE = "table";
+	private static final String ID_CONNECTOR_TABLE = "connectorTable";
+
+	private IModel<Search> searchModel;
+	private IModel<Search> chSearchModel;
+	private ResourceType singleDelete;
+
+	public PageResources() {
+		this(true);
+	}
+
+	public PageResources(boolean clearSessionPaging) {
+		this(clearSessionPaging, "");
+	}
+
+	public PageResources(String searchText) {
+		this(true, searchText);
+	}
+
+	public PageResources(boolean clearSessionPaging, final String searchText) {
+		searchModel = new LoadableModel<Search>(false) {
+
+			@Override
+			protected Search load() {
+				ResourcesStorage storage = getSessionStorage().getResources();
+				Search dto = storage.getSearch();
+
+				if (dto == null) {
+					dto = SearchFactory.createSearch(ResourceType.class, getPrismContext(), true);
+				}
+
+				return dto;
+			}
+		};
+
+		chSearchModel = new LoadableModel<Search>(false) {
+
+			@Override
+			protected Search load() {
+				return SearchFactory.createSearch(ConnectorHostType.class, getPrismContext(), true);
+			}
+		};
+
+		initLayout();
+	}
+
+	private void initLayout() {
+		Form mainForm = new Form(ID_MAIN_FORM);
+		add(mainForm);
+
+		Collection<SelectorOptions<GetOperationOptions>> options = SelectorOptions
+				.createCollection(GetOperationOptions.createNoFetch());
+		options.add(SelectorOptions.create(ResourceType.F_CONNECTOR_REF,
+				GetOperationOptions.createRetrieve(RetrieveOption.INCLUDE)));
+
+		MainObjectListPanel<ResourceType> resourceListPanel = new MainObjectListPanel<ResourceType>(ID_TABLE,
+				ResourceType.class, options, this) {
+
+			@Override
+			protected List<InlineMenuItem> createInlineMenu() {
+				return PageResources.this.createRowMenuItems();
+			}
+
+			@Override
+			protected List<IColumn<SelectableBean<ResourceType>, String>> createColumns() {
+				return PageResources.this.initResourceColumns();
+			}
+
+			@Override
+			protected void objectDetailsPerformed(AjaxRequestTarget target, ResourceType object) {
+				PageResources.this.resourceDetailsPerformed(target, object.getOid());
+
+			}
+
+			@Override
+			protected void newObjectPerformed(AjaxRequestTarget target) {
+				setResponsePage(PageResourceWizard.class);
+
+			}
+		};
+		resourceListPanel.setOutputMarkupId(true);
+		mainForm.add(resourceListPanel);
+
+		BoxedTablePanel connectorHosts = new BoxedTablePanel(ID_CONNECTOR_TABLE,
+				new ObjectDataProvider(PageResources.this, ConnectorHostType.class),
+				initConnectorHostsColumns(), UserProfileStorage.TableId.PAGE_RESOURCES_CONNECTOR_HOSTS,
+				(int) getItemsPerPage(UserProfileStorage.TableId.PAGE_RESOURCES_CONNECTOR_HOSTS)) {
+
+			@Override
+			protected WebMarkupContainer createHeader(String headerId) {
+				return new SearchFormPanel(headerId, chSearchModel) {
+
+					@Override
+					protected void searchPerformed(ObjectQuery query, AjaxRequestTarget target) {
+						PageResources.this.searchHostPerformed(query, target);
+					}
+				};
+			}
+		};
+		connectorHosts.setOutputMarkupId(true);
+		mainForm.add(connectorHosts);
+
+		add(new ConfirmationDialog(ID_DELETE_RESOURCES_POPUP,
+				createStringResource("pageResources.dialog.title.confirmDelete"),
+				createDeleteConfirmString("pageResources.message.deleteResourceConfirm",
+						"pageResources.message.deleteResourcesConfirm", true)) {
+
+			@Override
+			public void yesPerformed(AjaxRequestTarget target) {
+				close(target);
+				deleteResourceConfirmedPerformed(target);
+			}
+		});
+
+		add(new ConfirmationDialog(ID_DELETE_HOSTS_POPUP,
+				createStringResource("pageResources.dialog.title.confirmDelete"),
+				createDeleteConfirmString("pageResources.message.deleteHostConfirm",
+						"pageResources.message.deleteHostsConfirm", false)) {
+
+			@Override
+			public void yesPerformed(AjaxRequestTarget target) {
+				close(target);
+				deleteHostConfirmedPerformed(target);
+			}
+		});
+	}
+
+	private List<InlineMenuItem> createRowMenuItems() {
+
+		List<InlineMenuItem> menuItems = new ArrayList<>();
+
+		menuItems.add(new InlineMenuItem(createStringResource("PageResources.inlineMenuItem.test"),
+				new ColumnMenuAction<SelectableBean<ResourceType>>() {
+
+					@Override
+					public void onClick(AjaxRequestTarget target) {
+						SelectableBean<ResourceType> rowDto = getRowModel().getObject();
+						testResourcePerformed(target, rowDto.getValue());
+					}
+				}));
+
+		menuItems.add(new InlineMenuItem(createStringResource("PageBase.button.delete"),
+				new ColumnMenuAction<SelectableBean<ResourceType>>() {
+
+					@Override
+					public void onClick(AjaxRequestTarget target) {
+						SelectableBean<ResourceType> rowDto = getRowModel().getObject();
+						deleteResourcePerformed(target, rowDto.getValue());
+					}
+				}));
+
+		menuItems.add(new InlineMenuItem(createStringResource("pageResources.inlineMenuItem.deleteSyncToken"),
+				new ColumnMenuAction<SelectableBean<ResourceType>>() {
+
+					@Override
+					public void onClick(AjaxRequestTarget target) {
+						SelectableBean<ResourceType> rowDto = getRowModel().getObject();
+						deleteResourceSyncTokenPerformed(target, rowDto.getValue());
+					}
+
+				}));
+
+		menuItems.add(new InlineMenuItem(createStringResource("pageResources.inlineMenuItem.editResource"),
+				new ColumnMenuAction<SelectableBean<ResourceType>>() {
+
+					@Override
+					public void onClick(AjaxRequestTarget target) {
+						SelectableBean<ResourceType> rowDto = getRowModel().getObject();
+						editResourcePerformed(rowDto.getValue());
+					}
+				}));
+		menuItems.add(new InlineMenuItem(createStringResource("pageResources.button.editAsXml"),
+				new ColumnMenuAction<SelectableBean<ResourceType>>() {
+
+					@Override
+					public void onClick(AjaxRequestTarget target) {
+						SelectableBean<ResourceType> rowDto = getRowModel().getObject();
+						editAsXmlPerformed(rowDto.getValue());
+					}
+				}));
+
+		return menuItems;
+	}
+
+	private List<IColumn<SelectableBean<ResourceType>, String>> initResourceColumns() {
+		List<IColumn<SelectableBean<ResourceType>, String>> columns = new ArrayList<>();
+
+		columns.add(new PropertyColumn(createStringResource("pageResources.connectorType"),
+				SelectableBean.F_VALUE + ".connector.connectorType"));
+		columns.add(new PropertyColumn(createStringResource("pageResources.version"),
+				SelectableBean.F_VALUE + ".connector.connectorVersion"));
+
+		InlineMenuHeaderColumn menu = new InlineMenuHeaderColumn(initInlineMenu());
+		columns.add(menu);
+
+		return columns;
+	}
+
+	private List<InlineMenuItem> initInlineMenu() {
+		List<InlineMenuItem> headerMenuItems = new ArrayList<>();
+		headerMenuItems.add(new InlineMenuItem(createStringResource("PageBase.button.delete"),
+				new HeaderMenuAction(this) {
+
+					@Override
+					public void onClick(AjaxRequestTarget target) {
+						deleteResourcePerformed(target, null);
+					}
+				}));
+
+		return headerMenuItems;
+	}
+
+	private List<IColumn<ConnectorHostType, String>> initConnectorHostsColumns() {
+		List<IColumn<ConnectorHostType, String>> columns = new ArrayList<>();
+
+		IColumn column = new CheckBoxHeaderColumn<ConnectorHostType>();
+		columns.add(column);
+
+		column = new LinkColumn<SelectableBean<ConnectorHostType>>(
+				createStringResource("pageResources.connector.name"), "name", "value.name") {
+
+			@Override
+			public void onClick(AjaxRequestTarget target,
+					IModel<SelectableBean<ConnectorHostType>> rowModel) {
+				ConnectorHostType host = rowModel.getObject().getValue();
+				// resourceDetailsPerformed(target, host.getOid());
+			}
+		};
+		columns.add(column);
+
+		columns.add(new PropertyColumn(createStringResource("pageResources.connector.hostname"),
+				"value.hostname"));
+		columns.add(new PropertyColumn(createStringResource("pageResources.connector.port"), "value.port"));
+		columns.add(
+				new PropertyColumn(createStringResource("pageResources.connector.timeout"), "value.timeout"));
+		columns.add(new CheckBoxColumn(createStringResource("pageResources.connector.protectConnection"),
+				"value.protectConnection"));
+
+		InlineMenuHeaderColumn menu = new InlineMenuHeaderColumn(initInlineHostsMenu());
+		columns.add(menu);
+
+		return columns;
+	}
+
+	private List<InlineMenuItem> initInlineHostsMenu() {
+		List<InlineMenuItem> headerMenuItems = new ArrayList<>();
+		headerMenuItems.add(new InlineMenuItem(createStringResource("PageBase.button.delete"),
+				new HeaderMenuAction(this) {
+
+					@Override
+					public void onClick(AjaxRequestTarget target) {
+						deleteHostPerformed(target);
+					}
+				}));
+		headerMenuItems.add(new InlineMenuItem(createStringResource("pageResources.button.discoveryRemote"),
+				new HeaderMenuAction(this) {
+
+					@Override
+					public void onClick(AjaxRequestTarget target) {
+						discoveryRemotePerformed(target);
+					}
+				}));
+
+		return headerMenuItems;
+	}
+
+	private void resourceDetailsPerformed(AjaxRequestTarget target, String oid) {
+		PageParameters parameters = new PageParameters();
+		parameters.add(OnePageParameterEncoder.PARAMETER, oid);
+		setResponsePage(PageResource.class, parameters);
+	}
+
+	private void deleteHostPerformed(AjaxRequestTarget target) {
+		List<SelectableBean<ConnectorHostType>> selected = WebComponentUtil
+				.getSelectedData(getConnectorHostTable());
+		if (selected.isEmpty()) {
+			warn(getString("pageResources.message.noHostSelected"));
+			target.add(getFeedbackPanel());
+			return;
+		}
+
+		ModalWindow dialog = (ModalWindow) get(ID_DELETE_HOSTS_POPUP);
+		dialog.show(target);
+	}
+
+	private List<ResourceType> isAnyResourceSelected(AjaxRequestTarget target, ResourceType single) {
+		List<ResourceType> selected = null;
+		if (single != null) {
+			selected = new ArrayList<>(1);
+			selected.add(single);
+			return selected;
+		}
+		selected = getResourceTable().getSelectedObjects();
+		if (selected.size() < 1) {
+			warn(createStringResource("pageResources.message.noResourceSelected"));
+		}
+		return selected;
+
+	}
+
+	private void deleteResourcePerformed(AjaxRequestTarget target, ResourceType single) {
+		List<ResourceType> selected = isAnyResourceSelected(target, single);
+		singleDelete = single;
+
+		if (selected.isEmpty()) {
+			return;
+		}
+
+		ModalWindow dialog = (ModalWindow) get(ID_DELETE_RESOURCES_POPUP);
+		dialog.show(target);
+	}
+
+	private MainObjectListPanel<ResourceType> getResourceTable() {
+		return (MainObjectListPanel<ResourceType>) get(createComponentPath(ID_MAIN_FORM, ID_TABLE));
+	}
+
+	private Table getConnectorHostTable() {
+		return (Table) get(createComponentPath(ID_MAIN_FORM, ID_CONNECTOR_TABLE));
+	}
+
+	/**
+	 * @param oneDeleteKey
+	 *            message if deleting one item
+	 * @param moreDeleteKey
+	 *            message if deleting more items
+	 * @param resources
+	 *            if true selecting resources if false selecting from hosts
+	 */
+	private IModel<String> createDeleteConfirmString(final String oneDeleteKey, final String moreDeleteKey,
+			final boolean resources) {
+		return new AbstractReadOnlyModel<String>() {
+
+			@Override
+			public String getObject() {
+				List selected = new ArrayList();
+				if (resources) {
+					if (singleDelete != null) {
+						selected.add(singleDelete);
+					} else {
+						selected = getResourceTable().getSelectedObjects();
+					}
+				} else {
+					selected = WebComponentUtil.getSelectedData(getConnectorHostTable());
+				}
+
+				switch (selected.size()) {
+					case 1:
+						Object first = selected.get(0);
+						String name = resources ? WebComponentUtil.getName(((ResourceType) first))
+								: WebComponentUtil
+										.getName(((SelectableBean<ConnectorHostType>) first).getValue());
+						return createStringResource(oneDeleteKey, name).getString();
+					default:
+						return createStringResource(moreDeleteKey, selected.size()).getString();
+				}
+			}
+		};
+	}
+
+	private void deleteHostConfirmedPerformed(AjaxRequestTarget target) {
+		Table hostTable = getConnectorHostTable();
+		List<SelectableBean<ConnectorHostType>> selected = WebComponentUtil.getSelectedData(hostTable);
+
+		OperationResult result = new OperationResult(OPERATION_DELETE_HOSTS);
+		for (SelectableBean<ConnectorHostType> selectable : selected) {
+			try {
+				Task task = createSimpleTask(OPERATION_DELETE_HOSTS);
+
+				ObjectDelta<ConnectorHostType> delta = ObjectDelta.createDeleteDelta(ConnectorHostType.class,
+						selectable.getValue().getOid(), getPrismContext());
+				getModelService().executeChanges(WebComponentUtil.createDeltaCollection(delta), null, task,
+						result);
+			} catch (Exception ex) {
+				result.recordPartialError("Couldn't delete host.", ex);
+				LoggingUtils.logException(LOGGER, "Couldn't delete host", ex);
+			}
+		}
+
+		result.recomputeStatus();
+		if (result.isSuccess()) {
+			result.recordStatus(OperationResultStatus.SUCCESS,
+					"The resource(s) have been successfully deleted.");
+		}
+
+		BaseSortableDataProvider provider = (BaseSortableDataProvider) hostTable.getDataTable()
+				.getDataProvider();
+		provider.clearCache();
+
+		showResult(result);
+		target.add(getFeedbackPanel(), (Component) hostTable);
+	}
+
+	private void deleteResourceConfirmedPerformed(AjaxRequestTarget target) {
+		List<ResourceType> selected = new ArrayList<>();
+
+		if (singleDelete != null) {
+			selected.add(singleDelete);
+		} else {
+			selected = getResourceTable().getSelectedObjects();
+		}
+
+		OperationResult result = new OperationResult(OPERATION_DELETE_RESOURCES);
+		for (ResourceType resource : selected) {
+			try {
+				Task task = createSimpleTask(OPERATION_DELETE_RESOURCES);
+
+				ObjectDelta<ResourceType> delta = ObjectDelta.createDeleteDelta(ResourceType.class,
+						resource.getOid(), getPrismContext());
+				getModelService().executeChanges(WebComponentUtil.createDeltaCollection(delta), null, task,
+						result);
+			} catch (Exception ex) {
+				result.recordPartialError("Couldn't delete resource.", ex);
+				LoggingUtils.logException(LOGGER, "Couldn't delete resource", ex);
+			}
+		}
+
+		result.recomputeStatus();
+		if (result.isSuccess()) {
+			result.recordStatus(OperationResultStatus.SUCCESS,
+					"The resource(s) have been successfully deleted.");
+		}
+
+		getResourceTable().clearCache();
+
+		showResult(result);
+		target.add(getFeedbackPanel(), (Component) getResourceTable());
+	}
+
+	private void discoveryRemotePerformed(AjaxRequestTarget target) {
+		target.add(getFeedbackPanel());
+
+		PageBase page = (PageBase) getPage();
+		Task task = page.createSimpleTask(OPERATION_CONNECTOR_DISCOVERY);
+		OperationResult result = task.getResult();
+		List<SelectableBean<ConnectorHostType>> selected = WebComponentUtil
+				.getSelectedData(getConnectorHostTable());
+		if (selected.isEmpty()) {
+			warn(getString("pageResources.message.noHostSelected"));
+			return;
+		}
+
+		for (SelectableBean<ConnectorHostType> bean : selected) {
+			ConnectorHostType host = bean.getValue();
+			try {
+				getModelService().discoverConnectors(host, task, result);
+			} catch (Exception ex) {
+				result.recordFatalError("Fail to discover connectors on host '" + host.getHostname() + ":"
+						+ host.getPort() + "'", ex);
+			}
+		}
+
+		result.recomputeStatus();
+		showResult(result);
+	}
+
+	private void testResourcePerformed(AjaxRequestTarget target, ResourceType resourceType) {
+
+		OperationResult result = new OperationResult(OPERATION_TEST_RESOURCE);
+
+		// SelectableBean<ResourceType> dto = rowModel.getObject();
+		// ResourceType resourceType = dto.getValue();
+		if (StringUtils.isEmpty(resourceType.getOid())) {
+			result.recordFatalError("Resource oid not defined in request");
+		}
+
+		Task task = createSimpleTask(OPERATION_TEST_RESOURCE);
+		try {
+			result = getModelService().testResource(resourceType.getOid(), task);
+			// ResourceController.updateResourceState(resourceType.getState(),
+			// result);
+
+			// todo de-duplicate code (see the same operation in PageResource)
+			// this provides some additional tests, namely a test for schema
+			// handling section
+			getModelService().getObject(ResourceType.class, resourceType.getOid(), null, task, result);
+		} catch (Exception ex) {
+			result.recordFatalError("Failed to test resource connection", ex);
+		}
+
+		// a bit of hack: result of TestConnection contains a result of
+		// getObject as a subresult
+		// so in case of TestConnection succeeding we recompute the result to
+		// show any (potential) getObject problems
+		if (result.isSuccess()) {
+			result.recomputeStatus();
+		}
+
+		// if (!result.isSuccess()) {
+		showResult(result);
+		target.add(getFeedbackPanel());
+		// }
+		target.add(getResourceTable());
+	}
+
+	private void searchHostPerformed(ObjectQuery query, AjaxRequestTarget target) {
+		target.add(getFeedbackPanel());
+
+		Table panel = getConnectorHostTable();
+		DataTable table = panel.getDataTable();
+		ObjectDataProvider provider = (ObjectDataProvider) table.getDataProvider();
+		provider.setQuery(query);
+		provider.setOptions(SelectorOptions.createCollection(GetOperationOptions.createNoFetch()));
+
+		target.add((Component) panel);
+	}
+
+	private void deleteResourceSyncTokenPerformed(AjaxRequestTarget target, ResourceType resourceType) {
+		deleteSyncTokenPerformed(target, resourceType);
+	}
+
+	private void editResourcePerformed(ResourceType resourceType) {
+		PageParameters parameters = new PageParameters();
+		parameters.add(OnePageParameterEncoder.PARAMETER, resourceType.getOid());
+		setResponsePage(new PageResourceWizard(parameters));
+	}
+
+	private void editAsXmlPerformed(ResourceType resourceType) {
+		PageParameters parameters = new PageParameters();
+		parameters.add(PageDebugView.PARAM_OBJECT_ID, resourceType.getOid());
+		parameters.add(PageDebugView.PARAM_OBJECT_TYPE, ResourceType.class.getSimpleName());
+		setResponsePage(PageDebugView.class, parameters);
+	}
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
index ea5758d60fc..71eb40b20da 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
@@ -15,6 +15,41 @@
  */
 package com.evolveum.midpoint.web.page.admin.server;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DurationFormatUtils;
+import org.apache.wicket.Component;
+import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
+import org.apache.wicket.datetime.markup.html.basic.DateLabel;
+import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.CheckBox;
+import org.apache.wicket.markup.html.form.DropDownChoice;
+import org.apache.wicket.markup.html.form.EnumChoiceRenderer;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.repeater.Item;
+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.request.mapper.parameter.PageParameters;
+import org.apache.wicket.util.string.StringValue;
+
 import com.evolveum.midpoint.gui.api.model.LoadableModel;
 import com.evolveum.midpoint.gui.api.page.PageBase;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
@@ -24,7 +59,12 @@
 import com.evolveum.midpoint.prism.delta.ObjectDelta;
 import com.evolveum.midpoint.prism.match.PolyStringNormMatchingRule;
 import com.evolveum.midpoint.prism.polystring.PolyStringNormalizer;
-import com.evolveum.midpoint.prism.query.*;
+import com.evolveum.midpoint.prism.query.AndFilter;
+import com.evolveum.midpoint.prism.query.EqualFilter;
+import com.evolveum.midpoint.prism.query.ObjectFilter;
+import com.evolveum.midpoint.prism.query.ObjectPaging;
+import com.evolveum.midpoint.prism.query.ObjectQuery;
+import com.evolveum.midpoint.prism.query.SubstringFilter;
 import com.evolveum.midpoint.prism.xml.XmlTypeConverter;
 import com.evolveum.midpoint.schema.constants.SchemaConstants;
 import com.evolveum.midpoint.schema.result.OperationResult;
@@ -45,7 +85,12 @@
 import com.evolveum.midpoint.web.component.DateLabelComponent;
 import com.evolveum.midpoint.web.component.data.BoxedTablePanel;
 import com.evolveum.midpoint.web.component.data.Table;
-import com.evolveum.midpoint.web.component.data.column.*;
+import com.evolveum.midpoint.web.component.data.column.CheckBoxColumn;
+import com.evolveum.midpoint.web.component.data.column.CheckBoxHeaderColumn;
+import com.evolveum.midpoint.web.component.data.column.EnumPropertyColumn;
+import com.evolveum.midpoint.web.component.data.column.IconColumn;
+import com.evolveum.midpoint.web.component.data.column.InlineMenuHeaderColumn;
+import com.evolveum.midpoint.web.component.data.column.LinkColumn;
 import com.evolveum.midpoint.web.component.dialog.ConfirmationDialog;
 import com.evolveum.midpoint.web.component.input.StringChoiceRenderer;
 import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem;
@@ -53,8 +98,14 @@
 import com.evolveum.midpoint.web.component.refresh.AutoRefreshPanel;
 import com.evolveum.midpoint.web.component.refresh.Refreshable;
 import com.evolveum.midpoint.web.page.admin.configuration.component.HeaderMenuAction;
-import com.evolveum.midpoint.web.page.admin.server.dto.*;
-import com.evolveum.midpoint.web.page.admin.workflow.PageProcessInstance;
+import com.evolveum.midpoint.web.page.admin.server.dto.NodeDto;
+import com.evolveum.midpoint.web.page.admin.server.dto.NodeDtoProvider;
+import com.evolveum.midpoint.web.page.admin.server.dto.OperationResultStatusIcon;
+import com.evolveum.midpoint.web.page.admin.server.dto.TaskDto;
+import com.evolveum.midpoint.web.page.admin.server.dto.TaskDtoExecutionStatusFilter;
+import com.evolveum.midpoint.web.page.admin.server.dto.TaskDtoProvider;
+import com.evolveum.midpoint.web.page.admin.server.dto.TaskDtoProviderOptions;
+import com.evolveum.midpoint.web.page.admin.server.dto.TasksSearchDto;
 import com.evolveum.midpoint.web.session.TasksStorage;
 import com.evolveum.midpoint.web.session.UserProfileStorage;
 import com.evolveum.midpoint.web.util.ObjectTypeGuiDescriptor;
@@ -65,35 +116,6 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskType;
 
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.time.DurationFormatUtils;
-import org.apache.wicket.Component;
-import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.ajax.AbstractAjaxTimerBehavior;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
-import org.apache.wicket.datetime.markup.html.basic.DateLabel;
-import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.*;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.markup.repeater.Item;
-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.request.mapper.parameter.PageParameters;
-import org.apache.wicket.util.string.StringValue;
-import org.apache.wicket.util.time.Duration;
-
-import java.util.*;
-
 /**
  * @author lazyman
  */
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ServicesStorage.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ServicesStorage.java
new file mode 100644
index 00000000000..e922273cb03
--- /dev/null
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ServicesStorage.java
@@ -0,0 +1,32 @@
+package com.evolveum.midpoint.web.session;
+
+import com.evolveum.midpoint.prism.query.ObjectPaging;
+import com.evolveum.midpoint.web.component.search.Search;
+
+public class ServicesStorage implements PageStorage{
+
+	private Search servicesSearch;
+	private ObjectPaging servicesPaging;
+	
+	@Override
+	public Search getSearch() {
+		return servicesSearch;
+	}
+
+	@Override
+	public void setSearch(Search search) {
+		this.servicesSearch = search;
+	}
+
+	@Override
+	public void setPaging(ObjectPaging paging) {
+		this.servicesPaging = paging;
+		
+	}
+
+	@Override
+	public ObjectPaging getPaging() {
+		return servicesPaging;
+	}
+
+}
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java
index 0fb50285eef..fd6849fc449 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java
@@ -53,6 +53,7 @@ public class SessionStorage implements Serializable {
     public static final String KEY_REPORTS = "reports";
     public static final String KEY_RESOURCES = "resources";
     public static final String KEY_ROLES = "roles";
+    public static final String KEY_SERVICES = "services";
     public static final String KEY_ROLE_MEMBERS = "roleMembers";
     
     private static final String KEY_TASKS = "tasks";
@@ -118,6 +119,13 @@ public RolesStorage getRoles() {
         return (RolesStorage)pageStorageMap.get(KEY_ROLES);
     }
     
+    public ServicesStorage getServices() {
+        if (pageStorageMap.get(KEY_SERVICES) == null) {
+            pageStorageMap.put(KEY_SERVICES, new ServicesStorage());
+        }
+        return (ServicesStorage)pageStorageMap.get(KEY_SERVICES);
+    }
+    
     public RoleMembersStorage getRoleMembers() {
     	if (pageStorageMap.get(KEY_ROLE_MEMBERS) == null) {
             pageStorageMap.put(KEY_ROLE_MEMBERS, new RoleMembersStorage());
@@ -145,6 +153,23 @@ public UserProfileStorage getUserProfile(){
         }
         return userProfile;
     }
+    
+    public PageStorage initPageStorage(String key){
+    	PageStorage pageStorage = null;
+    	if (KEY_USERS.equals(key)){
+    		pageStorage = new UsersStorage();
+    		pageStorageMap.put(KEY_USERS, pageStorage);
+    		
+    	} else if (KEY_ROLES.equals(key)){
+    		pageStorage = new RolesStorage();
+    		pageStorageMap.put(KEY_ROLES, pageStorage);
+    	} else if (KEY_SERVICES.equals(key)) {
+    		pageStorage = new ServicesStorage();
+    		pageStorageMap.put(KEY_SERVICES, pageStorage);
+    	}
+    	return pageStorage;
+    	//TODO: fixme
+    }
 
     public void setUserProfile(UserProfileStorage profile){
         userProfile = profile;
diff --git a/gui/admin-gui/src/main/resources/initial-objects/200-lookup-languages.xml b/gui/admin-gui/src/main/resources/initial-objects/200-lookup-languages.xml
index 7de3f1a0a0c..da195d99ac1 100644
--- a/gui/admin-gui/src/main/resources/initial-objects/200-lookup-languages.xml
+++ b/gui/admin-gui/src/main/resources/initial-objects/200-lookup-languages.xml
@@ -28,6 +28,10 @@
 		<key>de_DE</key>
 		<label>Deutsch</label>
 	</row>
+	<row>
+		<key>et_EE</key>
+		<label>Eesti</label>
+	</row>
 	<row>
 		<key>en_US</key>
 		<label>English (US)</label>
@@ -36,6 +40,10 @@
 		<key>es_ES</key>
 		<label>Español</label>
 	</row>
+	<row>
+		<key>hu_HU</key>
+		<label>Magyar</label>
+	</row>
 	<row>
 		<key>sk_SK</key>
 		<label>Slovenčina</label>
diff --git a/gui/admin-gui/src/main/resources/initial-objects/210-lookup-locales.xml b/gui/admin-gui/src/main/resources/initial-objects/210-lookup-locales.xml
index 23ff4c44d8d..766fc241350 100644
--- a/gui/admin-gui/src/main/resources/initial-objects/210-lookup-locales.xml
+++ b/gui/admin-gui/src/main/resources/initial-objects/210-lookup-locales.xml
@@ -40,6 +40,10 @@
 		<key>es_ES</key>
 		<label>Español</label>
 	</row>
+	<row>
+		<key>hu_HU</key>
+		<label>Magyar</label>
+	</row>
 	<row>
 		<key>sk_SK</key>
 		<label>Slovenčina</label>
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties
index 748255fc0e7..048fecca6ae 100644
--- a/gui/admin-gui/src/main/resources/localization/Midpoint.properties
+++ b/gui/admin-gui/src/main/resources/localization/Midpoint.properties
@@ -2528,7 +2528,7 @@ SchemaHandlingStep.limitations.tooltip.maxOccurs=Maximum number of occurrences o
 SchemaHandlingStep.limitations.tooltip.minOccurs=Minimum number of occurrences of the attribute. A value of zero means optional attribute, value of one means mandatory attribute. A value which is specified here overrides the value taken from resource schema.
 SchemaHandlingStep.limitations.tooltip.other=TODO\: REMOVE THIS TOOLTIP
 SchemaHandlingStep.limitations.tooltip.propertyAccess=The type of access which is allowed or denied.
-SchemaHandlingStep.mapping.tooltip.authoritative=Authoritative mappings both add are remove specified value. Non-authoritative mappings only add the value. E.g. if a role with an authoritative mapping is removed the value that the mapping implied is also removed. If a role with non-authoritative mapping is removed then the value remains.
+SchemaHandlingStep.mapping.tooltip.authoritative=Authoritative mappings both add and remove specified value. Non-authoritative mappings only add the value. E.g. if a role with an authoritative mapping is removed the value that the mapping implied is also removed. If a role with non-authoritative mapping is removed then the value remains.
 SchemaHandlingStep.mapping.tooltip.channel=Limits application of this mapping only to specific channel. E.g. to changes coming from live sync, reconciliation or GUI. If the channel is listed then the mapping will be applied. If it is not then it will not be applied. If no channel is specified then no limitations apply and the mapping will be applied for all channels.
 SchemaHandlingStep.mapping.tooltip.conditionLanguage=Programming language in which is the condition script written.
 SchemaHandlingStep.mapping.tooltip.condition=The XML representation of mapping condition. This is the actual expression code that will be interpreted. Mapping sources are provided as input variables for the condition. If the condition returns true then the mapping will be applied. If it returns false then the mapping is ignored. Note that mappings that were true and that become false may result in removal of a value that was the result of the mapping while it was still true.
@@ -3001,7 +3001,7 @@ ChangePasswordPanel.enabled=Enabled
 ChangePasswordPanel.legendMessage.selected= - Password will be changed
 ChangePasswordPanel.legendMessage.propagated= - Automatic password propagation (based on policies defined in resources definitions)
 ChangePasswordPanel.legendMessage.deselected= - Password will not be changed
-ChangePasswordPanel.helpInfo=<p>This portion of the credentials dialog controls how the password change will be propagated to each individual system. The first line defines whether the password will be changes in the midPoint itself. Following lines represent each system for which the password can be changed. The password propagation is controlled by the icons:</p><ul><li><span class="fa fa-check-square-o"/> Password will be changed. Password for this system will be changed to the value specified in the password dialog above.</li><li><span class="fa fa-sign-out"/> Automatic password propagation. The password might be changed. Whether the password is changed or not depends on the policies set up by identity administrator. This usually means that the password will be changed if it makes sense for the current situation and settings. This is the reasonable default choice.)</li><li><span class="fa fa-square-o"/> Password will not be changed for this system.</li></ul><p>You can adjust the password propagation settings by clicking on the icons and thus fine-tune how the password change is propagated to each individual system.</p>
+ChangePasswordPanel.helpInfo=<p>This portion of the credentials dialog controls how the password change will be propagated to each individual system. The first line defines whether the password will be changes in the midPoint itself. Following lines represent each system for which the password can be changed. The password propagation is controlled by the icons:</p><ul><li><span class="fa fa-check-square-o"/> Password will be changed. Password for this system will be changed to the value specified in the password dialog above.</li><li><span class="fa fa-sign-out"/> Automatic password propagation. The password might be changed. Whether the password is changed or not depends on the policies set up by identity administrator. This usually means that the password will be changed if it makes sense for the current situation and settings. This is the reasonable default choice.</li><li><span class="fa fa-square-o"/> Password will not be changed for this system.</li></ul><p>You can adjust the password propagation settings by clicking on the icons and thus fine-tune how the password change is propagated to each individual system.</p>
 ChangePasswordPanel.helpPopupTitle=Password propagation help
 PageBase.button.tooltip.clearSearch=Clear
 mainForm.uploadTooLarge = Upload must be less than ${maxSize}.
@@ -3049,7 +3049,7 @@ operation.com.evolveum.midpoint.wf.impl.WfHook.invoke=Invoke (Workflow)
 operation.com.evolveum.midpoint.model.impl.lens.ChangeExecutor.execute=Execute (Model)
 operation.com.evolveum.midpoint.model.impl.lens.ChangeExecutor.execute.focus.UserType=Execute - user (Model)
 operation.com.evolveum.midpoint.model.impl.lens.ChangeExecutor.executeDelta=Execute delta (Model)
-operation.com.evolveum.midpoint.task.api.Task.listSubtasksDeeply=List subtasts deeply (Task)
+operation.com.evolveum.midpoint.task.api.Task.listSubtasksDeeply=List subtasks deeply (Task)
 operation.com.evolveum.midpoint.task.api.Task.listSubtasksRaw=List subtasks raw (Task)
 operation.com.evolveum.midpoint.web.page.self.PageSelfCredentials.savePassword=Password is successfully changed
 operation.com.evolveum.midpoint.web.page.self.PageRequestRole.save=Changes were successfully saved
@@ -3093,7 +3093,8 @@ SearchPanel.basic=Basic
 ResourceContentResourcePanel.realSearch=(In fact) Searching by: 
 typedAssignablePanel.selectedOrgs=Orgs: 
 typedAssignablePanel.selectedResources=Resources: 
-typedAssignablePanel.selectedRoles=Roles
+typedAssignablePanel.selectedRoles=Roles:
+typedAssignablePanel.selectedServices=Services:
 SearchPanel.insertFilterXml=Insert filter xml (SearchFilterType)
 autoRefreshPanel.refreshNow=Refresh now
 autoRefreshPanel.resumeRefreshing=Resume refreshing
@@ -3131,3 +3132,6 @@ ExecuteChangesHandlerPanel.change=Change
 ReportCreateHandlerPanel.downloadCreatedReport=Download created report
 ReportCreateHandlerPanel.reportParameters=Report parameters
 OperationResultPanel.showTask=(show task)
+PageResources.inlineMenuItem.test=Test
+PageRequestRole.title=Request a role
+
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties
index 6609fe1c66f..76fefa17760 100644
--- a/gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties
+++ b/gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties
@@ -101,7 +101,7 @@ AssignmentPreviewDialog.column.tenant=Tenant
 AssignmentPreviewDialog.label=View direct & indirect assignments
 AssignmentPreviewDialog.type.direct=Direct
 AssignmentPreviewDialog.type.indirect=Indirect
-AssignmentTablePanel.menu.assign=Assign Resource Account
+AssignmentTablePanel.menu.assign=Assign
 AssignmentTablePanel.menu.assignOrg=Assign Org.
 AssignmentTablePanel.menu.assignRole=Assign Role
 AssignmentTablePanel.menu.unassign=Unassign
diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java
index 530862267d9..9be63fbbad8 100644
--- a/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java
+++ b/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java
@@ -520,6 +520,19 @@ public static boolean isForceLoadDependentShadow(ResourceObjectTypeDependencyTyp
 	public static boolean isDown(ResourceType resource){
 		return (resource.getOperationalState() != null && AvailabilityStatusType.DOWN == resource.getOperationalState().getLastAvailabilityStatus());
 	}
+	
+	public static AvailabilityStatusType getLastAvailabilityStatus(ResourceType resource){
+		if (resource.getOperationalState() == null) {
+			return null;
+		}
+		
+		if (resource.getOperationalState().getLastAvailabilityStatus() == null) {
+			return null;
+		}
+		
+		return resource.getOperationalState().getLastAvailabilityStatus();
+		
+	}
 
 	public static boolean isAvoidDuplicateValues(ResourceType resource) {
 		if (resource.getConsistency() == null) {
diff --git a/model/certification-impl/pom.xml b/model/certification-impl/pom.xml
index a12e19fb8af..23c5c5dbd81 100644
--- a/model/certification-impl/pom.xml
+++ b/model/certification-impl/pom.xml
@@ -99,10 +99,6 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-beans</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>spring-security-core</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>javax.annotation</groupId>
 			<artifactId>javax.annotation-api</artifactId>
@@ -225,6 +221,15 @@
             <version>3.4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-core</artifactId>
+			<!-- This is not really "provided". But if set to "test" then it is not on the
+			     compile classpath and the compilation fails (despite being dependency of security-api).
+			     If set to "compile" then the maven dependency analyze will complain that it is not
+			     used if the tests are not compiled. Setting to "provided" solves this. -->
+			<scope>provided</scope> 
+		</dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/model/notifications-impl/pom.xml b/model/notifications-impl/pom.xml
index b79ae175e5b..fb3f9ce44fd 100644
--- a/model/notifications-impl/pom.xml
+++ b/model/notifications-impl/pom.xml
@@ -136,11 +136,7 @@
             <groupId>javax.annotation</groupId>
             <artifactId>javax.annotation-api</artifactId>
         </dependency>
-        <dependency>
-			<groupId>javax.xml.bind</groupId>
-			<artifactId>jaxb-api</artifactId>
-		</dependency>
-        
+                
         <!-- Test -->
         <dependency>
             <groupId>org.testng</groupId>
@@ -222,6 +218,12 @@
             <artifactId>spring-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+			<scope>test</scope>
+		</dependency>
+        
 
     </dependencies>
     <profiles>
diff --git a/model/report-impl/pom.xml b/model/report-impl/pom.xml
index b814e21173e..464396067a7 100644
--- a/model/report-impl/pom.xml
+++ b/model/report-impl/pom.xml
@@ -129,11 +129,6 @@
 			<version>20060411</version>
 			<scope>runtime</scope>
 		</dependency>
-  		<dependency>
-   			<groupId>org.hibernate</groupId>
-   			<artifactId>hibernate-core</artifactId>
-   			<scope>compile</scope>
-  		</dependency>
   		
   		<dependency>
    			<groupId>org.apache.cxf</groupId>
diff --git a/model/report-impl/src/test/java/com/evolveum/midpoint/report/BasicReportTest.java b/model/report-impl/src/test/java/com/evolveum/midpoint/report/BasicReportTest.java
deleted file mode 100644
index 36ca073a2f8..00000000000
--- a/model/report-impl/src/test/java/com/evolveum/midpoint/report/BasicReportTest.java
+++ /dev/null
@@ -1,1516 +0,0 @@
-/*
- * Copyright (c) 2010-2014 Evolveum
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.evolveum.midpoint.report;
-
-import static com.evolveum.midpoint.test.IntegrationTestTools.display;
-import static org.testng.AssertJUnit.assertEquals;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.datatype.DatatypeFactory;
-import javax.xml.datatype.Duration;
-
-import net.sf.jasperreports.engine.JasperCompileManager;
-import net.sf.jasperreports.engine.JasperExportManager;
-import net.sf.jasperreports.engine.JasperFillManager;
-import net.sf.jasperreports.engine.JasperPrint;
-import net.sf.jasperreports.engine.JasperReport;
-import net.sf.jasperreports.engine.design.JasperDesign;
-import net.sf.jasperreports.engine.xml.JRXmlLoader;
-
-import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.StringUtils;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.testng.AssertJUnit;
-import org.testng.annotations.Test;
-import org.w3c.dom.Element;
-
-import com.evolveum.midpoint.audit.api.AuditEventType;
-import com.evolveum.midpoint.model.api.ModelService;
-import com.evolveum.midpoint.model.test.AbstractModelIntegrationTest;
-import com.evolveum.midpoint.prism.ItemDefinition;
-import com.evolveum.midpoint.prism.Objectable;
-import com.evolveum.midpoint.prism.PrismContainer;
-import com.evolveum.midpoint.prism.PrismContext;
-import com.evolveum.midpoint.prism.PrismObject;
-import com.evolveum.midpoint.prism.PrismObjectDefinition;
-import com.evolveum.midpoint.prism.delta.ObjectDelta;
-import com.evolveum.midpoint.prism.path.ItemPath;
-import com.evolveum.midpoint.prism.query.ObjectFilter;
-import com.evolveum.midpoint.prism.query.ObjectQuery;
-import com.evolveum.midpoint.prism.query.RefFilter;
-import com.evolveum.midpoint.prism.schema.SchemaRegistry;
-import com.evolveum.midpoint.prism.util.PrismAsserts;
-import com.evolveum.midpoint.prism.xml.XmlTypeConverter;
-import com.evolveum.midpoint.report.api.ReportManager;
-import com.evolveum.midpoint.report.impl.ReportCreateTaskHandler;
-import com.evolveum.midpoint.report.impl.ReportUtils;
-import com.evolveum.midpoint.schema.GetOperationOptions;
-import com.evolveum.midpoint.schema.SelectorOptions;
-import com.evolveum.midpoint.schema.result.OperationResult;
-import com.evolveum.midpoint.schema.util.MiscSchemaUtil;
-import com.evolveum.midpoint.task.api.Task;
-import com.evolveum.midpoint.test.util.TestUtil;
-import com.evolveum.midpoint.util.exception.CommunicationException;
-import com.evolveum.midpoint.util.exception.ConfigurationException;
-import com.evolveum.midpoint.util.exception.ObjectAlreadyExistsException;
-import com.evolveum.midpoint.util.exception.ObjectNotFoundException;
-import com.evolveum.midpoint.util.exception.SchemaException;
-import com.evolveum.midpoint.util.exception.SecurityViolationException;
-import com.evolveum.midpoint.util.logging.Trace;
-import com.evolveum.midpoint.util.logging.TraceManager;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivationType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.CleanupPolicyType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ExportType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.MetadataType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.OperationResultType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.OrientationType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ReportFieldConfigurationType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ReportOutputType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ReportType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemConfigurationType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
-import com.evolveum.prism.xml.ns._public.query_3.OrderDirectionType;
-import com.evolveum.prism.xml.ns._public.types_3.ItemPathType;
-import com.evolveum.prism.xml.ns._public.types_3.PolyStringType;
-
-/**
- * @author garbika
- */
-@ContextConfiguration(locations = { "classpath:ctx-report-test-main.xml" })
-@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
-public class BasicReportTest extends AbstractModelIntegrationTest {
-    
-	private static final String CLASS_NAME_WITH_DOT = BasicReportTest.class
-			.getName() + ".";
-	/*private static final String GET_REPORT = CLASS_NAME_WITH_DOT
-			+ "getReport";*/
-	private static final String GET_REPORT_OUTPUT = CLASS_NAME_WITH_DOT
-			+ "getReportOutput";
-	private static final String SEARCH_REPORT_OUTPUT = CLASS_NAME_WITH_DOT
-			+ "searchReportOutput";
-	private static final String IMPORT_USERS = CLASS_NAME_WITH_DOT
-			+ "importUsers";
-	private static final String CREATE_REPORT = CLASS_NAME_WITH_DOT
-			+ "test001CreateReport";
-	private static final String CREATE_REPORT_FROM_FILE = CLASS_NAME_WITH_DOT
-			+ "test002CreateReportFromFile";
-	private static final String COPY_REPORT_WITHOUT_DESIGN = CLASS_NAME_WITH_DOT
-			+ "test003CopyReportWithoutDesign";
-	private static final String RUN_REPORT = CLASS_NAME_WITH_DOT
-			+ "test004RunReport";
-	private static final String PARSE_OUTPUT_REPORT = CLASS_NAME_WITH_DOT
-			+ "test005ParseOutputReport";
-	private static final String RUN_TASK = CLASS_NAME_WITH_DOT
-			+ "test006RunTask";
-	private static final String COUNT_REPORT = CLASS_NAME_WITH_DOT
-			+ "test007CountReport";
-	private static final String SEARCH_REPORT = CLASS_NAME_WITH_DOT
-			+ "test008SearchReport";
-	private static final String MODIFY_REPORT = CLASS_NAME_WITH_DOT
-			+ "test009ModifyReport";
-	private static final String DELETE_REPORT = CLASS_NAME_WITH_DOT
-			+ "test010DeleteReport";
-	private static final String CLEANUP_REPORTS = CLASS_NAME_WITH_DOT
-			+ "test011CleanupReports";
-	/*private static final String AUDIT_REPORT = CLASS_NAME_WITH_DOT
-			+ "test012AudtReportWithDeltas";*/
-	private static final String CREATE_AUDITLOGS_REPORT_FROM_FILE = CLASS_NAME_WITH_DOT
-			+ "test013CreateAuditLogsReportFromFile";
-	/*private static final String CREATE_AUDITLOGS_REPORT_WITH_DATASOURCE = CLASS_NAME_WITH_DOT
-			+ "test014CreateAuditLogsReportWithDatasource";*/
-	private static final String CREATE_USERLIST_REPORT_FROM_FILE = CLASS_NAME_WITH_DOT
-			+ "test015CreateUserListReportFromFile";
-	private static final String CREATE_RECONCILIATION_REPORT_FROM_FILE = CLASS_NAME_WITH_DOT
-			+ "test016CreateReconiciliationReportFromFile";
-	private static final String GET_REPORT_DATA = CLASS_NAME_WITH_DOT
-			+ "test017GetReportData";
-	
-	private static final Trace LOGGER = TraceManager
-			.getTrace(BasicReportTest.class);
-
-	
-	private static final String MIDPOINT_HOME = System.getProperty("midpoint.home");
-	
-	private static final File REPORTS_DIR = new File("src/test/resources/reports");
-	private static final File STYLES_DIR = new File("src/test/resources/styles");
-	private static final File COMMON_DIR = new File("src/test/resources/common");
-	
-	private static String EXPORT_DIR = MIDPOINT_HOME + "/export/";
-	
-	private static final File SYSTEM_CONFIGURATION_FILE = new File(COMMON_DIR + "/system-configuration.xml");
-	private static final File ROLE_SUPERUSER_FILE = new File(COMMON_DIR + "/role-superuser.xml");
-	private static final File USER_ADMINISTRATOR_FILE = new File(COMMON_DIR + "/user-administrator.xml");
-	private static final File TASK_REPORT_FILE = new File(COMMON_DIR + "/task-report.xml");  
-	private static final File REPORTS_FOR_CLEANUP_FILE = new File(COMMON_DIR + "/report-outputs-for-cleanup.xml");
-	private static final File TEST_REPORT_WITHOUT_DESIGN_FILE = new File(REPORTS_DIR + "/report-test-without-design.xml");
-	private static final File TEST_REPORT_FILE = new File(REPORTS_DIR + "/report-test.xml");
-	private static final File REPORT_DATASOURCE_TEST = new File(REPORTS_DIR + "/reportDataSourceTest.jrxml");
-	private static final File STYLE_TEMPLATE_DEFAULT = new File(STYLES_DIR	+ "/midpoint_base_styles.jrtx");
-	private static final File REPORT_AUDIT_TEST = new File(REPORTS_DIR + "/reportAuditLogs.jrxml");
-	private static final File RECONCILIATION_REPORT_FILE = new File(REPORTS_DIR + "/reportReconciliation.xml");
-	private static final File AUDITLOGS_REPORT_FILE = new File(REPORTS_DIR + "/reportAuditLogs.xml");
-	//private static final File AUDITLOGS_WITH_DATASOURCE_REPORT_FILE = new File(REPORTS_DIR + "/reportAuditLogs-with-datasource.xml");
-	private static final File USERLIST_REPORT_FILE = new File(REPORTS_DIR + "/reportUserList.xml");
-	private static final File USERROLES_REPORT_FILE = new File(REPORTS_DIR + "/reportUserRoles.xml");
-	
-	private static final File CUSTOM_REPORT_FILE = new File(REPORTS_DIR + "/reportCustomDS.xml");
-	
-	private static final File USERACCOUNTS_REPORT_FILE = new File(REPORTS_DIR + "/reportUserAccounts.xml");
-	private static final File USERORGS_REPORT_FILE = new File(REPORTS_DIR + "/reportUserOrgs.xml");
-	
-	private static final String REPORT_OID_001 = "00000000-3333-3333-0000-100000000001";
-	private static final String REPORT_OID_002 = "00000000-3333-3333-0000-100000000002";
-	private static final String TEST_REPORT_OID = "00000000-3333-3333-TEST-10000000000";
-	private static final String TEST_WITHOUT_DESIGN_REPORT_OID = "00000000-3333-3333-TEST-20000000000";
-	private static final String TASK_REPORT_OID = "00000000-3333-3333-TASK-10000000000";
-	private static final String AUDITLOGS_REPORT_OID = "AUDITLOG-3333-3333-TEST-10000000000";
-	private static final String RECONCILIATION_REPORT_OID = "RECONCIL-3333-3333-TEST-10000000000";
-	private static final String USERLIST_REPORT_OID = "USERLIST-3333-3333-TEST-10000000000";
-	//private static final String AUDITLOGS_DATASOURCE_REPORT_OID = "AUDITLOG-3333-3333-TEST-1DATASOURCE";
-	
-	@Autowired
-	private PrismContext prismContext;
-
-	@Autowired
-	private ModelService modelService;
-	
-	@Autowired
-	private ReportManager reportManager;
-	
-	@Autowired
-	private ReportCreateTaskHandler reportHandler;
-	
-	@Autowired
-	private SessionFactory sessionFactory;
-	
-	protected PrismObject<UserType> userAdministrator;
-	
-	public BasicReportTest() {
-		super();
-	}
-	
-	
-	@Override
-	public void initSystem(Task initTask, OperationResult initResult)
-			throws Exception {
-		
-		LOGGER.trace("initSystem");
-		super.initSystem(initTask, initResult);
-		modelService.postInit(initResult);
-		
-		OperationResult result = new OperationResult("System variables");
-		// System Configuration
-		try {
-			repoAddObjectFromFile(SYSTEM_CONFIGURATION_FILE, SystemConfigurationType.class, result);
-		} catch (ObjectAlreadyExistsException e) {
-			LOGGER.trace("System configuration already exists in repository;");
-		}
-		
-		// Users
-		repoAddObjectFromFile(ROLE_SUPERUSER_FILE, RoleType.class, result);
-		try {
-			userAdministrator = repoAddObjectFromFile(USER_ADMINISTRATOR_FILE, UserType.class, result);
-		} catch (ObjectAlreadyExistsException e) {
-			LOGGER.trace("User administrator already exists in repository;");
-		}
-		login(userAdministrator);
-		
-	}
-	
-	protected Task createTask(String operationName) {
-		Task task = taskManager.createTaskInstance(operationName);
-		task.setOwner(userAdministrator);
-		return task;
-	}
-	/*
-	private PrismObject<ReportType> getReport(String reportOid) throws ObjectNotFoundException, SchemaException, SecurityViolationException, CommunicationException, ConfigurationException {
-		Task task = taskManager.createTaskInstance(GET_REPORT);
-        OperationResult result = task.getResult();
-		PrismObject<ReportType> report = modelService.getObject(ReportType.class, reportOid, null, task, result);
-		result.computeStatus();
-		TestUtil.assertSuccess("getObject(Report) result not success", result);
-		return report;
-	}
-	*/
-	private PrismObject<ReportOutputType> getReportOutput(String reportOutputOid) throws ObjectNotFoundException, SchemaException, SecurityViolationException, CommunicationException, ConfigurationException {
-		Task task = taskManager.createTaskInstance(GET_REPORT_OUTPUT);
-        OperationResult result = task.getResult();
-		PrismObject<ReportOutputType> reportOutput = modelService.getObject(ReportOutputType.class, reportOutputOid, null, task, result);
-		result.computeStatus();
-		TestUtil.assertSuccess("getObject(ReportOutput) result not success", result);
-		return reportOutput;
-	}
-	
-	private List<PrismObject<ReportOutputType>> searchReportOutput(String reportOid) throws ObjectNotFoundException, SchemaException, SecurityViolationException, CommunicationException, ConfigurationException {
-		Task task = taskManager.createTaskInstance(SEARCH_REPORT_OUTPUT);
-        OperationResult result = task.getResult();
-        ObjectFilter filter = RefFilter.createReferenceEqual(ReportOutputType.F_REPORT_REF, ReportOutputType.class, prismContext, reportOid);
-        ObjectQuery query = ObjectQuery.createObjectQuery(filter);
-		List<PrismObject<ReportOutputType>> reportOutputList = modelService.searchObjects(ReportOutputType.class, query, null, task, result);
-		result.computeStatus();
-		TestUtil.assertSuccess("getObject(Report) result not success", result);
-		return reportOutputList;
-	}
-
-	private void importUsers(int from, int to) throws Exception {
-		Task task = taskManager.createTaskInstance(IMPORT_USERS);
-        OperationResult result = task.getResult();
-        OperationResult subResult = null;
-		for (int i=from; i<=to; i++)
-		{
-			UserType user = new UserType();
-			prismContext.adopt(user);
-			user.setName(new PolyStringType("User_" + Integer.toString(i)));
-			ObjectDelta<UserType> objectDelta = ObjectDelta.createAddDelta((PrismObject<UserType>) user.asPrismObject());
-			Collection<ObjectDelta<? extends ObjectType>> deltas =	MiscSchemaUtil.createCollection(objectDelta);
-			LOGGER.trace("insert user {}", user);
-			subResult = result.createSubresult("User : " + user.getName().getOrig());
-			modelService.executeChanges(deltas, null, task, subResult);
-			subResult.computeStatus();
-			TestUtil.assertSuccess("import user result not success", subResult);
-		}
-		
-		Collection<SelectorOptions<GetOperationOptions>> options = SelectorOptions.createCollection(GetOperationOptions.createRaw());
-		subResult = result.createSubresult("count users");
-		int countUsers = modelService.countObjects(UserType.class, null, options, task, subResult);
-		LOGGER.trace("count users {}: ", countUsers);
-		assertEquals("Unexpected number of count users", to + 1, countUsers);
-		result.computeStatus();
-	}
-
-	private Calendar create_2014_01_01_12_00_Calendar() {
-        Calendar calendar = Calendar.getInstance();
-        calendar.set(Calendar.YEAR, 2014);
-        calendar.set(Calendar.MONTH, Calendar.JANUARY);
-        calendar.set(Calendar.DAY_OF_MONTH, 1);
-        calendar.set(Calendar.HOUR_OF_DAY, 12);
-        calendar.set(Calendar.MINUTE, 0);
-        calendar.set(Calendar.SECOND, 0);
-        calendar.set(Calendar.MILLISECOND, 0);
-
-        return calendar;
-    }
-
-    private Calendar create_2013_06_01_00_00_Calendar() {
-        Calendar calendar = Calendar.getInstance();
-        calendar.set(Calendar.YEAR, 2013);
-        calendar.set(Calendar.MONTH, Calendar.JUNE);
-        calendar.set(Calendar.DAY_OF_MONTH, 1);
-        calendar.set(Calendar.HOUR_OF_DAY, 0);
-        calendar.set(Calendar.MINUTE, 0);
-        calendar.set(Calendar.SECOND, 0);
-        calendar.set(Calendar.MILLISECOND, 0);
-
-        return calendar;
-    }
-
-    private Calendar create_2013_07_01_00_00_Calendar() {
-        Calendar calendar = Calendar.getInstance();
-        calendar.set(Calendar.YEAR, 2013);
-        calendar.set(Calendar.MONTH, Calendar.JULY);
-        calendar.set(Calendar.DAY_OF_MONTH, 1);
-        calendar.set(Calendar.HOUR_OF_DAY, 0);
-        calendar.set(Calendar.MINUTE, 0);
-        calendar.set(Calendar.SECOND, 0);
-        calendar.set(Calendar.MILLISECOND, 0);
-
-        return calendar;
-    }
-
-    private Calendar create_2013_08_01_00_00_Calendar() {
-        Calendar calendar = Calendar.getInstance();
-        calendar.set(Calendar.YEAR, 2013);
-        calendar.set(Calendar.MONTH, Calendar.AUGUST);
-        calendar.set(Calendar.DAY_OF_MONTH, 1);
-        calendar.set(Calendar.HOUR_OF_DAY, 0);
-        calendar.set(Calendar.MINUTE, 0);
-        calendar.set(Calendar.SECOND, 0);
-        calendar.set(Calendar.MILLISECOND, 0);
-
-        return calendar;
-    }
-
-    private Duration createDuration(Calendar when, long now) throws Exception {
-        long seconds = (now - when.getTimeInMillis()) / 1000;
-        return DatatypeFactory.newInstance().newDuration("PT" + seconds + "S").negate();
-    }
-
-    private CleanupPolicyType createPolicy(Calendar when, long now) throws Exception {
-        CleanupPolicyType policy = new CleanupPolicyType();
-
-        Duration duration = createDuration(when, now);
-        policy.setMaxAge(duration);
-
-        return policy;
-    }
-
-
-	@Test
-	public void test001CreateReport() throws Exception {
-		// import vo for cycle cez usertype zrusit vsetky RTable
-
-		final String TEST_NAME = "test001CreateReport";
-        TestUtil.displayTestTile(this, TEST_NAME);
-        
-        ReportType reportType = new ReportType();
-		prismContext.adopt(reportType);
-		
-		reportType.setOid(REPORT_OID_001);
-
-		// description and name
-		reportType.setName(new PolyStringType("Test report - Datasource1"));
-		reportType.setDescription("TEST Report with DataSource parameter.");
-
-		// file templates
-		String template = FileUtils.readFileToString(REPORT_DATASOURCE_TEST, "UTF-8");
-		LOGGER.info("tempalte: " + template);
-		byte[] encodedTemplate = Base64.encodeBase64(template.getBytes());
-		LOGGER.info("encoded tempalte: " + encodedTemplate);
-		byte[] decoded = Base64.decodeBase64(encodedTemplate);
-		LOGGER.info("decided: " + new String(decoded));
-		assertEquals(template, new String(decoded));
-//		ReportTemplateType reportTemplate = new ReportTemplateType();
-//		reportTemplate.setAny(DOMUtil.parseDocument(template).getDocumentElement());
-		reportType.setTemplate(encodedTemplate);
-
-		String templateStyle = FileUtils.readFileToString(STYLE_TEMPLATE_DEFAULT, "UTF-8"); //readFile(STYLE_TEMPLATE_DEFAULT, StandardCharsets.UTF_8);
-//		ReportTemplateStyleType reportTemplateStyle = new ReportTemplateStyleType();
-//		reportTemplateStyle.setAny(DOMUtil.parseDocument(templateStyle).getDocumentElement());
-		byte[] encodedTemplateStyle = Base64.encodeBase64(templateStyle.getBytes());
-		reportType.setTemplateStyle(encodedTemplateStyle);
-		LOGGER.info("tempalte style: " + templateStyle);
-		LOGGER.info("encoded tempalte style: " + encodedTemplateStyle);
-/*
-		String config_schema = FileUtils.readFileToString(REPORT_DATASOURCE_TEST, "UTF-8");
-		
-		ReportConfigurationType parameters = new ReportConfigurationType();
-		parameters.getAny().add(arg0)
-		reportType.setConfiguration(parameters);
-
- * reportType.s
-		PrismContainer<Containerable> configuration = new PrismContainer(null);
-		// object class
-				reportType.setObjectClass(ObjectTypes.getObjectType(UserType.class)
-						.getTypeQName());
-
-				// object query
-				ObjectPaging paging = ObjectPaging.createPaging(0, 10);
-				ObjectQuery query = ObjectQuery.createObjectQuery(paging);
-				QueryType queryType = QueryConvertor.createQueryType(query, prismContext);		
-				reportType.setQuery(queryType);
-		// parameters
-		List<ReportParameterConfigurationType> reportParameters = new ArrayList<ReportParameterConfigurationType>();
-
-		ReportParameterConfigurationType parameter = new ReportParameterConfigurationType();
-		parameter.setNameParameter("LOGO_PATH");
-		parameter.setValueParameter(REPORTS_DIR.getPath() + "/logo.jpg");
-		parameter.setClassTypeParameter(DOMUtil.XSD_ANY);
-		reportParameters.add(parameter);
-
-		parameter = new ReportParameterConfigurationType();
-		parameter.setNameParameter("BaseTemplateStyles");
-		parameter.setValueParameter(STYLE_TEMPLATE_DEFAULT.getPath());
-		parameter.setClassTypeParameter(DOMUtil.XSD_STRING);
-		reportParameters.add(parameter);
-		// object query
-		ObjectPaging paging = ObjectPaging.createPaging(0, 10);
-		ObjectQuery query = ObjectQuery.createObjectQuery(paging);
-<<<<<<< HEAD
-		QueryType queryType = new QueryType();
-		try {
-			queryType = QueryJaxbConvertor.createQueryType(query, prismContext);
-		} catch (Exception ex) {
-			LOGGER.error("Exception occurred. QueryType", ex);
-		}
-		try {
-			queryType.setPaging(PagingConvertor.createPagingType(query
-					.getPaging()));
-		} catch (Exception ex) {
-			LOGGER.error("Exception occurred. QueryType pagging", ex);
-		}
-=======
-		QueryType queryType = QueryConvertor.createQueryType(query, prismContext);		
->>>>>>> master
-		reportType.setQuery(queryType);
-
-		reportType.getReportParameter().addAll(reportParameters);
-*/
- 
-		//use hibernate session
-		reportType.setUseHibernateSession(false);
-		
-		// orientation
-		reportType.setOrientation(OrientationType.LANDSCAPE);
-
-		// export
-		reportType.setExport(ExportType.PDF);
-
-		// fields
-		List<ReportFieldConfigurationType> reportFields = new ArrayList<ReportFieldConfigurationType>();
-
-		ReportFieldConfigurationType field = new ReportFieldConfigurationType();
-		ItemPath itemPath;
-		ItemPathType xpath;
-		Element element;
-		ItemDefinition itemDef;
-		SchemaRegistry schemaRegistry = prismContext.getSchemaRegistry();
-
-		PrismObjectDefinition<UserType> userDefinition = schemaRegistry
-				.findObjectDefinitionByCompileTimeClass(UserType.class);
-
-		field.setNameHeader("Name");
-		field.setNameReport("Name");
-		itemPath = new ItemPath(UserType.F_NAME);
-		xpath = new ItemPathType(itemPath);
-		field.setItemPath(xpath);
-		field.setSortOrderNumber(1);
-		field.setSortOrder(OrderDirectionType.ASCENDING);
-		itemDef = userDefinition.findItemDefinition(itemPath);
-		field.setWidth(25);
-		field.setClassType(itemDef.getTypeName());
-		reportFields.add(field);
-
-		field = new ReportFieldConfigurationType();
-		field.setNameHeader("First Name");
-		field.setNameReport("FirstName");
-		itemPath = new ItemPath(UserType.F_GIVEN_NAME);
-		xpath = new ItemPathType(itemPath);
-		field.setItemPath(xpath);
-		field.setSortOrderNumber(null);
-		field.setSortOrder(null);
-		itemDef = userDefinition.findItemDefinition(itemPath);
-		field.setWidth(25);
-		field.setClassType(itemDef.getTypeName());
-		reportFields.add(field);
-
-		field = new ReportFieldConfigurationType();
-		field.setNameHeader("Last Name");
-		field.setNameReport("LastName");
-		itemPath = new ItemPath(UserType.F_FAMILY_NAME);
-		xpath = new ItemPathType(itemPath);
-		field.setItemPath(xpath);
-		field.setSortOrderNumber(null);
-		field.setSortOrder(null);
-		itemDef = userDefinition.findItemDefinition(itemPath);
-		field.setWidth(25);
-		field.setClassType(itemDef.getTypeName());
-		reportFields.add(field);
-
-		field = new ReportFieldConfigurationType();
-		field.setNameHeader("Activation");
-		field.setNameReport("Activation");
-		itemPath = new ItemPath(UserType.F_ACTIVATION,
-				ActivationType.F_ADMINISTRATIVE_STATUS);
-		xpath = new ItemPathType(itemPath);
-		field.setItemPath(xpath);
-		field.setSortOrderNumber(null);
-		field.setSortOrder(null);
-		itemDef = userDefinition.findItemDefinition(itemPath);
-		field.setWidth(25);
-		field.setClassType(itemDef.getTypeName());
-		reportFields.add(field);
-
-		reportType.getField().addAll(reportFields);
-		
-		Task task = taskManager.createTaskInstance(CREATE_REPORT);
-		OperationResult result = task.getResult();
-		result.addParams(new String[] { "task" }, task.getResult());
-		result.addParams(new String[] { "object" }, reportType);
-
-		ObjectDelta<ReportType> objectDelta = ObjectDelta
-				.createAddDelta(reportType.asPrismObject());
-		Collection<ObjectDelta<? extends ObjectType>> deltas = MiscSchemaUtil
-				.createCollection(objectDelta);
-		
-		//WHEN
-		TestUtil.displayWhen(TEST_NAME);
-		modelService.executeChanges(deltas, null, task, result);
-		
-		// THEN
-		TestUtil.displayThen(TEST_NAME);
-        result.computeStatus();
-        display(result);
-        TestUtil.assertSuccess(result);
-		AssertJUnit.assertEquals(REPORT_OID_001, objectDelta.getOid());
-
-//		reportType = ReportUtils.getReport(REPORT_OID_001, result, modelService);
-
-		// export xml structure of report type
-		//String xmlReportType = prismContext.getPrismDomProcessor().serializeObjectToString(reportType.asPrismObject());
-		//LOGGER.warn(xmlReportType);
-
-		// check reportType
-		AssertJUnit.assertNotNull(reportType);
-		AssertJUnit.assertEquals("Test report - Datasource1", reportType
-				.getName().getOrig());
-		AssertJUnit.assertEquals("TEST Report with DataSource parameter.",
-				reportType.getDescription());
-		
-		
-		//LOGGER.warn("reportTemplate orig ::::::::: " + DOMUtil.serializeDOMToString((Node)reportTemplate.getAny()));
-		//LOGGER.warn("reportTemplate DB ::::::::: " + DOMUtil.serializeDOMToString((Node)reportType.getReportTemplate().getAny()));
-		
-		//LOGGER.warn("reportTemplateStyle orig ::::::::: " + DOMUtil.serializeDOMToString((Node)reportTemplateStyle.getAny()));
-		//LOGGER.warn("reportTemplateStyle DB ::::::::: " + DOMUtil.serializeDOMToString((Node)reportType.getReportTemplateStyle().getAny()));
-		
-		
-		//String reportTemplateRepoString = DOMUtil.serializeDOMToString((Node)reportType.getReportTemplate().getAny());
-   	 	//InputStream inputStreamJRXML = new ByteArrayInputStream(reportTemplateRepoString.getBytes());
-   	 	//JasperDesign jasperDesignRepo = JRXmlLoader.load(inputStreamJRXML);
-   	 	
-   	 	//String reportTemplateString = DOMUtil.serializeDOMToString((Node)reportTemplate.getAny());
-	 	//inputStreamJRXML = new ByteArrayInputStream(reportTemplateString.getBytes());
-	 	//JasperDesign jasperDesign = JRXmlLoader.load(inputStreamJRXML);
-	 	
-	 	//AssertJUnit.assertEquals(jasperDesign, jasperDesignRepo);
-		//AssertJUnit.assertEquals(reportTemplateStyle.getAny(), reportType.getReportTemplateStyle().getAny());
-		AssertJUnit.assertEquals(OrientationType.LANDSCAPE,
-				reportType.getOrientation());
-		AssertJUnit.assertEquals(ExportType.PDF, reportType.getExport());
-
-		/*
-		 AssertJUnit.assertEquals(ObjectTypes.getObjectType(UserType.class)
-				.getTypeQName(), reportType.getObjectClass());
-		AssertJUnit.assertEquals(queryType, reportType.getQuery());
-*/
-		int fieldCount = reportFields.size();
-		List<ReportFieldConfigurationType> fieldsRepo = reportType
-				.getField();
-
-		ReportFieldConfigurationType fieldRepo = null;
-		AssertJUnit.assertEquals(fieldCount, fieldsRepo.size());
-		for (int i = 0; i < fieldCount; i++) {
-			fieldRepo = fieldsRepo.get(i);
-			field = reportFields.get(i);
-			AssertJUnit.assertEquals(field.getNameHeader(),
-					fieldRepo.getNameHeader());
-			AssertJUnit.assertEquals(field.getNameReport(),
-					fieldRepo.getNameReport());
-			ItemPath fieldPath = field.getItemPath().getItemPath();
-			ItemPath fieldRepoPath = fieldRepo.getItemPath().getItemPath();
-			PrismAsserts.assertPathEquivalent("Wrong path", fieldPath, fieldRepoPath);
-			AssertJUnit.assertEquals(field.getSortOrder(),
-					fieldRepo.getSortOrder());
-			AssertJUnit.assertEquals(field.getSortOrderNumber(),
-					fieldRepo.getSortOrderNumber());
-			AssertJUnit.assertEquals(field.getWidth(),
-					fieldRepo.getWidth());
-			AssertJUnit.assertEquals(field.getClassType(),
-					fieldRepo.getClassType());
-		}
-/*
-		int parameterCount = reportParameters.size();
-		List<ReportParameterConfigurationType> parametersRepo = reportType
-				.getReportParameter();
-
-		ReportParameterConfigurationType parameterRepo = null;
-		AssertJUnit.assertEquals(parameterCount, parametersRepo.size());
-		for (int i = 0; i < parameterCount; i++) {
-			parameterRepo = parametersRepo.get(i);
-			parameter = reportParameters.get(i);
-			AssertJUnit.assertEquals(parameter.getNameParameter(),
-					parameterRepo.getNameParameter());
-			AssertJUnit.assertEquals(parameter.getValueParameter(),
-					parameterRepo.getValueParameter());
-			AssertJUnit.assertEquals(parameter.getClassTypeParameter(),
-					parameterRepo.getClassTypeParameter());
-		}*/
-	}
-
-	@Test 
-	public void test002CreateReportFromFile() throws Exception {
-		
-		try{
-		final String TEST_NAME = "test002CreateReportFromFile";
-        TestUtil.displayTestTile(this, TEST_NAME);
-	
-        //GIVEN
-		Task task = taskManager.createTaskInstance(CREATE_REPORT_FROM_FILE);
-		OperationResult result = task.getResult();
-      
-		//WHEN 	
-		TestUtil.displayWhen(TEST_NAME);
-		PrismObject<ReportType> reportType = prismContext.parseObject(TEST_REPORT_FILE);
-//		LOGGER.info("report template: " + new String(Base64.decodeBase64(reportType.asObjectable().getTemplate())));
-//		LOGGER.info("report template style: " + new String(Base64.decodeBase64(reportType.asObjectable().getTemplateStyle())));
-//		LOGGER.info("Parsed: " + reportType.debugDump());
-		repoAddObject(ReportType.class, reportType, result);
-//		importObjectFromFile(TEST_REPORT_FILE);
-		
-		PrismObject<ReportType> reportFromRepo = modelService.getObject(ReportType.class, TEST_REPORT_OID, null, task, result);
-//		LOGGER.info("REPO: " + reportFromRepo.debugDump());
-//		LOGGER.info("report template: " + new String(Base64.decodeBase64(reportFromRepo.asObjectable().getTemplate())));
-//		LOGGER.info("report template style: " + new String(Base64.decodeBase64(reportFromRepo.asObjectable().getTemplateStyle())));
-		
-//		ObjectDelta delta = reportType.diff(reportFromRepo);
-//		LOGGER.info("delta: " + delta.debugDump());
-//		AssertJUnit.assertTrue("Delta must be null", delta.isEmpty());
-		
-		
-//		PrismObject<ReportType> reportFromutils = ReportUtils.getReport(TEST_REPORT_OID, result, modelService).asPrismObject();
-//		LOGGER.info("UTILS: " + reportFromutils.debugDump());
-//		LOGGER.info("report template: " + new String(Base64.decodeBase64(reportFromutils.asObjectable().getTemplate())));
-//		LOGGER.info("report template style: " + new String(Base64.decodeBase64(reportFromutils.asObjectable().getTemplateStyle())));
-		
-//		ObjectDelta delta2 = reportFromRepo.diff(reportFromutils);
-//		LOGGER.info("delta: " + delta2.debugDump());
-//		AssertJUnit.assertTrue("Delta must be null", delta2.isEmpty());
-		
-
-		
-		//THEN  
-		TestUtil.displayThen(TEST_NAME);
-        result.computeStatus();
-        display(result);
-        TestUtil.assertSuccess(result);
-		} catch (Exception ex){
-			LOGGER.error("failed to create report: " + ex.getMessage(), ex);
-			throw ex;
-		}
-	}
-
-	@Test
-	public void test003CopyReportWithoutDesign() throws Exception {
-		final String TEST_NAME = "test003CopyReportWithoutDesign";
-        TestUtil.displayTestTile(this, TEST_NAME);
-
-		Task task = taskManager.createTaskInstance(COPY_REPORT_WITHOUT_DESIGN);
-		OperationResult result = task.getResult();
-
-		ReportType reportType = null; //ReportUtils.getReport(REPORT_OID_001, result, modelService);
-
-		reportType = reportType.clone();
-		reportType.setOid(REPORT_OID_002);
-		reportType.setTemplate(null);
-		reportType.setTemplateStyle(null);
-		reportType.setName(new PolyStringType("Test report - Datasource2"));
-
-		ObjectDelta<ReportType> objectDelta = ObjectDelta
-				.createAddDelta(reportType.asPrismObject());
-		Collection<ObjectDelta<? extends ObjectType>> deltas = MiscSchemaUtil
-				.createCollection(objectDelta);
-		//WHEN 	
-		TestUtil.displayWhen(TEST_NAME);
-		modelService.executeChanges(deltas, null, task, result);
-		
-		//THEN  
-		TestUtil.displayThen(TEST_NAME);
-		result.computeStatus();
-		display(result);
-		TestUtil.assertSuccess(result);
-		AssertJUnit.assertEquals(REPORT_OID_002, objectDelta.getOid());
-	}
-	
-	
-	@Test
-	public void test004RunReport() throws Exception {
-		final String TEST_NAME = "test004RunReport";
-        TestUtil.displayTestTile(this, TEST_NAME);
-		
-		// GIVEN
-        Task task = createTask(RUN_REPORT);
-		OperationResult result = task.getResult();
-		importUsers(1,10);
-		ReportType reportType = null;//ReportUtils.getReport(TEST_REPORT_OID, result, modelService);
-		LOGGER.info("jasper report: " + new String(Base64.decodeBase64(reportType.getTemplate()), "utf-8"));
-		LOGGER.info("jasper report template: " + new String(Base64.decodeBase64(reportType.getTemplateStyle())));
-		//WHEN 	
-		TestUtil.displayWhen(TEST_NAME);
-		reportManager.runReport(reportType.asPrismObject(), new PrismContainer(null), task, result);
-		
-		// THEN
-        TestUtil.displayThen(TEST_NAME);
-        //OperationResult subresult = result.getLastSubresult();
-        //TestUtil.assertInProgress("create report result", subresult);
-        
-        waitForTaskFinish(task.getOid(), false, 50000);
-        
-     // Task result
-        PrismObject<TaskType> reportTaskAfter = getTask(task.getOid());
-        OperationResultType reportTaskResult = reportTaskAfter.asObjectable().getResult();
-        display("Report task result", reportTaskResult);
-        TestUtil.assertSuccess(reportTaskResult);
-	}
-
-	
-	@Test
-	public void test005ParseOutputReport() throws Exception {
-		final String TEST_NAME = "test005ParseOutputReport";
-        TestUtil.displayTestTile(this, TEST_NAME);
-		
-		// GIVEN
-        Task task = createTask(PARSE_OUTPUT_REPORT);
-		OperationResult result = task.getResult();
-		
-        ReportOutputType reportOutputType = searchReportOutput(TEST_REPORT_OID).get(0).asObjectable();
-        LOGGER.trace("read report output {}", reportOutputType);
-        
-        ReportType reportType= null;// = ReportUtils.getReport(TEST_REPORT_OID, result, modelService);
-        LOGGER.trace("read report {}", reportType);
-        
-       // String output = ReportUtils.getReportOutputFilePath(reportType);
-        
-        AssertJUnit.assertNotNull(reportOutputType);
-        assertEquals("Unexpected report reference", MiscSchemaUtil.createObjectReference(reportType.getOid(), ReportType.COMPLEX_TYPE), reportOutputType.getReportRef());
-       // assertEquals("Unexpected report file path", output, reportOutputType.getFilePath());
-       
-        BufferedReader br = null;  
-        String line = "";  
-        String splitBy = ",";  
-        
-        br = new BufferedReader(new FileReader(reportOutputType.getFilePath()));  
-        int count = 0;
-        while ((line = br.readLine()) != null) {  
-        	count++;
-        	String[] lineDetails = line.split(splitBy); 
-        	LOGGER.info("line details {}", line);
-        	switch (count)
-        	{
-        		case 1:  assertEquals("Unexpected name of report", "User Report", lineDetails[3]);
-        			break;
-        		case 2:  assertEquals("Unexpected second line of report", "Report generated on:", lineDetails[7]);
-    				break;
-        		case 3:  {
-        			assertEquals("Unexpected third line of report", "Number of records:", lineDetails[7]);
-        			// if not filter 
-        			// assertEquals("Unexpected number of records", 11, Integer.parseInt(lineDetails[8]));
-        			assertEquals("Unexpected number of records", 10, Integer.parseInt(lineDetails[8]));
-        			}
-    				break;
-        		case 4: {
-        			assertEquals("Unexpected column header of report - name", "Name", lineDetails[1]);
-        			assertEquals("Unexpected column header of report - first name", "First name", lineDetails[4]);
-        			assertEquals("Unexpected column header of report - last name", "Last name", lineDetails[5]);
-        			assertEquals("Unexpected column header of report - activation", "Activation", lineDetails[6]);
-        			}
-    				break;
-    			 
-        		case 5:	// if not filter
-        			//LOGGER.trace("USERS [name= " + lineDetails[0] + " , first name=" + lineDetails[4] + " , last name=" + lineDetails[5] + " , activation=" + lineDetails[6] + "]");
-        			//break;
-        		case 6:
-        		case 7:
-        		case 8:
-        		case 9:
-        		case 10:
-        		case 11:
-        		case 12:
-        		case 13:
-        		case 14:
-        		case 15:
-        		//if not filter 
-        			//case 15:
-        			LOGGER.trace("USERS [name= " + lineDetails[0] + "]");
-        			break;
-        		// if not filter 
-//        			case 16: {
-        		case 16: {
-//        			assertEquals("Unexpected text", "Page 1 of", lineDetails[9]);
-//        			String pages = lineDetails[10].trim();
-//        			assertEquals("Unexpected count pages", 1, Integer.parseInt(pages));
-        			}
-        			break;
-        		case 17:
-        			break;
-        		default: LOGGER.trace("incorrect]");
-        			break;
-        	}	
-        }  
-        if (br != null) br.close();  
-        
-        LOGGER.trace("Done with reading CSV");  
-        //if not filter 
-        //assertEquals("Unexpected number of users", 11, count-5);
-//        assertEquals("Unexpected number of users", 10, count-5);
-	}
-	
-	
-	 //import report from xml file without design
-	 //import task from xml file
-	 //run task
-	 //parse output file
-	 
-	
-
-	//NOT SUPPORTED ANYMORE
-//	@Test
-	public void test006RunTask() throws Exception {
-		final String TEST_NAME = "test006RunTask";
-        TestUtil.displayTestTile(this, TEST_NAME);
-        
-        boolean import10000 = false;
-        int countUsers = 11;
-        if (import10000){ 
-        	importUsers(11, 10000);
-        	countUsers = 10001;
-        }
-        	
-        Task task = taskManager.createTaskInstance(RUN_TASK);
-		OperationResult result = task.getResult();
-		
-		//WHEN
-		TestUtil.displayWhen(TEST_NAME);
-		importObjectFromFile(TEST_REPORT_WITHOUT_DESIGN_FILE);
-		
-		ReportType reportType = null; //ReportUtils.getReport(TEST_WITHOUT_DESIGN_REPORT_OID, result, modelService);
-		
-		LOGGER.trace("import report task {}", TASK_REPORT_FILE.getPath());
-        importObjectFromFile(TASK_REPORT_FILE);
-		
-        // THEN
-        TestUtil.displayThen(TEST_NAME);
-        LOGGER.trace("run report task {}", TASK_REPORT_OID);
-        waitForTaskFinish(TASK_REPORT_OID, false);
-        
-        // Task result
-        PrismObject<TaskType> reportTaskAfter = getTask(TASK_REPORT_OID);
-        OperationResultType reportTaskResult = reportTaskAfter.asObjectable().getResult();
-        display("Report task result", reportTaskResult);
-        TestUtil.assertSuccess(reportTaskResult);
-        
-        ReportOutputType reportOutputType = searchReportOutput(reportType.getOid()).get(0).asObjectable();
-        LOGGER.trace("read report output {}", reportOutputType);
-        
-        //ReportType report = getReport(reportType.getOid()).asObjectable();
-        LOGGER.trace("read report {}", reportType);
-        
-        //String output = ReportUtils.getReportOutputFilePath(reportType);
-        
-        AssertJUnit.assertNotNull(reportOutputType);
-        assertEquals("Unexpected report reference", MiscSchemaUtil.createObjectReference(reportType.getOid(), ReportType.COMPLEX_TYPE), reportOutputType.getReportRef());
-        //assertEquals("Unexpected report file path", output, reportOutputType.getFilePath());
-           
-        BufferedReader br = null;  
-        String line = "";  
-        String splitBy = ",";  
-        
-        br = new BufferedReader(new FileReader(reportOutputType.getFilePath()));  
-        int count = 0;
-        while ((line = br.readLine()) != null) {  
-        	count++;
-        	String[] lineDetails = line.split(splitBy); 
-        	switch (count)
-        	{
-        		case 1:  assertEquals("Unexpected name of report", true, lineDetails[2].indexOf("DataSource")!=-1);
-        			break;
-        		case 2:  assertEquals("Unexpected second line of report", "Report generated on:", lineDetails[6]);
-    				break;
-        		case 3:  {
-        			assertEquals("Unexpected third line of report", "Number of records:", lineDetails[6]);
-        			assertEquals("Unexpected number of records", countUsers, Integer.parseInt(lineDetails[7]));
-        			}
-    				break;
-        		case 4: {
-        			assertEquals("Unexpected column header of report - name", "Name", lineDetails[0]);
-        			assertEquals("Unexpected column header of report - first name", "First Name", lineDetails[3]);
-        			assertEquals("Unexpected column header of report - last name", "Last Name", lineDetails[4]);
-        			assertEquals("Unexpected column header of report - activation", "Activation", lineDetails[5]);
-        			}
-    				break;
-        		case 5:	LOGGER.trace("USERS [name= " + lineDetails[0] + " , first name=" + lineDetails[3] + " , last name=" + lineDetails[4] + " , activation=" + lineDetails[5] + "]");
-        			break;
-        		case 16: {
-        			assertEquals("Unexpected text", "Page 1 of", lineDetails[8]);
-        			assertEquals("Unexpected count pages", 1, Integer.parseInt(lineDetails[9].replace("\\s", "")));
-        			}
-        			break;
-        		default: LOGGER.trace("USERS [name= " + lineDetails[0] + "]");//LOGGER.trace("incorrect]");
-        			break;
-        	}	
-        }  
-        if (br != null) br.close();  
-        
-        LOGGER.trace("Done with reading CSV");  
-        assertEquals("Unexpected number of users", countUsers, count-5);
-	}
-
-	
-		@Test
-		public void test007CountReport() throws Exception {
-			final String TEST_NAME = "test007CountReport";
-	        TestUtil.displayTestTile(this, TEST_NAME);
-
-			Task task = taskManager.createTaskInstance(COUNT_REPORT);
-			OperationResult result = task.getResult();
-
-			Collection<SelectorOptions<GetOperationOptions>> options = SelectorOptions
-					.createCollection(GetOperationOptions.createRaw());
-
-			//WHEN 	
-			TestUtil.displayWhen(TEST_NAME);
-			int count = modelService.countObjects(ReportType.class, null, options, task, result);
-			
-			//THEN
-			TestUtil.displayThen(TEST_NAME);
-	        result.computeStatus();
-	        display(result);
-	        TestUtil.assertSuccess(result);
-	        assertEquals("Unexpected number of reports", 3, count);
-		}
-
-
-		@Test
-		public void test008SearchReport() throws Exception {
-			final String TEST_NAME = "test008SearchReport";
-	        TestUtil.displayTestTile(this, TEST_NAME);
-
-			Task task = taskManager.createTaskInstance(SEARCH_REPORT);
-			OperationResult result = task.getResult();
-			
-			Collection<SelectorOptions<GetOperationOptions>> options = SelectorOptions
-					.createCollection(GetOperationOptions.createRaw());
-
-			//WHEN 	
-			TestUtil.displayWhen(TEST_NAME);
-			List<PrismObject<ReportType>> listReportType = modelService.searchObjects(ReportType.class, null, options, task, result);
-			
-			//THEN
-			TestUtil.displayThen(TEST_NAME);
-			result.computeStatus();
-			display(result);
-			TestUtil.assertSuccess(result);		
-			assertEquals("Unexpected number of searching reports", 3, listReportType.size());
-		}
-		
-
-	
-		@Test
-		public void test009ModifyReport() throws Exception {
-			final String TEST_NAME = "test009ModifyReport";
-	        TestUtil.displayTestTile(this, TEST_NAME);
-			
-			Task task = taskManager.createTaskInstance(MODIFY_REPORT);
-			OperationResult result = task.getResult();
-
-			ReportType reportType = null; //ReportUtils.getReport(REPORT_OID_001, result, modelService);
-
-			reportType.setExport(ExportType.CSV);
-
-			Collection<ObjectDelta<? extends ObjectType>> deltas = new ArrayList<ObjectDelta<? extends ObjectType>>();
-			PrismObject<ReportType> reportTypeOld = modelService.getObject(
-					ReportType.class, REPORT_OID_001, null, task, result);
-			deltas.add(reportTypeOld.diff(reportType.asPrismObject()));
-
-			//WHEN 	
-			TestUtil.displayWhen(TEST_NAME);
-			modelService.executeChanges(deltas, null, task, result);
-			
-			//THEN
-			TestUtil.displayThen(TEST_NAME);
-			result.computeStatus();
-			display(result);
-			TestUtil.assertSuccess(result);	
-			
-//			reportType = ReportUtils.getReport(REPORT_OID_001, result, modelService);
-			assertEquals("Unexpected export type", ExportType.CSV, reportType.getExport());
-		}
-		
-		
-	
-		@Test
-		public void test010DeleteReport() throws Exception {
-			
-			final String TEST_NAME = "test010DeleteReport";
-	        TestUtil.displayTestTile(this, TEST_NAME);
-
-			Task task = taskManager.createTaskInstance(DELETE_REPORT);
-			OperationResult result = task.getResult();
-
-			ObjectDelta<ReportType> delta = ObjectDelta.createDeleteDelta(ReportType.class, REPORT_OID_001, prismContext);
-			Collection<ObjectDelta<? extends ObjectType>> deltas = MiscSchemaUtil.createCollection(delta);
-			
-			// WHEN
-			modelService.executeChanges(deltas, null, task, result);
-			
-			// THEN
-	        result.computeStatus();
-	        TestUtil.assertSuccess(result);
-			
-//			try {
-//	        	ReportType report = null; //ReportUtils.getReport(REPORT_OID_001, result, modelService);
-//	        	AssertJUnit.fail("Report type was not deleted");
-//	        } catch (ObjectNotFoundException e) {
-//	        	// This is expected
-//	        }	
-			
-		}
-		
-	
-		@Test
-		public void test011CleanupReports() throws Exception {
-			
-			final String TEST_NAME = "test011CleanupReports";
-	        TestUtil.displayTestTile(this, TEST_NAME);
-			
-	        // GIVEN
-	        List<PrismObject<? extends Objectable>> elements = prismContext.parseObjects(REPORTS_FOR_CLEANUP_FILE);
-
-	        Task task = taskManager.createTaskInstance(CLEANUP_REPORTS);
-			OperationResult result = task.getResult();
-			
-	        for (int i = 0; i < elements.size(); i++) {
-	            PrismObject object = elements.get(i);
-
-	            ObjectDelta objectDelta = ObjectDelta.createAddDelta(object);
-	            Collection<ObjectDelta<? extends ObjectType>> deltas = MiscSchemaUtil.createCollection(objectDelta);
-	            
-           		modelService.executeChanges(deltas, null, task, result);
-           		
-           		result.computeStatus();
-                display(result);
-                TestUtil.assertSuccess(result);
-                String oid = objectDelta.getOid();
-                
-	            AssertJUnit.assertTrue(StringUtils.isNotEmpty(oid));
-	            if (objectDelta.getObjectTypeClass() != ReportType.class)
-	            {
-	            	ReportOutputType reportOutput = getReportOutput(oid).asObjectable();
-	            	reportOutput.setFilePath(reportOutput.getFilePath().replace("${midpointhome}", MIDPOINT_HOME));
-	            	
-	            	MetadataType metadata = new MetadataType();
-	            	Date date = new Date();
-	            
-	            	if (reportOutput.getName().getOrig().contains("01")){
-	            		Calendar calendar = create_2013_06_01_00_00_Calendar();
-	            		date.setTime(calendar.getTimeInMillis());
-	            	}
-	            
-	            	if (reportOutput.getName().getOrig().contains("02")){
-	            		Calendar calendar = create_2013_07_01_00_00_Calendar();
-	            		date.setTime(calendar.getTimeInMillis());
-	            	}
-	            
-	            	if (reportOutput.getName().getOrig().contains("03")){
-	            		Calendar calendar = create_2013_08_01_00_00_Calendar();
-	            		date.setTime(calendar.getTimeInMillis());
-	            	}
-	            
-	            	metadata.setCreateTimestamp(XmlTypeConverter.createXMLGregorianCalendar(date));
-	            	reportOutput.setMetadata(metadata);
-	            
-	            	deltas = new ArrayList<ObjectDelta<? extends ObjectType>>();
-	            	PrismObject<ReportOutputType> reportOutputOld = getReportOutput(oid);
-	            	deltas.add(reportOutputOld.diff(reportOutput.asPrismObject()));
-				
-	            	modelService.executeChanges(deltas, null, task, result);
-	            	
-	            	File file = new File(reportOutput.getFilePath());
-	            	boolean blnCreated = false;
-	                try
-	                {
-	                   blnCreated = file.createNewFile();
-	                }
-	                catch(IOException ex)
-	                {
-	                   LOGGER.error("Error while creating a new empty file : {}", ex);
-	                }
-	               
-	                LOGGER.trace("Was file " + file.getPath() + " created ? : " + blnCreated);
-	            	
-	            }
-	        }
-
-	        // WHEN
-	        // because now we can't move system time (we're not using DI for it) we create policy
-	        // which should always point to 2013-05-07T12:00:00.000+02:00
-	        final long NOW = System.currentTimeMillis();
-	        Calendar when = create_2014_01_01_12_00_Calendar();
-	        CleanupPolicyType policy = createPolicy(when, NOW);
-
-	        reportManager.cleanupReports(policy, result);
-
-	        // THEN
-	        List<PrismObject<ReportOutputType>> reportOutputs = modelService.searchObjects(ReportOutputType.class, null, null, task, result);
-	        AssertJUnit.assertNotNull(reportOutputs);
-	        AssertJUnit.assertEquals(1, reportOutputs.size());
-
-	    }
-		
-	
-//		@Test
-		public void test012AuditReportWithDeltas() throws Exception {
-			
-			final String TEST_NAME = "test012AuditReportWithDeltas";
-	        TestUtil.displayTestTile(this, TEST_NAME);
-			
-	      
-			AuditEventType auditEventType = null;//AuditEventType.ADD_OBJECT;
-			int auditEventTypeId = auditEventType != null ? auditEventType.ordinal() : -1;
-			String auditEventTypeName = auditEventType == null ? "AuditEventType.null" : auditEventType.toString();
-			final long NOW = System.currentTimeMillis();
-			Calendar calendar = create_2013_07_01_00_00_Calendar();
-			Timestamp dateFrom = new Timestamp(calendar.getTimeInMillis());
-			Timestamp dateTo = new Timestamp(NOW);
-			
-			Map<String, Object> params = new HashMap();
-		    params.put("DATE_FROM", dateFrom);
-		    params.put("DATE_TO", dateTo);
-		    params.put("EVENT_TYPE", auditEventTypeId);
-		    params.put("EVENT_TYPE_DESC", auditEventTypeName);
-		    //String theQuery = auditEventTypeId != -1 ? "select aer.timestamp as timestamp, aer.initiatorName as initiator, aer.eventType as eventType, aer.eventStage as eventStage, aer.targetName as targetName, aer.targetType as targetType, aer.targetOwnerName as targetOwnerName, aer.outcome as outcome, aer.message as message from RAuditEventRecord as aer where aer.eventType = $P{EVENT_TYPE} and aer.timestamp >= $P{DATE_FROM} and aer.timestamp <= $P{DATE_TO} order by aer.timestamp" : "select aer.timestamp as timestamp, aer.initiatorName as initiator, aer.eventType as eventType, aer.eventStage as eventStage, aer.targetName as targetName, aer.targetType as targetType, aer.targetOwnerName as targetOwnerName, aer.outcome as outcome, aer.message as message from RAuditEventRecord as aer where aer.timestamp >= $P{DATE_FROM} and aer.timestamp <= $P{DATE_TO} order by aer.timestamp";
-		    String theQuery = auditEventTypeId != -1 ? 
-		    		"select aer.timestamp as timestamp, " +
-		        	"aer.initiatorName as initiator, " +
-		        	"aer.eventType as eventType, " +
-		        	"aer.eventStage as eventStage, " +
-		        	"aer.targetName as targetName, " +
-		        	"aer.targetType as targetType, " +
-		        	"aer.targetOwnerName as targetOwnerName, " +
-		        	"aer.outcome as outcome, " +
-		        	"aer.message as message, " +
-		        	"odo.delta as delta " +
-		        	"from RObjectDeltaOperation as odo " +
-		        	"join odo.record as aer " +
-		        	"where aer.eventType = $P{EVENT_TYPE} and aer.timestamp >= $P{DATE_FROM} and aer.timestamp <= $P{DATE_TO} " +
-		        	"order by aer.timestamp" 
-		        	: 
-		        	"select aer.timestamp as timestamp, " +
-		        	"aer.initiatorName as initiator, " +
-		        	"aer.eventType as eventType, " +
-		        	"aer.eventStage as eventStage, " +
-		        	"aer.targetName as targetName, " +
-		        	"aer.targetType as targetType, " +
-		        	"aer.targetOwnerName as targetOwnerName, " +
-		        	"aer.outcome as outcome, " +
-		        	"aer.message as message, " +
-		        	"odo.delta as delta " +
-		        	"from RObjectDeltaOperation as odo " +
-		        	"join odo.record as aer " +
-		        	"where aer.timestamp >= $P{DATE_FROM} and aer.timestamp <= $P{DATE_TO} " +
-		        	"order by aer.timestamp";
-		    params.put("QUERY_STRING", theQuery); 		    
-		    params.put("LOGO_PATH", REPORTS_DIR.getPath() + "/logo.jpg");
-		    params.put("BaseTemplateStyles", STYLE_TEMPLATE_DEFAULT.getPath());
-
-	        byte[] generatedReport = new byte[]{};
-	        Session session = null;
-	        // Loading template
-	        JasperDesign design = JRXmlLoader.load(REPORT_AUDIT_TEST);
-	        JasperReport report = JasperCompileManager.compileReport(design);
-
-	        session = sessionFactory.openSession();
-	        session.beginTransaction();
-
-//	        params.put(JRHibernateQueryExecuterFactory.PARAMETER_HIBERNATE_SESSION, session);
-	        JasperPrint jasperPrint = JasperFillManager.fillReport(report, params);
-	        
-	        String output =  EXPORT_DIR + "AuditReport.pdf";
-	        JasperExportManager.exportReportToPdfFile(jasperPrint, output);
-	        
-	      
-	       session.getTransaction().commit();
-	       session.close();			
-		}
-
-	
-//		@Test 
-		public void test013CreateAuditLogsReportFromFile() throws Exception {
-			
-			final String TEST_NAME = "test013CreateAuditLogsReportFromFile";
-	        TestUtil.displayTestTile(this, TEST_NAME);
-		
-	        // GIVEN
-	        Task task = createTask(CREATE_AUDITLOGS_REPORT_FROM_FILE);
-			OperationResult result = task.getResult();
-			
-			//WHEN 	
-			TestUtil.displayWhen(TEST_NAME);
-			importObjectFromFile(AUDITLOGS_REPORT_FILE);
-
-			// THEN
-			result.computeStatus();
-			display("Result after good import", result);
-			TestUtil.assertSuccess("Import has failed (result)", result);
-			
-			ReportType reportType =null; // ReportUtils.getReport(AUDITLOGS_REPORT_OID, result, modelService);
-			
-			//WHEN 	
-			TestUtil.displayWhen(TEST_NAME);
-			reportManager.runReport(reportType.asPrismObject(), new PrismContainer(null), task, result);
-			
-			// THEN
-	        TestUtil.displayThen(TEST_NAME);
-	        
-	        waitForTaskFinish(task.getOid(), false, 150000);
-	        
-	     // Task result
-	        PrismObject<TaskType> reportTaskAfter = getTask(task.getOid());
-	        OperationResultType reportTaskResult = reportTaskAfter.asObjectable().getResult();
-	        display("Report task result", reportTaskResult);
-	        TestUtil.assertSuccess(reportTaskResult);
-		}
-/*
-		@Test 
-		public void test014CreateAuditLogsReportWithDatasource() throws Exception {
-			final String TEST_NAME = "test014CreateAuditLogsReportWithDatasource";
-	        TestUtil.displayTestTile(this, TEST_NAME);
-		
-	        // GIVEN
-			Task task = createTask(CREATE_AUDITLOGS_REPORT_WITH_DATASOURCE);
-			OperationResult result = task.getResult();
-			
-			//WHEN 	
-			TestUtil.displayWhen(TEST_NAME);
-			importObjectFromFile(AUDITLOGS_WITH_DATASOURCE_REPORT_FILE);
-
-			// THEN
-			result.computeStatus();
-			display("Result after good import", result);
-			TestUtil.assertSuccess("Import has failed (result)", result);
-			
-			ReportType reportType = getReport(AUDITLOGS_DATASOURCE_REPORT_OID).asObjectable();
-			
-			
-			
-			//WHEN 	
-			TestUtil.displayWhen(TEST_NAME);
-			reportManager.runReport(reportType.asPrismObject(), task, result);
-			
-			// THEN
-	        TestUtil.displayThen(TEST_NAME);
-	        
-	        waitForTaskFinish(task.getOid(), false);
-	        
-	     // Task result
-	        PrismObject<TaskType> reportTaskAfter = getTask(task.getOid());
-	        OperationResultType reportTaskResult = reportTaskAfter.asObjectable().getResult();
-	        display("Report task result", reportTaskResult);
-	        TestUtil.assertSuccess(reportTaskResult);
-			
-			
-		}*/
-
-		@Test 
-		public void test015CreateUserListReportFromFile() throws Exception {
-			
-			final String TEST_NAME = "test015CreateUserListReportFromFile";
-	        TestUtil.displayTestTile(this, TEST_NAME);
-	
-	        // GIVEN
-	        Task task = createTask(CREATE_USERLIST_REPORT_FROM_FILE);
-			OperationResult result = task.getResult();
-			
-			//WHEN IMPORT ROLES 	
-			TestUtil.displayWhen(TEST_NAME + " - import subreport roles");			
-			importObjectFromFile(USERROLES_REPORT_FILE);
-			
-			// THEN
-			result.computeStatus();
-			display("Result after good import", result);
-			TestUtil.assertSuccess("Import has failed (result)", result);
-			
-			//WHEN INMPORT ORGS
-			TestUtil.displayWhen(TEST_NAME + " - import subreport orgs");			
-			importObjectFromFile(USERORGS_REPORT_FILE);
-
-			// THEN
-			result.computeStatus();
-			display("Result after good import", result);
-			TestUtil.assertSuccess("Import has failed (result)", result);
-
-			//WHEN IMPORT ACCOUNTS
-			TestUtil.displayWhen(TEST_NAME + " - import subreport accounts");			
-			importObjectFromFile(USERACCOUNTS_REPORT_FILE);
-
-			// THEN
-			result.computeStatus();
-			display("Result after good import", result);
-			TestUtil.assertSuccess("Import has failed (result)", result);
-	    	
-			//WHEN IMPORT USER LIST
-			TestUtil.displayWhen(TEST_NAME + " - import report user list");			
-			importObjectFromFile(USERLIST_REPORT_FILE);
-
-			// THEN
-			result.computeStatus();
-			display("Result after good import", result);
-			TestUtil.assertSuccess("Import has failed (result)", result);
-			
-
-			ReportType reportType =null; // ReportUtils.getReport(USERLIST_REPORT_OID, result, modelService);
-			
-			//WHEN 	
-			TestUtil.displayWhen(TEST_NAME);
-			reportManager.runReport(reportType.asPrismObject(), new PrismContainer(null), task, result);
-			
-			// THEN
-	        TestUtil.displayThen(TEST_NAME);
-	        
-	        waitForTaskFinish(task.getOid(), false, 75000);
-	        
-	     // Task result
-	        PrismObject<TaskType> reportTaskAfter = getTask(task.getOid());
-	        OperationResultType reportTaskResult = reportTaskAfter.asObjectable().getResult();
-	        display("Report task result", reportTaskResult);
-	        TestUtil.assertSuccess(reportTaskResult);
-	
-		}		
-	
-//		@Test 
-		public void test015ACreateCustomDSReportFromFile() throws Exception {
-			
-			final String TEST_NAME = "test015CreateUserListReportFromFile";
-	        TestUtil.displayTestTile(this, TEST_NAME);
-	
-	        // GIVEN
-	        Task task = createTask(CREATE_USERLIST_REPORT_FROM_FILE);
-			OperationResult result = task.getResult();
-			
-			//WHEN IMPORT ROLES 	
-			TestUtil.displayWhen(TEST_NAME + " - import subreport roles");			
-			importObjectFromFile(CUSTOM_REPORT_FILE);
-			
-			// THEN
-			result.computeStatus();
-			display("Result after good import", result);
-			TestUtil.assertSuccess("Import has failed (result)", result);
-//			
-//			//WHEN INMPORT ORGS
-//			TestUtil.displayWhen(TEST_NAME + " - import subreport orgs");			
-//			importObjectFromFile(USERORGS_REPORT_FILE);
-//
-//			// THEN
-//			result.computeStatus();
-//			display("Result after good import", result);
-//			TestUtil.assertSuccess("Import has failed (result)", result);
-//
-//			//WHEN IMPORT ACCOUNTS
-//			TestUtil.displayWhen(TEST_NAME + " - import subreport accounts");			
-//			importObjectFromFile(USERACCOUNTS_REPORT_FILE);
-//
-//			// THEN
-//			result.computeStatus();
-//			display("Result after good import", result);
-//			TestUtil.assertSuccess("Import has failed (result)", result);
-//	    	
-//			//WHEN IMPORT USER LIST
-//			TestUtil.displayWhen(TEST_NAME + " - import report user list");			
-//			importObjectFromFile(USERLIST_REPORT_FILE);
-//
-//			// THEN
-//			result.computeStatus();
-//			display("Result after good import", result);
-//			TestUtil.assertSuccess("Import has failed (result)", result);
-			
-
-			ReportType reportType = null; //ReportUtils.getReport(USERLIST_REPORT_OID, result, modelService);
-			
-			//WHEN 	
-			TestUtil.displayWhen(TEST_NAME);
-			reportManager.runReport(reportType.asPrismObject(), new PrismContainer(null), task, result);
-			
-			// THEN
-	        TestUtil.displayThen(TEST_NAME);
-	        
-	        waitForTaskFinish(task.getOid(), false, 75000);
-	        
-	     // Task result
-	        PrismObject<TaskType> reportTaskAfter = getTask(task.getOid());
-	        OperationResultType reportTaskResult = reportTaskAfter.asObjectable().getResult();
-	        display("Report task result", reportTaskResult);
-	        TestUtil.assertSuccess(reportTaskResult);
-	
-		}				
-
-	
-		@Test 
-		public void test016CreateReconciliationReportFromFile() throws Exception {
-			
-			final String TEST_NAME = "test016CreateReconciliationReportFromFile";
-	        TestUtil.displayTestTile(this, TEST_NAME);
-		
-	        // GIVEN
-	        Task task = createTask(CREATE_RECONCILIATION_REPORT_FROM_FILE);
-			OperationResult result = task.getResult();
-			
-			//WHEN 	
-			TestUtil.displayWhen(TEST_NAME);			
-			importObjectFromFile(RECONCILIATION_REPORT_FILE);
-
-			// THEN
-			result.computeStatus();
-			display("Result after good import", result);
-			TestUtil.assertSuccess("Import has failed (result)", result);
-			
-			ReportType reportType =null; // ReportUtils.getReport(RECONCILIATION_REPORT_OID, result, modelService);
-			
-			//WHEN 	
-			TestUtil.displayWhen(TEST_NAME);
-			reportManager.runReport(reportType.asPrismObject(), new PrismContainer(null), task, result);
-			
-			// THEN
-	        TestUtil.displayThen(TEST_NAME);
-	        
-	        waitForTaskFinish(task.getOid(), false, 75000);
-	        
-	     // Task result
-	        PrismObject<TaskType> reportTaskAfter = getTask(task.getOid());
-	        OperationResultType reportTaskResult = reportTaskAfter.asObjectable().getResult();
-	        display("Report task result", reportTaskResult);
-	        TestUtil.assertSuccess(reportTaskResult);
-		}
-		
-	
-		@Test 
-		public void test017GetReportData() throws Exception {
-			
-			final String TEST_NAME = "test017GetReportData";
-	        TestUtil.displayTestTile(this, TEST_NAME);
-		
-	        // GIVEN
-	        Task task = createTask(GET_REPORT_DATA);
-			OperationResult result = task.getResult();
-			
-			//WHEN 	
-			TestUtil.displayWhen(TEST_NAME);
-			
-			ReportType reportType = null; //ReportUtils.getReport(USERLIST_REPORT_OID, result, modelService);			
-			ReportOutputType reportOutputType = searchReportOutput(reportType.getOid()).get(0).asObjectable();
-			AssertJUnit.assertNotNull(reportOutputType);
-
-			InputStream reportData = reportManager.getReportOutputData(reportOutputType.getOid(), result);
-			
-			// THEN
-			result.computeStatus();
-			display("Result after read report data", result);
-			TestUtil.assertSuccess("Read report data has failed (result)", result);
-			
-		}	
-	
-
-}
diff --git a/model/workflow-impl/pom.xml b/model/workflow-impl/pom.xml
index d3d9b4cf422..a9e9897ef97 100644
--- a/model/workflow-impl/pom.xml
+++ b/model/workflow-impl/pom.xml
@@ -52,11 +52,6 @@
             <artifactId>model-impl</artifactId>
             <version>3.4-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>com.evolveum.midpoint.model</groupId>
-            <artifactId>notifications-api</artifactId>
-            <version>3.4-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>com.evolveum.midpoint.repo</groupId>
             <artifactId>repo-api</artifactId>
@@ -174,6 +169,12 @@
         </dependency>
          
         <!-- Test -->
+        <dependency>
+            <groupId>com.evolveum.midpoint.model</groupId>
+            <artifactId>notifications-api</artifactId>
+            <version>3.4-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.evolveum.midpoint.infra</groupId>
             <artifactId>test-util</artifactId>
diff --git a/provisioning/provisioning-impl/pom.xml b/provisioning/provisioning-impl/pom.xml
index 7cca55ec714..cac0eecf8a1 100644
--- a/provisioning/provisioning-impl/pom.xml
+++ b/provisioning/provisioning-impl/pom.xml
@@ -98,10 +98,6 @@
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>javax.xml.bind</groupId>
-			<artifactId>jaxb-api</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.aspectj</groupId>
 			<artifactId>aspectjweaver</artifactId>
@@ -123,6 +119,11 @@
 		</dependency>
 
 		<!-- Testing dependecies -->
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.infra</groupId>
 			<artifactId>test-util</artifactId>
diff --git a/repo/repo-sql-impl-test/pom.xml b/repo/repo-sql-impl-test/pom.xml
index 912e8884d86..8f39bb1e519 100644
--- a/repo/repo-sql-impl-test/pom.xml
+++ b/repo/repo-sql-impl-test/pom.xml
@@ -48,11 +48,6 @@
             <artifactId>schema</artifactId>
             <version>3.4-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>com.evolveum.midpoint.infra</groupId>
-            <artifactId>common</artifactId>
-            <version>3.4-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>com.evolveum.midpoint.repo</groupId>
             <artifactId>repo-api</artifactId>
@@ -73,28 +68,15 @@
             <artifactId>repo-sql-impl</artifactId>
             <version>3.4-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>com.evolveum.midpoint.repo</groupId>
-            <artifactId>system-init</artifactId>
-            <version>3.4-SNAPSHOT</version>
-        </dependency>
         
         <dependency>
 			<groupId>commons-lang</groupId>
 			<artifactId>commons-lang</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-		</dependency>
         <dependency>
 			<groupId>commons-configuration</groupId>
 			<artifactId>commons-configuration</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>javax.xml.bind</groupId>
-			<artifactId>jaxb-api</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.aspectj</groupId>
 			<artifactId>aspectjweaver</artifactId>
@@ -141,6 +123,24 @@
             <artifactId>mysql-connector-java</artifactId>
             <scope>runtime</scope>
         </dependency>
+
+        <dependency>
+            <groupId>com.evolveum.midpoint.infra</groupId>
+            <artifactId>common</artifactId>
+            <version>3.4-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.evolveum.midpoint.repo</groupId>
+            <artifactId>system-init</artifactId>
+            <version>3.4-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<scope>test</scope>
+		</dependency>
         <dependency>
             <groupId>org.javabits.jgrapht</groupId>
             <artifactId>jgrapht-core</artifactId>
@@ -153,6 +153,11 @@
             <version>1.2.0</version>
             <scope>test</scope>
         </dependency>
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+			<scope>test</scope>
+		</dependency>
 
         <dependency>
             <groupId>com.evolveum.midpoint.infra</groupId>
diff --git a/repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/TestSqlAuditServiceFactory.java b/repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/TestSqlAuditServiceFactory.java
index 7c40c40095c..1ea12b3a2f8 100644
--- a/repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/TestSqlAuditServiceFactory.java
+++ b/repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/TestSqlAuditServiceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2013 Evolveum
+ * Copyright (c) 2010-2016 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package com.evolveum.midpoint.repo.sql.testing;
 
+import com.evolveum.midpoint.audit.api.AuditService;
 import com.evolveum.midpoint.repo.sql.SqlAuditServiceFactory;
 
 /**
@@ -24,4 +25,9 @@
  * @author lazyman
  */
 public class TestSqlAuditServiceFactory extends SqlAuditServiceFactory {
+	
+	// fake method. just for the dependency analyze plugin to properly detect dependency
+	private void fake() {
+		Class foo = AuditService.class;
+	}
 }
diff --git a/repo/security-impl/pom.xml b/repo/security-impl/pom.xml
index 0910c8091de..ef373117310 100644
--- a/repo/security-impl/pom.xml
+++ b/repo/security-impl/pom.xml
@@ -47,11 +47,6 @@
 			<artifactId>schema</artifactId>
 			<version>3.4-SNAPSHOT</version>
 		</dependency>
-		<dependency>
-			<groupId>com.evolveum.midpoint.infra</groupId>
-			<artifactId>common</artifactId>
-			<version>3.4-SNAPSHOT</version>
-		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.repo</groupId>
 			<artifactId>security-api</artifactId>
@@ -62,11 +57,6 @@
 			<artifactId>repo-api</artifactId>
 			<version>3.4-SNAPSHOT</version>
 		</dependency>
-		<dependency>
-			<groupId>com.evolveum.midpoint.repo</groupId>
-			<artifactId>task-api</artifactId>
-			<version>3.4-SNAPSHOT</version>
-		</dependency>
 		
 		<dependency>
 			<groupId>commons-lang</groupId>
@@ -94,6 +84,18 @@
         </dependency>
 		
 		<!--  Testing dependecies  -->
+		<dependency>
+			<groupId>com.evolveum.midpoint.infra</groupId>
+			<artifactId>common</artifactId>
+			<version>3.4-SNAPSHOT</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.evolveum.midpoint.repo</groupId>
+			<artifactId>task-api</artifactId>
+			<version>3.4-SNAPSHOT</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.testng</groupId>
 			<artifactId>testng</artifactId>
diff --git a/repo/task-quartz-impl/pom.xml b/repo/task-quartz-impl/pom.xml
index d6f92521234..b06e79fff29 100644
--- a/repo/task-quartz-impl/pom.xml
+++ b/repo/task-quartz-impl/pom.xml
@@ -78,6 +78,7 @@
 		<dependency>
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
             <groupId>org.springframework</groupId>
@@ -90,6 +91,7 @@
         <dependency>
 			<groupId>javax.xml.bind</groupId>
 			<artifactId>jaxb-api</artifactId>
+			<scope>test</scope>
 		</dependency>
         <dependency>
 			<groupId>org.aspectj</groupId>
diff --git a/samples/samples-test/pom.xml b/samples/samples-test/pom.xml
index 4cf9d37024d..bb32aa39247 100644
--- a/samples/samples-test/pom.xml
+++ b/samples/samples-test/pom.xml
@@ -57,62 +57,66 @@
 		</plugins>
 	</build>
 	<dependencies>
+				
+		<dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
+        
+
+		<!-- TEST dependency -->
 		<dependency>
 			<groupId>com.evolveum.midpoint.infra</groupId>
 			<artifactId>util</artifactId>
 			<version>3.4-SNAPSHOT</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.infra</groupId>
 			<artifactId>prism</artifactId>
 			<version>3.4-SNAPSHOT</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.infra</groupId>
 			<artifactId>schema</artifactId>
 			<version>3.4-SNAPSHOT</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.infra</groupId>
 			<artifactId>common</artifactId>
 			<version>3.4-SNAPSHOT</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.repo</groupId>
 			<artifactId>repo-api</artifactId>
 			<version>3.4-SNAPSHOT</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.repo</groupId>
 			<artifactId>task-api</artifactId>
 			<version>3.4-SNAPSHOT</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.model</groupId>
 			<artifactId>model-api</artifactId>
 			<version>3.4-SNAPSHOT</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.model</groupId>
 			<artifactId>model-test</artifactId>
 			<version>3.4-SNAPSHOT</version>
+			<scope>test</scope>
 		</dependency>
-		
-		
-		<dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-        </dependency>
-        <dependency>
-			<groupId>javax.xml.bind</groupId>
-			<artifactId>jaxb-api</artifactId>
-		</dependency>
-
-		<!-- TEST dependency -->
 		<dependency>
 			<groupId>org.testng</groupId>
 			<artifactId>testng</artifactId>
@@ -124,6 +128,11 @@
 			<version>3.4-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
+        <dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>com.evolveum.polygon</groupId>
 			<artifactId>connector-ldap</artifactId>
diff --git a/testing/consistency-mechanism/pom.xml b/testing/consistency-mechanism/pom.xml
index ec0e461e831..e617597475d 100644
--- a/testing/consistency-mechanism/pom.xml
+++ b/testing/consistency-mechanism/pom.xml
@@ -56,96 +56,97 @@
 		</plugins>
 	</build>
 	<dependencies>
+		
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+		</dependency>
+
+		<!-- TEST dependency -->
 		<dependency>
 			<groupId>com.evolveum.midpoint.infra</groupId>
 			<artifactId>util</artifactId>
 			<version>3.4-SNAPSHOT</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.infra</groupId>
 			<artifactId>prism</artifactId>
 			<version>3.4-SNAPSHOT</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.infra</groupId>
 			<artifactId>schema</artifactId>
 			<version>3.4-SNAPSHOT</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.infra</groupId>
 			<artifactId>common</artifactId>
 			<version>3.4-SNAPSHOT</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.repo</groupId>
 			<artifactId>repo-api</artifactId>
 			<version>3.4-SNAPSHOT</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.repo</groupId>
 			<artifactId>task-api</artifactId>
 			<version>3.4-SNAPSHOT</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.model</groupId>
 			<artifactId>model-api</artifactId>
 			<version>3.4-SNAPSHOT</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.model</groupId>
 			<artifactId>model-impl</artifactId>
 			<version>3.4-SNAPSHOT</version>
-			<scope>runtime</scope>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.provisioning</groupId>
 			<artifactId>provisioning-api</artifactId>
 			<version>3.4-SNAPSHOT</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.provisioning</groupId>
 			<artifactId>provisioning-impl</artifactId>
 			<version>3.4-SNAPSHOT</version>
-			<scope>runtime</scope>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.repo</groupId>
 			<artifactId>task-quartz-impl</artifactId>
 			<version>3.4-SNAPSHOT</version>
-			<scope>runtime</scope>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.repo</groupId>
 			<artifactId>audit-impl</artifactId>
 			<version>3.4-SNAPSHOT</version>
-			<scope>runtime</scope>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.repo</groupId>
 			<artifactId>security-impl</artifactId>
 			<version>3.4-SNAPSHOT</version>
-			<scope>runtime</scope>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.repo</groupId>
 			<artifactId>repo-test-util</artifactId>
 			<version>3.4-SNAPSHOT</version>
-		</dependency>
-		
-		<dependency>
-			<groupId>commons-lang</groupId>
-			<artifactId>commons-lang</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.forgerock.opendj</groupId>
-			<artifactId>opendj</artifactId>
+			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>javax.xml.bind</groupId>
-			<artifactId>jaxb-api</artifactId>
-		</dependency>
-
-		<!-- TEST dependency -->
 		<dependency>
 			<groupId>org.testng</groupId>
 			<artifactId>testng</artifactId>
@@ -223,5 +224,15 @@
             <artifactId>servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
+		<dependency>
+			<groupId>org.forgerock.opendj</groupId>
+			<artifactId>opendj</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 </project>
diff --git a/testing/sanity/pom.xml b/testing/sanity/pom.xml
index ff2883e0602..06de3b8371b 100644
--- a/testing/sanity/pom.xml
+++ b/testing/sanity/pom.xml
@@ -61,99 +61,109 @@
 			<groupId>com.evolveum.midpoint.infra</groupId>
 			<artifactId>util</artifactId>
 			<version>3.4-SNAPSHOT</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.infra</groupId>
 			<artifactId>prism</artifactId>
 			<version>3.4-SNAPSHOT</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.infra</groupId>
 			<artifactId>schema</artifactId>
 			<version>3.4-SNAPSHOT</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.infra</groupId>
 			<artifactId>common</artifactId>
 			<version>3.4-SNAPSHOT</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.repo</groupId>
 			<artifactId>repo-api</artifactId>
 			<version>3.4-SNAPSHOT</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.repo</groupId>
 			<artifactId>task-api</artifactId>
 			<version>3.4-SNAPSHOT</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.model</groupId>
 			<artifactId>model-api</artifactId>
 			<version>3.4-SNAPSHOT</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.model</groupId>
 			<artifactId>model-impl</artifactId>
 			<version>3.4-SNAPSHOT</version>
-			<scope>runtime</scope>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.model</groupId>
 			<artifactId>model-test</artifactId>
 			<version>3.4-SNAPSHOT</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.provisioning</groupId>
 			<artifactId>provisioning-api</artifactId>
 			<version>3.4-SNAPSHOT</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.provisioning</groupId>
 			<artifactId>provisioning-impl</artifactId>
 			<version>3.4-SNAPSHOT</version>
-			<scope>runtime</scope>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.repo</groupId>
 			<artifactId>task-quartz-impl</artifactId>
 			<version>3.4-SNAPSHOT</version>
-			<scope>runtime</scope>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.repo</groupId>
 			<artifactId>audit-impl</artifactId>
 			<version>3.4-SNAPSHOT</version>
-			<scope>runtime</scope>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.repo</groupId>
 			<artifactId>security-impl</artifactId>
 			<version>3.4-SNAPSHOT</version>
-			<scope>runtime</scope>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.repo</groupId>
 			<artifactId>repo-test-util</artifactId>
 			<version>3.4-SNAPSHOT</version>
+			<scope>test</scope>
 		</dependency>
         <dependency>
         	<groupId>com.evolveum.midpoint.model</groupId>
         	<artifactId>report-impl</artifactId>
 			<version>3.4-SNAPSHOT</version>
-			<scope>runtime</scope>
+			<scope>test</scope>
         </dependency>
         <dependency>
         	<groupId>com.evolveum.midpoint.model</groupId>
         	<artifactId>notifications-impl</artifactId>
 			<version>3.4-SNAPSHOT</version>
-			<scope>runtime</scope>
+			<scope>test</scope>
         </dependency>
         <dependency>
         	<groupId>com.evolveum.midpoint.model</groupId>
         	<artifactId>workflow-impl</artifactId>
 			<version>3.4-SNAPSHOT</version>
-			<scope>runtime</scope>
+			<scope>test</scope>
         </dependency>
         
         <dependency>
@@ -163,10 +173,12 @@
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.forgerock.opendj</groupId>
 			<artifactId>opendj</artifactId>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -179,6 +191,7 @@
 		<dependency>
 			<groupId>javax.xml.bind</groupId>
 			<artifactId>jaxb-api</artifactId>
+			<scope>test</scope>
 		</dependency>
 
 		<!-- TEST dependency -->
diff --git a/testing/story/pom.xml b/testing/story/pom.xml
index fc608ab8345..ad28ad7c92f 100644
--- a/testing/story/pom.xml
+++ b/testing/story/pom.xml
@@ -62,6 +62,16 @@
 			<artifactId>util</artifactId>
 			<version>3.4-SNAPSHOT</version>
 		</dependency>
+		<dependency>
+			<groupId>com.evolveum.midpoint.infra</groupId>
+			<artifactId>prism</artifactId>
+			<version>3.4-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>com.evolveum.midpoint.infra</groupId>
+			<artifactId>schema</artifactId>
+			<version>3.4-SNAPSHOT</version>
+		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.infra</groupId>
 			<artifactId>common</artifactId>
@@ -72,6 +82,11 @@
 			<artifactId>repo-api</artifactId>
 			<version>3.4-SNAPSHOT</version>
 		</dependency>
+		<dependency>
+			<groupId>com.evolveum.midpoint.model</groupId>
+			<artifactId>model-api</artifactId>
+			<version>3.4-SNAPSHOT</version>
+		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.model</groupId>
 			<artifactId>model-impl</artifactId>
@@ -82,31 +97,59 @@
 			<artifactId>model-test</artifactId>
 			<version>3.4-SNAPSHOT</version>
 		</dependency>
+		<dependency>
+			<groupId>com.evolveum.midpoint.provisioning</groupId>
+			<artifactId>provisioning-api</artifactId>
+			<version>3.4-SNAPSHOT</version>
+		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.provisioning</groupId>
 			<artifactId>provisioning-impl</artifactId>
 			<version>3.4-SNAPSHOT</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.evolveum.midpoint.repo</groupId>
+			<artifactId>task-api</artifactId>
+			<version>3.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.repo</groupId>
 			<artifactId>task-quartz-impl</artifactId>
 			<version>3.4-SNAPSHOT</version>
+			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.repo</groupId>
 			<artifactId>audit-impl</artifactId>
 			<version>3.4-SNAPSHOT</version>
+			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.repo</groupId>
 			<artifactId>security-impl</artifactId>
 			<version>3.4-SNAPSHOT</version>
+			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.repo</groupId>
 			<artifactId>repo-test-util</artifactId>
 			<version>3.4-SNAPSHOT</version>
 		</dependency>
+		<dependency>
+			<groupId>com.evolveum.icf</groupId>
+			<artifactId>dummy-resource</artifactId>
+			<version>3.4-SNAPSHOT</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.forgerock.opendj</groupId>
+			<artifactId>opendj</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-beans</artifactId>
+		</dependency>
 
 		<!-- TEST dependency -->
 		<dependency>