Merge branch 'master' of git://git.evolveum.com/midpoint

Evolveum · Mar 8, 2014 · 81b0891 · 81b0891
2 parents 68b684f + 80d7053
commit 81b0891
Show file tree

Hide file tree

Showing 52 changed files with 1,940 additions and 478 deletions.
diff --git a/config/sql/midpoint/2.2/h2/h2-upgrade-2.2-to-2.3.sql b/config/sql/midpoint/2.2/h2/h2-upgrade-2.2-to-2.3.sql
@@ -25,6 +25,7 @@ ALTER TABLE m_object ADD tenantRef_type INTEGER;
 ALTER TABLE m_object ADD name_norm VARCHAR(255);
 ALTER TABLE m_object ADD name_orig VARCHAR(255);
 ALTER TABLE m_org ADD tenant BOOLEAN;
+ALTER TABLE m_system_configuration ADD objectTemplate CLOB;
 
 CREATE TABLE m_report (
     configuration CLOB,
@@ -88,4 +89,37 @@ ALTER TABLE m_user ADD jpegPhoto BLOB;
 
 CREATE INDEX iObjectNameOrig ON m_object (name_orig);
 
-CREATE INDEX iObjectNameNorm ON m_object (name_norm);
+CREATE INDEX iObjectNameNorm ON m_object (name_norm);
+
+
+
+ UPDATE m_object o SET (o.name_norm, o.name_orig) = (SELECT x.name_norm, x.name_orig FROM m_connector x WHERE x.oid = o.oid) 
+ WHERE EXISTS (SELECT x.name_norm, x.name_orig FROM m_connector x WHERE x.oid = o.oid);
+ UPDATE m_object o SET (o.name_norm, o.name_orig) = (SELECT x.name_norm, x.name_orig FROM m_connector_host x WHERE x.oid = o.oid) 
+ WHERE EXISTS (SELECT x.name_norm, x.name_orig FROM m_connector_host x WHERE x.oid = o.oid);
+ UPDATE m_object o SET (o.name_norm, o.name_orig) = (SELECT x.name_norm, x.name_orig FROM m_generic_object x WHERE x.oid = o.oid) 
+ WHERE EXISTS (SELECT x.name_norm, x.name_orig FROM m_generic_object x WHERE x.oid = o.oid);
+ UPDATE m_object o SET (o.name_norm, o.name_orig) = (SELECT x.name_norm, x.name_orig FROM m_node x WHERE x.oid = o.oid) 
+ WHERE EXISTS (SELECT x.name_norm, x.name_orig FROM m_node x WHERE x.oid = o.oid);
+ UPDATE m_object o SET (o.name_norm, o.name_orig) = (SELECT x.name_norm, x.name_orig FROM m_object_template x WHERE x.oid = o.oid) 
+ WHERE EXISTS (SELECT x.name_norm, x.name_orig FROM m_object_template x WHERE x.oid = o.oid);
+ UPDATE m_object o SET (o.name_norm, o.name_orig) = (SELECT x.name_norm, x.name_orig FROM m_org x WHERE x.oid = o.oid) 
+ WHERE EXISTS (SELECT x.name_norm, x.name_orig FROM m_org x WHERE x.oid = o.oid);
+ UPDATE m_object o SET (o.name_norm, o.name_orig) = (SELECT x.name_norm, x.name_orig FROM m_report x WHERE x.oid = o.oid) 
+ WHERE EXISTS (SELECT x.name_norm, x.name_orig FROM m_report x WHERE x.oid = o.oid);
+ UPDATE m_object o SET (o.name_norm, o.name_orig) = (SELECT x.name_norm, x.name_orig FROM m_report_output x WHERE x.oid = o.oid) 
+ WHERE EXISTS (SELECT x.name_norm, x.name_orig FROM m_report_output x WHERE x.oid = o.oid);
+ UPDATE m_object o SET (o.name_norm, o.name_orig) = (SELECT x.name_norm, x.name_orig FROM m_resource x WHERE x.oid = o.oid) 
+ WHERE EXISTS (SELECT x.name_norm, x.name_orig FROM m_resource x WHERE x.oid = o.oid);
+ UPDATE m_object o SET (o.name_norm, o.name_orig) = (SELECT x.name_norm, x.name_orig FROM m_role x WHERE x.oid = o.oid) 
+ WHERE EXISTS (SELECT x.name_norm, x.name_orig FROM m_role x WHERE x.oid = o.oid);
+ UPDATE m_object o SET (o.name_norm, o.name_orig) = (SELECT x.name_norm, x.name_orig FROM m_shadow x WHERE x.oid = o.oid) 
+ WHERE EXISTS (SELECT x.name_norm, x.name_orig FROM m_shadow x WHERE x.oid = o.oid);
+ UPDATE m_object o SET (o.name_norm, o.name_orig) = (SELECT x.name_norm, x.name_orig FROM m_system_configuration x WHERE x.oid = o.oid) 
+ WHERE EXISTS (SELECT x.name_norm, x.name_orig FROM m_system_configuration x WHERE x.oid = o.oid);
+ UPDATE m_object o SET (o.name_norm, o.name_orig) = (SELECT x.name_norm, x.name_orig FROM m_task x WHERE x.oid = o.oid) 
+ WHERE EXISTS (SELECT x.name_norm, x.name_orig FROM m_task x WHERE x.oid = o.oid);
+ UPDATE m_object o SET (o.name_norm, o.name_orig) = (SELECT x.name_norm, x.name_orig FROM m_user x WHERE x.oid = o.oid) 
+ WHERE EXISTS (SELECT x.name_norm, x.name_orig FROM m_user x WHERE x.oid = o.oid);
+ UPDATE m_object o SET (o.name_norm, o.name_orig) = (SELECT x.name_norm, x.name_orig FROM m_value_policy x WHERE x.oid = o.oid) 
+ WHERE EXISTS (SELECT x.name_norm, x.name_orig FROM m_value_policy x WHERE x.oid = o.oid);
diff --git a/config/sql/midpoint/2.2/mysql/mysql-upgrade-2.2-to-2.3.sql b/config/sql/midpoint/2.2/mysql/mysql-upgrade-2.2-to-2.3.sql
@@ -25,6 +25,7 @@ ALTER TABLE m_object ADD tenantRef_type INTEGER;
 ALTER TABLE m_object ADD name_norm VARCHAR(255);
 ALTER TABLE m_object ADD name_orig VARCHAR(255);
 ALTER TABLE m_org ADD tenant BIT;
+ALTER TABLE m_system_configuration ADD objectTemplate LONGTEXT;
 
 CREATE TABLE m_report (
 	configuration LONGTEXT,
@@ -93,4 +94,21 @@ ALTER TABLE m_user ADD jpegPhoto LONGBLOB;
 
 CREATE INDEX iObjectNameOrig ON m_object (name_orig);
 
-CREATE INDEX iObjectNameNorm ON m_object (name_norm);
+CREATE INDEX iObjectNameNorm ON m_object (name_norm);
+
+
+ UPDATE m_object as o, m_connector as x SET o.name_norm = x.name_norm, o.name_orig = x.name_orig  WHERE x.oid = o.oid;
+ UPDATE m_object as o, m_connector_host as x SET o.name_norm = x.name_norm, o.name_orig = x.name_orig  WHERE x.oid = o.oid;
+ UPDATE m_object as o, m_generic_object as x SET o.name_norm = x.name_norm, o.name_orig = x.name_orig  WHERE x.oid = o.oid;
+ UPDATE m_object as o, m_node as x SET o.name_norm = x.name_norm, o.name_orig = x.name_orig  WHERE x.oid = o.oid;
+ UPDATE m_object as o, m_object_template as x SET o.name_norm = x.name_norm, o.name_orig = x.name_orig  WHERE x.oid = o.oid;
+ UPDATE m_object as o, m_org as x SET o.name_norm = x.name_norm, o.name_orig = x.name_orig  WHERE x.oid = o.oid;
+ UPDATE m_object as o, m_report as x SET o.name_norm = x.name_norm, o.name_orig = x.name_orig  WHERE x.oid = o.oid;
+ UPDATE m_object as o, m_report_output as x SET o.name_norm = x.name_norm, o.name_orig = x.name_orig  WHERE x.oid = o.oid;
+ UPDATE m_object as o, m_resource as x SET o.name_norm = x.name_norm, o.name_orig = x.name_orig  WHERE x.oid = o.oid;
+ UPDATE m_object as o, m_role as x SET o.name_norm = x.name_norm, o.name_orig = x.name_orig  WHERE x.oid = o.oid;
+ UPDATE m_object as o, m_shadow as x SET o.name_norm = x.name_norm, o.name_orig = x.name_orig  WHERE x.oid = o.oid;
+ UPDATE m_object as o, m_system_configuration as x SET o.name_norm = x.name_norm, o.name_orig = x.name_orig  WHERE x.oid = o.oid;
+ UPDATE m_object as o, m_task as x SET o.name_norm = x.name_norm, o.name_orig = x.name_orig  WHERE x.oid = o.oid;
+ UPDATE m_object as o, m_user as x SET o.name_norm = x.name_norm, o.name_orig = x.name_orig  WHERE x.oid = o.oid;
+ UPDATE m_object as o, m_value_policy as x SET o.name_norm = x.name_norm, o.name_orig = x.name_orig  WHERE x.oid = o.oid;
diff --git a/config/sql/midpoint/2.2/oracle/oracle-upgrade-2.2-to-2.3.sql b/config/sql/midpoint/2.2/oracle/oracle-upgrade-2.2-to-2.3.sql
@@ -25,6 +25,7 @@ ALTER TABLE m_object ADD tenantRef_type NUMBER(10,0);
 ALTER TABLE m_object ADD name_norm VARCHAR(255 CHAR);
 ALTER TABLE m_object ADD name_orig VARCHAR(255 CHAR);
 ALTER TABLE m_org ADD tenant NUMBER(1, 0);
+ALTER TABLE m_system_configuration ADD objectTemplate CLOB;
 
 
 CREATE TABLE m_report (
@@ -87,4 +88,37 @@ ALTER TABLE m_assignment ADD orderValue NUMBER(10,0);
 ALTER TABLE m_user ADD jpegPhoto BLOB;
 CREATE INDEX iObjectNameOrig ON m_object (name_orig) INITRANS 30;
 
-CREATE INDEX iObjectNameNorm ON m_object (name_norm) INITRANS 30;
+CREATE INDEX iObjectNameNorm ON m_object (name_norm) INITRANS 30;
+
+
+--UPDATE NAMES IN m_object
+ UPDATE m_object o SET (o.name_norm, o.name_orig) = (SELECT x.name_norm, x.name_orig FROM m_connector x WHERE x.oid = o.oid) 
+ WHERE EXISTS (SELECT x.name_norm, x.name_orig FROM m_connector x WHERE x.oid = o.oid);
+ UPDATE m_object o SET (o.name_norm, o.name_orig) = (SELECT x.name_norm, x.name_orig FROM m_connector_host x WHERE x.oid = o.oid) 
+ WHERE EXISTS (SELECT x.name_norm, x.name_orig FROM m_connector_host x WHERE x.oid = o.oid);
+ UPDATE m_object o SET (o.name_norm, o.name_orig) = (SELECT x.name_norm, x.name_orig FROM m_generic_object x WHERE x.oid = o.oid) 
+ WHERE EXISTS (SELECT x.name_norm, x.name_orig FROM m_generic_object x WHERE x.oid = o.oid);
+ UPDATE m_object o SET (o.name_norm, o.name_orig) = (SELECT x.name_norm, x.name_orig FROM m_node x WHERE x.oid = o.oid) 
+ WHERE EXISTS (SELECT x.name_norm, x.name_orig FROM m_node x WHERE x.oid = o.oid);
+ UPDATE m_object o SET (o.name_norm, o.name_orig) = (SELECT x.name_norm, x.name_orig FROM m_object_template x WHERE x.oid = o.oid) 
+ WHERE EXISTS (SELECT x.name_norm, x.name_orig FROM m_object_template x WHERE x.oid = o.oid);
+ UPDATE m_object o SET (o.name_norm, o.name_orig) = (SELECT x.name_norm, x.name_orig FROM m_org x WHERE x.oid = o.oid) 
+ WHERE EXISTS (SELECT x.name_norm, x.name_orig FROM m_org x WHERE x.oid = o.oid);
+ UPDATE m_object o SET (o.name_norm, o.name_orig) = (SELECT x.name_norm, x.name_orig FROM m_report x WHERE x.oid = o.oid) 
+ WHERE EXISTS (SELECT x.name_norm, x.name_orig FROM m_report x WHERE x.oid = o.oid);
+ UPDATE m_object o SET (o.name_norm, o.name_orig) = (SELECT x.name_norm, x.name_orig FROM m_report_output x WHERE x.oid = o.oid) 
+ WHERE EXISTS (SELECT x.name_norm, x.name_orig FROM m_report_output x WHERE x.oid = o.oid);
+ UPDATE m_object o SET (o.name_norm, o.name_orig) = (SELECT x.name_norm, x.name_orig FROM m_resource x WHERE x.oid = o.oid) 
+ WHERE EXISTS (SELECT x.name_norm, x.name_orig FROM m_resource x WHERE x.oid = o.oid);
+ UPDATE m_object o SET (o.name_norm, o.name_orig) = (SELECT x.name_norm, x.name_orig FROM m_role x WHERE x.oid = o.oid) 
+ WHERE EXISTS (SELECT x.name_norm, x.name_orig FROM m_role x WHERE x.oid = o.oid);
+ UPDATE m_object o SET (o.name_norm, o.name_orig) = (SELECT x.name_norm, x.name_orig FROM m_shadow x WHERE x.oid = o.oid) 
+ WHERE EXISTS (SELECT x.name_norm, x.name_orig FROM m_shadow x WHERE x.oid = o.oid);
+ UPDATE m_object o SET (o.name_norm, o.name_orig) = (SELECT x.name_norm, x.name_orig FROM m_system_configuration x WHERE x.oid = o.oid) 
+ WHERE EXISTS (SELECT x.name_norm, x.name_orig FROM m_system_configuration x WHERE x.oid = o.oid);
+ UPDATE m_object o SET (o.name_norm, o.name_orig) = (SELECT x.name_norm, x.name_orig FROM m_task x WHERE x.oid = o.oid) 
+ WHERE EXISTS (SELECT x.name_norm, x.name_orig FROM m_task x WHERE x.oid = o.oid);
+ UPDATE m_object o SET (o.name_norm, o.name_orig) = (SELECT x.name_norm, x.name_orig FROM m_user x WHERE x.oid = o.oid) 
+ WHERE EXISTS (SELECT x.name_norm, x.name_orig FROM m_user x WHERE x.oid = o.oid);
+ UPDATE m_object o SET (o.name_norm, o.name_orig) = (SELECT x.name_norm, x.name_orig FROM m_value_policy x WHERE x.oid = o.oid) 
+ WHERE EXISTS (SELECT x.name_norm, x.name_orig FROM m_value_policy x WHERE x.oid = o.oid);
diff --git a/config/sql/midpoint/2.2/postgresql/postgresql-upgrade-2.2-to-2.3.sql b/config/sql/midpoint/2.2/postgresql/postgresql-upgrade-2.2-to-2.3.sql
@@ -25,6 +25,7 @@ ALTER TABLE m_object ADD tenantRef_type INT4;
 ALTER TABLE m_object ADD name_norm VARCHAR(255);
 ALTER TABLE m_object ADD name_orig VARCHAR(255);
 ALTER TABLE m_org ADD tenant BOOLEAN;
+ALTER TABLE m_system_configuration ADD objectTemplate TEXT;
 
 CREATE TABLE m_report (
     configuration TEXT,
@@ -87,4 +88,22 @@ ALTER TABLE m_user ADD jpegPhoto OID;
 
 CREATE INDEX iObjectNameOrig ON m_object (name_orig);
 
-CREATE INDEX iObjectNameNorm ON m_object (name_norm);
+CREATE INDEX iObjectNameNorm ON m_object (name_norm);
+
+
+
+ UPDATE m_object SET name_norm = x.name_norm, name_orig = x.name_orig FROM m_connector as x WHERE x.oid = m_object.oid;
+ UPDATE m_object SET name_norm = x.name_norm, name_orig = x.name_orig FROM m_connector_host as x WHERE x.oid = m_object.oid;
+ UPDATE m_object SET name_norm = x.name_norm, name_orig = x.name_orig FROM m_generic_object as x WHERE x.oid = m_object.oid;
+ UPDATE m_object SET name_norm = x.name_norm, name_orig = x.name_orig FROM m_node as x WHERE x.oid = m_object.oid;
+ UPDATE m_object SET name_norm = x.name_norm, name_orig = x.name_orig FROM m_object_template as x WHERE x.oid = m_object.oid;
+ UPDATE m_object SET name_norm = x.name_norm, name_orig = x.name_orig FROM m_org as x WHERE x.oid = m_object.oid;
+ UPDATE m_object SET name_norm = x.name_norm, name_orig = x.name_orig FROM m_report as x WHERE x.oid = m_object.oid;
+ UPDATE m_object SET name_norm = x.name_norm, name_orig = x.name_orig FROM m_report_output as x WHERE x.oid = m_object.oid;
+ UPDATE m_object SET name_norm = x.name_norm, name_orig = x.name_orig FROM m_resource as x WHERE x.oid = m_object.oid;
+ UPDATE m_object SET name_norm = x.name_norm, name_orig = x.name_orig FROM m_role as x WHERE x.oid = m_object.oid;
+ UPDATE m_object SET name_norm = x.name_norm, name_orig = x.name_orig FROM m_shadow as x WHERE x.oid = m_object.oid;
+ UPDATE m_object SET name_norm = x.name_norm, name_orig = x.name_orig FROM m_system_configuration as x WHERE x.oid = m_object.oid;
+ UPDATE m_object SET name_norm = x.name_norm, name_orig = x.name_orig FROM m_task as x WHERE x.oid = m_object.oid;
+ UPDATE m_object SET name_norm = x.name_norm, name_orig = x.name_orig FROM m_user as x WHERE x.oid = m_object.oid;
+ UPDATE m_object SET name_norm = x.name_norm, name_orig = x.name_orig FROM m_value_policy as x WHERE x.oid = m_object.oid;
diff --git a/config/sql/midpoint/2.2/sqlserver/sqlserver-upgrade-2.2-to-2.3.sql b/config/sql/midpoint/2.2/sqlserver/sqlserver-upgrade-2.2-to-2.3.sql
@@ -25,6 +25,7 @@ ALTER TABLE m_object ADD tenantRef_type INT;
 ALTER TABLE m_object ADD name_norm NVARCHAR(255);
 ALTER TABLE m_object ADD name_orig NVARCHAR(255);
 ALTER TABLE m_org ADD tenant BIT;
+ALTER TABLE m_system_configuration ADD objectTemplate NVARCHAR(MAX);
 
 
 CREATE TABLE m_report (
@@ -88,4 +89,21 @@ ALTER TABLE m_user ADD jpegPhoto VARBINARY(MAX);
 
 CREATE INDEX iObjectNameOrig ON m_object (name_orig);
 
-CREATE INDEX iObjectNameNorm ON m_object (name_norm);
+CREATE INDEX iObjectNameNorm ON m_object (name_norm);
+
+
+ UPDATE m_object SET name_norm = x.name_norm, name_orig = x.name_orig FROM m_connector as x WHERE x.oid = m_object.oid;
+ UPDATE m_object SET name_norm = x.name_norm, name_orig = x.name_orig FROM m_connector_host as x WHERE x.oid = m_object.oid;
+ UPDATE m_object SET name_norm = x.name_norm, name_orig = x.name_orig FROM m_generic_object as x WHERE x.oid = m_object.oid;
+ UPDATE m_object SET name_norm = x.name_norm, name_orig = x.name_orig FROM m_node as x WHERE x.oid = m_object.oid;
+ UPDATE m_object SET name_norm = x.name_norm, name_orig = x.name_orig FROM m_object_template as x WHERE x.oid = m_object.oid;
+ UPDATE m_object SET name_norm = x.name_norm, name_orig = x.name_orig FROM m_org as x WHERE x.oid = m_object.oid;
+ UPDATE m_object SET name_norm = x.name_norm, name_orig = x.name_orig FROM m_report as x WHERE x.oid = m_object.oid;
+ UPDATE m_object SET name_norm = x.name_norm, name_orig = x.name_orig FROM m_report_output as x WHERE x.oid = m_object.oid;
+ UPDATE m_object SET name_norm = x.name_norm, name_orig = x.name_orig FROM m_resource as x WHERE x.oid = m_object.oid;
+ UPDATE m_object SET name_norm = x.name_norm, name_orig = x.name_orig FROM m_role as x WHERE x.oid = m_object.oid;
+ UPDATE m_object SET name_norm = x.name_norm, name_orig = x.name_orig FROM m_shadow as x WHERE x.oid = m_object.oid;
+ UPDATE m_object SET name_norm = x.name_norm, name_orig = x.name_orig FROM m_system_configuration as x WHERE x.oid = m_object.oid;
+ UPDATE m_object SET name_norm = x.name_norm, name_orig = x.name_orig FROM m_task as x WHERE x.oid = m_object.oid;
+ UPDATE m_object SET name_norm = x.name_norm, name_orig = x.name_orig FROM m_user as x WHERE x.oid = m_object.oid;
+ UPDATE m_object SET name_norm = x.name_norm, name_orig = x.name_orig FROM m_value_policy as x WHERE x.oid = m_object.oid;
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdmin.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdmin.java
@@ -140,7 +140,8 @@ private MenuBarItem createResourcesItems() {
         resources.addMenuItem(new MenuItem(createStringResource("PageAdmin.menu.top.resources.list"), PageResources.class));
         //todo delete this [lazyman]
         resources.addMenuItem(new MenuItem(createStringResource("PageAdmin.menu.top.resources.new"), PageResourceEdit.class));
-        resources.addMenuItem(new MenuItem(createStringResource("PageAdmin.menu.top.resources.wizard"), PageResourceWizard.class));
+//        resources.addMenuItem(new MenuItem(createStringResource("PageAdmin.menu.top.resources.wizard"), PageResourceWizard.class));
+
 
 //        items.add(new BottomMenuItem(createStringResource("pageAdminResources.detailsResource"), PageResource.class,
 //                new PageVisibleDisabledBehaviour(this, PageResource.class)));

diff --git a/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/SystemInfoPanel.html b/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/SystemInfoPanel.html
@@ -19,12 +19,14 @@
 <wicket:panel>
     <table class="table table-widget table-system-info">
         <tr style="text-align: center;">
-            <td>
-                <div wicket:id="activeUsers" />
-            </td>
-            <td>
-                <div wicket:id="activeTasks" />
-            </td>
+            <wicket:remove>
+            <!--<td>-->
+                <!--<div wicket:id="activeUsers" />-->
+            <!--</td>-->
+            <!--<td>-->
+                <!--<div wicket:id="activeTasks" />-->
+            <!--</td>-->
+            </wicket:remove>
             <td>
                 <div wicket:id="serverLoad" />
             </td>

diff --git a/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/SystemInfoPanel.java b/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/SystemInfoPanel.java
@@ -16,7 +16,6 @@
 
 package com.evolveum.midpoint.web.page.admin.home.component;
 
-import com.evolveum.midpoint.web.component.util.LoadableModel;
 import com.evolveum.midpoint.web.component.util.SimplePanel;
 import com.evolveum.midpoint.web.page.admin.home.dto.SimplePieChartDto;
 import com.evolveum.midpoint.web.page.admin.home.dto.SystemInfoDto;
@@ -29,8 +28,8 @@
  * */
 public class SystemInfoPanel extends SimplePanel<SystemInfoDto>{
 
-    private static final String ID_ACTIVE_USERS = "activeUsers";
-    private static final String ID_ACTIVE_TASKS = "activeTasks";
+//    private static final String ID_ACTIVE_USERS = "activeUsers";
+//    private static final String ID_ACTIVE_TASKS = "activeTasks";
     private static final String ID_SERVER_LOAD = "serverLoad";
     private static final String ID_RAM_USAGE = "usedRam";
 
@@ -40,11 +39,11 @@ public SystemInfoPanel(String id, IModel<SystemInfoDto> model){
 
     @Override
     protected void initLayout(){
+//        SimplePieChart userPanel = new SimplePieChart(ID_ACTIVE_USERS, new PropertyModel<SimplePieChartDto>(getModel(), "activeUsersDto"));
+//        add(userPanel);
+//        SimplePieChart tasksPanel = new SimplePieChart(ID_ACTIVE_TASKS, new PropertyModel<SimplePieChartDto>(getModel(), "activeTasksDto"));
+//        add(tasksPanel);
 
-        SimplePieChart userPanel = new SimplePieChart(ID_ACTIVE_USERS, new PropertyModel<SimplePieChartDto>(getModel(), "activeUsersDto"));
-        add(userPanel);
-        SimplePieChart tasksPanel = new SimplePieChart(ID_ACTIVE_TASKS, new PropertyModel<SimplePieChartDto>(getModel(), "activeTasksDto"));
-        add(tasksPanel);
         SimplePieChart serverLoadPanel = new SimplePieChart(ID_SERVER_LOAD, new PropertyModel<SimplePieChartDto>(getModel(), "serverLoadDto"));
         add(serverLoadPanel);
         SimplePieChart ramPanel = new SimplePieChart(ID_RAM_USAGE, new PropertyModel<SimplePieChartDto>(getModel(), "usedRamDto"));

diff --git a/...-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard.java b/...-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard.java
@@ -18,33 +18,29 @@
 
 import com.evolveum.midpoint.common.security.AuthorizationConstants;
 import com.evolveum.midpoint.prism.PrismObject;
-import com.evolveum.midpoint.prism.dom.PrismDomProcessor;
 import com.evolveum.midpoint.util.logging.LoggingUtils;
 import com.evolveum.midpoint.web.application.PageDescriptor;
-import com.evolveum.midpoint.web.component.AjaxButton;
 import com.evolveum.midpoint.web.component.util.LoadableModel;
 import com.evolveum.midpoint.web.component.wizard.Wizard;
 import com.evolveum.midpoint.web.component.wizard.resource.*;
-import com.evolveum.midpoint.web.component.AceEditor;
 import com.evolveum.midpoint.web.page.error.PageError;
 import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
 import com.evolveum.midpoint.web.util.WebMiscUtil;
 import com.evolveum.midpoint.web.util.WebModelUtils;
 import com.evolveum.midpoint.xml.ns._public.common.common_2a.ResourceType;
 import org.apache.wicket.RestartResponseException;
-import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.extensions.wizard.WizardModel;
-import org.apache.wicket.model.AbstractReadOnlyModel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.model.StringResourceModel;
 
 /**
  * @author lazyman
  */
-@PageDescriptor(url = "/admin/resource/wizard", encoder = OnePageParameterEncoder.class, action = {
-        PageAdminResources.AUTHORIZATION_RESOURCE_ALL,
-        AuthorizationConstants.NS_AUTHORIZATION + "#resourceWizard"})
+//@PageDescriptor(url = "/admin/resources/wizard", encoder = OnePageParameterEncoder.class, action = {
+//        PageAdminResources.AUTHORIZATION_RESOURCE_ALL,
+//        AuthorizationConstants.NS_AUTHORIZATION + "#resourceWizard"})
+@PageDescriptor(url = "/admin/resources/wizard", action = AuthorizationConstants.AUTZ_DENY_ALL)
 public class PageResourceWizard extends PageAdminResources {
 
     private static final String ID_WIZARD = "wizard";