You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by fm...@apache.org on 2013/03/13 19:47:43 UTC

svn commit: r1456085 [1/3] - in /syncope/trunk: client/src/main/java/org/apache/syncope/client/services/proxy/ common/src/main/java/org/apache/syncope/common/services/ common/src/main/java/org/apache/syncope/common/to/ console/src/main/java/org/apache/...

Author: fmartelli
Date: Wed Mar 13 18:47:42 2013
New Revision: 1456085

URL: http://svn.apache.org/r1456085
Log:
SYNCOPE-198: provided table implementation and bulk actions for tasks

Modified:
    syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/TaskServiceProxy.java
    syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/UserServiceProxy.java
    syncope/trunk/common/src/main/java/org/apache/syncope/common/services/TaskService.java
    syncope/trunk/common/src/main/java/org/apache/syncope/common/to/BulkAction.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BulkActionModalPage.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Tasks.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationTasks.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PropagationTasks.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SchedTasks.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasks.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/TaskRestClient.java
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/   (props changed)
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage.html
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/NotificationTasks.html
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/PropagationTasks.html
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/SchedTasks.html
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/SyncTasks.html
    syncope/trunk/console/src/main/webapp/css/style.css
    syncope/trunk/console/src/main/webapp/scripts/jquery-ui.js
    syncope/trunk/console/src/test/java/org/apache/syncope/console/TaskTestITCase.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/TaskController.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/services/TaskServiceImpl.java

Modified: syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/TaskServiceProxy.java
URL: http://svn.apache.org/viewvc/syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/TaskServiceProxy.java?rev=1456085&r1=1456084&r2=1456085&view=diff
==============================================================================
--- syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/TaskServiceProxy.java (original)
+++ syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/TaskServiceProxy.java Wed Mar 13 18:47:42 2013
@@ -28,6 +28,8 @@ import javax.ws.rs.core.Response;
 import javax.xml.ws.WebServiceException;
 import org.apache.syncope.common.SyncopeConstants;
 import org.apache.syncope.common.services.TaskService;
+import org.apache.syncope.common.to.BulkAction;
+import org.apache.syncope.common.to.BulkActionRes;
 import org.apache.syncope.common.to.JobClassTO;
 import org.apache.syncope.common.to.NotificationTaskTO;
 import org.apache.syncope.common.to.PropagationTaskTO;
@@ -216,4 +218,9 @@ public class TaskServiceProxy extends Sp
                 throw new IllegalArgumentException("SchemaType is not supported: " + type);
         }
     }
+
+    @Override
+    public BulkActionRes bulkAction(final BulkAction bulkAction) {
+        return getRestTemplate().postForObject(baseUrl + "task/bulk", bulkAction, BulkActionRes.class);
+    }
 }

Modified: syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/UserServiceProxy.java
URL: http://svn.apache.org/viewvc/syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/UserServiceProxy.java?rev=1456085&r1=1456084&r2=1456085&view=diff
==============================================================================
--- syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/UserServiceProxy.java (original)
+++ syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/UserServiceProxy.java Wed Mar 13 18:47:42 2013
@@ -181,7 +181,7 @@ public class UserServiceProxy extends Sp
     }
 
     @Override
-    public BulkActionRes bulkAction(final BulkAction bulkActions) {
-        return getRestTemplate().postForObject(baseUrl + "user/bulk", bulkActions, BulkActionRes.class);
+    public BulkActionRes bulkAction(final BulkAction bulkAction) {
+        return getRestTemplate().postForObject(baseUrl + "user/bulk", bulkAction, BulkActionRes.class);
     }
 }

Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/services/TaskService.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/services/TaskService.java?rev=1456085&r1=1456084&r2=1456085&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/services/TaskService.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/services/TaskService.java Wed Mar 13 18:47:42 2013
@@ -30,6 +30,8 @@ import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Response;
+import org.apache.syncope.common.to.BulkAction;
+import org.apache.syncope.common.to.BulkActionRes;
 
 import org.apache.syncope.common.to.JobClassTO;
 import org.apache.syncope.common.to.ReportExecTO;
@@ -146,4 +148,8 @@ public interface TaskService {
     @PUT
     @Path("{taskId}")
     void update(@PathParam("taskId") Long taskId, TaskTO taskTO);
+    
+    @POST
+    @Path("bulk")
+    BulkActionRes bulkAction(BulkAction bulkAction);
 }

Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/to/BulkAction.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/BulkAction.java?rev=1456085&r1=1456084&r2=1456085&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/BulkAction.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/BulkAction.java Wed Mar 13 18:47:42 2013
@@ -32,7 +32,9 @@ public class BulkAction extends Abstract
 
         DELETE,
         REACTIVATE,
-        SUSPEND
+        SUSPEND,
+        DRYRUN,
+        EXECUTE
 
     }
 

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BulkActionModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BulkActionModalPage.java?rev=1456085&r1=1456084&r2=1456085&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BulkActionModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BulkActionModalPage.java Wed Mar 13 18:47:42 2013
@@ -107,6 +107,12 @@ public class BulkActionModalPage<T, S> e
                 case REACTIVATE:
                     bulkAction.setOperation(BulkAction.Type.REACTIVATE);
                     break;
+                case EXECUTE:
+                    bulkAction.setOperation(BulkAction.Type.EXECUTE);
+                    break;
+                case DRYRUN:
+                    bulkAction.setOperation(BulkAction.Type.DRYRUN);
+                    break;
                 default:
                     LOG.error("Bulk action type not supported");
             }
@@ -148,9 +154,7 @@ public class BulkActionModalPage<T, S> e
 
     private Object getTargetId(final Object target, final String idFieldName)
             throws IllegalAccessException, IllegalArgumentException, InvocationTargetException {
-        final PropertyDescriptor propDesc =
-                BeanUtils.getPropertyDescriptor(target.getClass(), idFieldName);
-        final Object id = propDesc.getReadMethod().invoke(target, new Object[0]);
-        return id;
+        final PropertyDescriptor propDesc = BeanUtils.getPropertyDescriptor(target.getClass(), idFieldName);
+        return propDesc.getReadMethod().invoke(target, new Object[0]);
     }
 }

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Tasks.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Tasks.java?rev=1456085&r1=1456084&r2=1456085&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Tasks.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Tasks.java Wed Mar 13 18:47:42 2013
@@ -19,6 +19,7 @@
 package org.apache.syncope.console.pages;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Iterator;
@@ -27,15 +28,19 @@ import org.apache.syncope.common.to.Sche
 import org.apache.syncope.common.to.TaskExecTO;
 import org.apache.syncope.common.to.TaskTO;
 import org.apache.syncope.console.commons.SortableDataProviderComparator;
+import org.apache.syncope.console.pages.panels.AjaxDataTablePanel;
 import org.apache.syncope.console.pages.panels.NotificationTasks;
 import org.apache.syncope.console.pages.panels.PropagationTasks;
 import org.apache.syncope.console.pages.panels.SchedTasks;
 import org.apache.syncope.console.pages.panels.SyncTasks;
+import org.apache.syncope.console.rest.BaseRestClient;
 import org.apache.syncope.console.rest.TaskRestClient;
+import org.apache.syncope.console.wicket.markup.html.form.ActionLink;
+import org.apache.wicket.PageReference;
 import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
-import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackDefaultDataTable;
 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.ISortableDataProvider;
 import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.model.AbstractReadOnlyModel;
@@ -54,6 +59,8 @@ public class Tasks extends BasePage {
         add(new NotificationTasks("notification", getPageReference()));
         add(new SchedTasks("sched", getPageReference()));
         add(new SyncTasks("sync", getPageReference()));
+
+        getPageReference();
     }
 
     @Override
@@ -189,14 +196,25 @@ public class Tasks extends BasePage {
      * @param currentPage current page index.
      * @return data table.
      */
-    public static AjaxFallbackDefaultDataTable<TaskTO, String> updateTaskTable(
+    public static AjaxDataTablePanel<TaskTO, String> updateTaskTable(
             final List<IColumn<TaskTO, String>> columns,
             final TasksProvider dataProvider,
             final WebMarkupContainer container,
-            final int currentPage) {
-
-        final AjaxFallbackDefaultDataTable<TaskTO, String> table = new AjaxFallbackDefaultDataTable<TaskTO, String>(
-                "datatable", columns, dataProvider, dataProvider.paginatorRows);
+            final int currentPage,
+            final PageReference pageRef,
+            final BaseRestClient restClient) {
+
+        final AjaxDataTablePanel<TaskTO, String> table = new AjaxDataTablePanel<TaskTO, String>(
+                "datatable",
+                columns,
+                (ISortableDataProvider<TaskTO, String>) dataProvider,
+                dataProvider.paginatorRows,
+                Arrays.asList(new ActionLink.ActionType[]{
+                    ActionLink.ActionType.DELETE, ActionLink.ActionType.DRYRUN, ActionLink.ActionType.EXECUTE}),
+                restClient,
+                "id",
+                "Tasks",
+                pageRef);
 
         table.setCurrentPage(currentPage);
         table.setOutputMarkupId(true);

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationTasks.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationTasks.java?rev=1456085&r1=1456084&r2=1456085&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationTasks.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationTasks.java Wed Mar 13 18:47:42 2013
@@ -40,8 +40,8 @@ import org.apache.wicket.ajax.AjaxReques
 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.event.IEvent;
 import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
-import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackDefaultDataTable;
 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.IColumn;
@@ -54,7 +54,7 @@ import org.apache.wicket.markup.html.pan
 import org.apache.wicket.markup.repeater.Item;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.model.ResourceModel;
+import org.apache.wicket.model.StringResourceModel;
 import org.apache.wicket.request.http.WebResponse;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 
@@ -85,7 +85,7 @@ public class NotificationTasks extends P
 
     private final List<IColumn<TaskTO, String>> columns;
 
-    private AjaxFallbackDefaultDataTable<TaskTO, String> table;
+    private AjaxDataTablePanel<TaskTO, String> table;
 
     public NotificationTasks(final String id, final PageReference pageRef) {
         super(id);
@@ -100,15 +100,20 @@ public class NotificationTasks extends P
 
         columns = new ArrayList<IColumn<TaskTO, String>>();
 
-        columns.add(new PropertyColumn<TaskTO, String>(new ResourceModel("id"), "id", "id"));
-        columns.add(new PropertyColumn<TaskTO, String>(new ResourceModel("sender"), "sender", "sender"));
-        columns.add(new PropertyColumn<TaskTO, String>(new ResourceModel("recipients"), "recipients", "recipients"));
-        columns.add(new PropertyColumn<TaskTO, String>(new ResourceModel("subject"), "subject", "subject"));
-        columns.add(new PropertyColumn<TaskTO, String>(new ResourceModel("traceLevel"), "traceLevel", "traceLevel"));
         columns.add(new PropertyColumn<TaskTO, String>(
-                new ResourceModel("latestExecStatus"), "latestExecStatus", "latestExecStatus"));
+                new StringResourceModel("id", this, null), "id", "id"));
+        columns.add(new PropertyColumn<TaskTO, String>(
+                new StringResourceModel("sender", this, null), "sender", "sender"));
+        columns.add(new PropertyColumn<TaskTO, String>(
+                new StringResourceModel("recipients", this, null), "recipients", "recipients"));
+        columns.add(new PropertyColumn<TaskTO, String>(
+                new StringResourceModel("subject", this, null), "subject", "subject"));
+        columns.add(new PropertyColumn<TaskTO, String>(
+                new StringResourceModel("traceLevel", this, null), "traceLevel", "traceLevel"));
+        columns.add(new PropertyColumn<TaskTO, String>(
+                new StringResourceModel("latestExecStatus", this, null), "latestExecStatus", "latestExecStatus"));
 
-        columns.add(new AbstractColumn<TaskTO, String>(new ResourceModel("actions", "")) {
+        columns.add(new AbstractColumn<TaskTO, String>(new StringResourceModel("actions", this, null, "")) {
 
             private static final long serialVersionUID = 2054811145491901166L;
 
@@ -189,7 +194,9 @@ public class NotificationTasks extends P
                 columns,
                 new TasksProvider<NotificationTaskTO>(restClient, paginatorRows, getId(), NotificationTaskTO.class),
                 container,
-                0);
+                0,
+                pageRef,
+                restClient);
 
         container.add(table);
 
@@ -262,7 +269,9 @@ public class NotificationTasks extends P
                         new TasksProvider<NotificationTaskTO>(restClient, paginatorRows, getId(),
                         NotificationTaskTO.class),
                         container,
-                        table == null ? 0 : (int) table.getCurrentPage());
+                        table == null ? 0 : (int) table.getCurrentPage(),
+                        pageRef,
+                        restClient);
 
                 target.add(container);
             }
@@ -271,4 +280,11 @@ public class NotificationTasks extends P
         paginatorForm.add(rowsChooser);
         add(paginatorForm);
     }
+    
+    @Override
+    public void onEvent(final IEvent<?> event) {
+        if (event.getPayload() instanceof AbstractSearchResultPanel.EventDataWrapper) {
+            ((AbstractSearchResultPanel.EventDataWrapper) event.getPayload()).getTarget().add(container);
+        }
+    }
 }

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PropagationTasks.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PropagationTasks.java?rev=1456085&r1=1456084&r2=1456085&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PropagationTasks.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PropagationTasks.java Wed Mar 13 18:47:42 2013
@@ -29,6 +29,7 @@ import org.apache.syncope.console.common
 import org.apache.syncope.console.pages.PropagationTaskModalPage;
 import org.apache.syncope.console.pages.Tasks;
 import org.apache.syncope.console.pages.Tasks.TasksProvider;
+import org.apache.syncope.console.pages.panels.AbstractSearchResultPanel.EventDataWrapper;
 import org.apache.syncope.console.rest.TaskRestClient;
 import org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxLink;
 import org.apache.syncope.console.wicket.extensions.markup.html.repeater.data.table.DatePropertyColumn;
@@ -41,8 +42,8 @@ import org.apache.wicket.ajax.AjaxReques
 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.event.IEvent;
 import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
-import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackDefaultDataTable;
 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.IColumn;
@@ -55,7 +56,7 @@ import org.apache.wicket.markup.html.pan
 import org.apache.wicket.markup.repeater.Item;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.model.ResourceModel;
+import org.apache.wicket.model.StringResourceModel;
 import org.apache.wicket.request.http.WebResponse;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 
@@ -89,7 +90,7 @@ public class PropagationTasks extends Pa
 
     private final List<IColumn<TaskTO, String>> columns;
 
-    private AjaxFallbackDefaultDataTable<TaskTO, String> table;
+    private AjaxDataTablePanel<TaskTO, String> table;
 
     public PropagationTasks(final String id, final PageReference pageRef) {
         super(id);
@@ -104,26 +105,31 @@ public class PropagationTasks extends Pa
 
         columns = new ArrayList<IColumn<TaskTO, String>>();
 
-        columns.add(new PropertyColumn<TaskTO, String>(new ResourceModel("id"), "id", "id"));
-
-        columns.add(new PropertyColumn<TaskTO, String>(new ResourceModel("resource"), "resource", "resource"));
+        columns.add(new PropertyColumn<TaskTO, String>(
+                new StringResourceModel("id", this, null), "id", "id"));
 
-        columns.add(new PropertyColumn<TaskTO, String>(new ResourceModel("accountId"), "accountId", "accountId"));
+        columns.add(new PropertyColumn<TaskTO, String>(
+                new StringResourceModel("resource", this, null), "resource", "resource"));
 
         columns.add(new PropertyColumn<TaskTO, String>(
-                new ResourceModel("propagationMode"), "propagationMode", "propagationMode"));
+                new StringResourceModel("accountId", this, null), "accountId", "accountId"));
 
         columns.add(new PropertyColumn<TaskTO, String>(
-                new ResourceModel("propagationOperation"), "propagationOperation", "propagationOperation"));
+                new StringResourceModel("propagationMode", this, null), "propagationMode", "propagationMode"));
 
-        columns.add(new DatePropertyColumn<TaskTO>(new ResourceModel("startDate"), "startDate", "startDate"));
+        columns.add(new PropertyColumn<TaskTO, String>(new StringResourceModel(
+                "propagationOperation", this, null), "propagationOperation", "propagationOperation"));
 
-        columns.add(new DatePropertyColumn<TaskTO>(new ResourceModel("endDate"), "endDate", "endDate"));
+        columns.add(new DatePropertyColumn<TaskTO>(
+                new StringResourceModel("startDate", this, null), "startDate", "startDate"));
+
+        columns.add(new DatePropertyColumn<TaskTO>(
+                new StringResourceModel("endDate", this, null), "endDate", "endDate"));
 
         columns.add(new PropertyColumn<TaskTO, String>(
-                new ResourceModel("latestExecStatus"), "latestExecStatus", "latestExecStatus"));
+                new StringResourceModel("latestExecStatus", this, null), "latestExecStatus", "latestExecStatus"));
 
-        columns.add(new AbstractColumn<TaskTO, String>(new ResourceModel("actions", "")) {
+        columns.add(new AbstractColumn<TaskTO, String>(new StringResourceModel("actions", this, null, "")) {
 
             private static final long serialVersionUID = 2054811145491901166L;
 
@@ -204,7 +210,9 @@ public class PropagationTasks extends Pa
                 columns,
                 new TasksProvider<PropagationTaskTO>(restClient, paginatorRows, getId(), PropagationTaskTO.class),
                 container,
-                0);
+                0,
+                pageRef,
+                restClient);
 
         window.setWindowClosedCallback(new ModalWindow.WindowClosedCallback() {
 
@@ -276,7 +284,9 @@ public class PropagationTasks extends Pa
                         new TasksProvider<PropagationTaskTO>(restClient, paginatorRows,
                         getId(), PropagationTaskTO.class),
                         container,
-                        table == null ? 0 : (int) table.getCurrentPage());
+                        table == null ? 0 : (int) table.getCurrentPage(),
+                        pageRef,
+                        restClient);
 
                 target.add(container);
             }
@@ -285,4 +295,11 @@ public class PropagationTasks extends Pa
         paginatorForm.add(rowsChooser);
         add(paginatorForm);
     }
+
+    @Override
+    public void onEvent(final IEvent<?> event) {
+        if (event.getPayload() instanceof EventDataWrapper) {
+            ((EventDataWrapper) event.getPayload()).getTarget().add(container);
+        }
+    }
 }

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SchedTasks.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SchedTasks.java?rev=1456085&r1=1456084&r2=1456085&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SchedTasks.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SchedTasks.java Wed Mar 13 18:47:42 2013
@@ -42,8 +42,8 @@ import org.apache.wicket.ajax.form.AjaxF
 import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
 import org.apache.wicket.behavior.Behavior;
+import org.apache.wicket.event.IEvent;
 import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
-import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackDefaultDataTable;
 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.IColumn;
@@ -56,7 +56,7 @@ import org.apache.wicket.markup.html.pan
 import org.apache.wicket.markup.repeater.Item;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.model.ResourceModel;
+import org.apache.wicket.model.StringResourceModel;
 import org.apache.wicket.request.http.WebResponse;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 
@@ -85,7 +85,7 @@ public class SchedTasks extends Panel {
 
     private final List<IColumn<TaskTO, String>> columns;
 
-    private AjaxFallbackDefaultDataTable<TaskTO, String> table;
+    private AjaxDataTablePanel<TaskTO, String> table;
 
     public SchedTasks(final String id, final PageReference pageRef) {
 
@@ -108,22 +108,22 @@ public class SchedTasks extends Panel {
 
         columns = new ArrayList<IColumn<TaskTO, String>>();
 
-        columns.add(new PropertyColumn<TaskTO, String>(new ResourceModel("id"), "id", "id"));
-
-        columns.add(new PropertyColumn<TaskTO, String>(new ResourceModel("name"), "name", "name"));
-
-        columns.add(new PropertyColumn<TaskTO, String>(new ResourceModel("description"), "description", "description"));
-
-        columns.add(new PropertyColumn<TaskTO, String>(new ResourceModel("class"), "jobClassName", "jobClassName"));
-
-        columns.add(new DatePropertyColumn<TaskTO>(new ResourceModel("lastExec"), "lastExec", "lastExec"));
-
-        columns.add(new DatePropertyColumn<TaskTO>(new ResourceModel("nextExec"), "nextExec", "nextExec"));
-
         columns.add(new PropertyColumn<TaskTO, String>(
-                new ResourceModel("latestExecStatus"), "latestExecStatus", "latestExecStatus"));
+                new StringResourceModel("id", this, null), "id", "id"));
+        columns.add(new PropertyColumn<TaskTO, String>(
+                new StringResourceModel("name", this, null), "name", "name"));
+        columns.add(new PropertyColumn<TaskTO, String>(
+                new StringResourceModel("description", this, null), "description", "description"));
+        columns.add(new PropertyColumn<TaskTO, String>(
+                new StringResourceModel("class", this, null), "jobClassName", "jobClassName"));
+        columns.add(new DatePropertyColumn<TaskTO>(
+                new StringResourceModel("lastExec", this, null), "lastExec", "lastExec"));
+        columns.add(new DatePropertyColumn<TaskTO>(
+                new StringResourceModel("nextExec", this, null), "nextExec", "nextExec"));
+        columns.add(new PropertyColumn<TaskTO, String>(
+                new StringResourceModel("latestExecStatus", this, null), "latestExecStatus", "latestExecStatus"));
 
-        columns.add(new AbstractColumn<TaskTO, String>(new ResourceModel("actions", "")) {
+        columns.add(new AbstractColumn<TaskTO, String>(new StringResourceModel("actions", this, null, "")) {
 
             private static final long serialVersionUID = 2054811145491901166L;
 
@@ -221,7 +221,9 @@ public class SchedTasks extends Panel {
                 columns,
                 new TasksProvider<SchedTaskTO>(restClient, paginatorRows, getId(), SchedTaskTO.class),
                 container,
-                0);
+                0,
+                pageRef,
+                restClient);
 
         container.add(table);
 
@@ -274,7 +276,9 @@ public class SchedTasks extends Panel {
                         columns,
                         new TasksProvider<SchedTaskTO>(restClient, paginatorRows, getId(), SchedTaskTO.class),
                         container,
-                        table == null ? 0 : (int) table.getCurrentPage());
+                        table == null ? 0 : (int) table.getCurrentPage(),
+                        pageRef,
+                        restClient);
 
                 target.add(container);
             }
@@ -308,4 +312,11 @@ public class SchedTasks extends Panel {
 
         add(createLink);
     }
+    
+    @Override
+    public void onEvent(final IEvent<?> event) {
+        if (event.getPayload() instanceof AbstractSearchResultPanel.EventDataWrapper) {
+            ((AbstractSearchResultPanel.EventDataWrapper) event.getPayload()).getTarget().add(container);
+        }
+    }
 }

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasks.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasks.java?rev=1456085&r1=1456084&r2=1456085&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasks.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasks.java Wed Mar 13 18:47:42 2013
@@ -44,8 +44,8 @@ import org.apache.wicket.ajax.form.AjaxF
 import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
 import org.apache.wicket.behavior.Behavior;
+import org.apache.wicket.event.IEvent;
 import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
-import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackDefaultDataTable;
 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.IColumn;
@@ -58,7 +58,7 @@ import org.apache.wicket.markup.html.pan
 import org.apache.wicket.markup.repeater.Item;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.model.ResourceModel;
+import org.apache.wicket.model.StringResourceModel;
 import org.apache.wicket.request.http.WebResponse;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 
@@ -87,7 +87,7 @@ public class SyncTasks extends Panel {
 
     private final List<IColumn<TaskTO, String>> columns;
 
-    private AjaxFallbackDefaultDataTable<TaskTO, String> table;
+    private AjaxDataTablePanel<TaskTO, String> table;
 
     public SyncTasks(final String id, final PageReference pageRef) {
         super(id);
@@ -109,22 +109,21 @@ public class SyncTasks extends Panel {
 
         columns = new ArrayList<IColumn<TaskTO, String>>();
 
-        columns.add(new PropertyColumn<TaskTO, String>(new ResourceModel("id"), "id", "id"));
-
-        columns.add(new PropertyColumn<TaskTO, String>(new ResourceModel("name"), "name", "name"));
-
-        columns.add(new PropertyColumn<TaskTO, String>(new ResourceModel("description"), "description", "description"));
-
-        columns.add(new PropertyColumn<TaskTO, String>(new ResourceModel("resourceName"), "resource", "resource"));
-
-        columns.add(new DatePropertyColumn<TaskTO>(new ResourceModel("lastExec"), "lastExec", "lastExec"));
-
-        columns.add(new DatePropertyColumn<TaskTO>(new ResourceModel("nextExec"), "nextExec", "nextExec"));
-
         columns.add(new PropertyColumn<TaskTO, String>(
-                new ResourceModel("latestExecStatus"), "latestExecStatus", "latestExecStatus"));
-
-        columns.add(new AbstractColumn<TaskTO, String>(new ResourceModel("actions", "")) {
+                new StringResourceModel("id", this, null), "id", "id"));
+        columns.add(new PropertyColumn<TaskTO, String>(
+                new StringResourceModel("name", this, null), "name", "name"));
+        columns.add(new PropertyColumn<TaskTO, String>(
+                new StringResourceModel("description", this, null), "description", "description"));
+        columns.add(new PropertyColumn<TaskTO, String>(
+                new StringResourceModel("resourceName", this, null), "resource", "resource"));
+        columns.add(new DatePropertyColumn<TaskTO>(
+                new StringResourceModel("lastExec", this, null), "lastExec", "lastExec"));
+        columns.add(new DatePropertyColumn<TaskTO>(
+                new StringResourceModel("nextExec", this, null), "nextExec", "nextExec"));
+        columns.add(new PropertyColumn<TaskTO, String>(
+                new StringResourceModel("latestExecStatus", this, null), "latestExecStatus", "latestExecStatus"));
+        columns.add(new AbstractColumn<TaskTO, String>(new StringResourceModel("actions", this, null, "")) {
 
             private static final long serialVersionUID = 2054811145491901166L;
 
@@ -265,7 +264,9 @@ public class SyncTasks extends Panel {
                 columns,
                 new TasksProvider<SyncTaskTO>(restClient, paginatorRows, getId(), SyncTaskTO.class),
                 container,
-                0);
+                0,
+                pageRef,
+                restClient);
 
         container.add(table);
 
@@ -317,7 +318,9 @@ public class SyncTasks extends Panel {
                         columns,
                         new TasksProvider<SyncTaskTO>(restClient, paginatorRows, getId(), SyncTaskTO.class),
                         container,
-                        table == null ? 0 : (int) table.getCurrentPage());
+                        table == null ? 0 : (int) table.getCurrentPage(),
+                        pageRef,
+                        restClient);
 
                 target.add(container);
             }
@@ -352,4 +355,11 @@ public class SyncTasks extends Panel {
 
         add(createLink);
     }
+
+    @Override
+    public void onEvent(final IEvent<?> event) {
+        if (event.getPayload() instanceof AbstractSearchResultPanel.EventDataWrapper) {
+            ((AbstractSearchResultPanel.EventDataWrapper) event.getPayload()).getTarget().add(container);
+        }
+    }
 }

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/TaskRestClient.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/TaskRestClient.java?rev=1456085&r1=1456084&r2=1456085&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/TaskRestClient.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/TaskRestClient.java Wed Mar 13 18:47:42 2013
@@ -21,6 +21,9 @@ package org.apache.syncope.console.rest;
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.syncope.common.services.TaskService;
+import org.apache.syncope.common.services.UserService;
+import org.apache.syncope.common.to.BulkAction;
+import org.apache.syncope.common.to.BulkActionRes;
 import org.apache.syncope.common.to.JobClassTO;
 import org.apache.syncope.common.to.NotificationTaskTO;
 import org.apache.syncope.common.to.PropagationTaskTO;
@@ -164,4 +167,8 @@ public class TaskRestClient extends Base
     public void updateSyncTask(final SyncTaskTO taskTO) {
         getService(TaskService.class).update(taskTO.getId(), taskTO);
     }
+
+    public BulkActionRes bulkAction(final BulkAction action) {
+        return getService(TaskService.class).bulkAction(action);
+    }
 }

Propchange: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Mar 13 18:47:42 2013
@@ -14,3 +14,5 @@
 .DisplayAttributesModalPage.html.swp
 .Login.html.swp
 .Users.html.swp
+.ResourceModalPage.html.swp
+.SchemaModalPage.html.swp

Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage.html?rev=1456085&r1=1456084&r2=1456085&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage.html Wed Mar 13 18:47:42 2013
@@ -16,24 +16,6 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-<wicket:head>
-    <style type="text/css">
-        /* Style for autocomplete field */
-        div.wicket-aa {
-            font-family: "Lucida Grande","Lucida Sans Unicode",Tahoma,Verdana;
-            font-size: 12px;
-            background-color: white;
-            border-width: 1px;
-            border-color: #cccccc;
-            border-style: solid;
-            padding: 2px;
-            margin: 1px 0 0 0;
-            text-align:left;
-        }
-        div.wicket-aa ul { list-style:none; padding: 2px; margin:0; }
-        div.wicket-aa ul li.selected { background-color: #FFFF00; padding: 2px; margin:0; }
-    </style>
-</wicket:head>
 <wicket:extend>
     <p class="ui-widget ui-corner-all ui-widget-header"><wicket:message key="title"/></p>
 <div style="margin:10px">

Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/NotificationTasks.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/NotificationTasks.html?rev=1456085&r1=1456084&r2=1456085&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/NotificationTasks.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/NotificationTasks.html Wed Mar 13 18:47:42 2013
@@ -42,8 +42,7 @@ under the License.
         <a wicket:id="reload">
           <img src="img/reload.png" alt="reload" class="drop_button" />
         </a>
-        <table class="ui-widget ui-widget-content table-hover"
-               wicket:id="datatable"/>
+        <span wicket:id="datatable">[datatabel]</span>
       </span>
 
       <span style="float:right">

Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/PropagationTasks.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/PropagationTasks.html?rev=1456085&r1=1456084&r2=1456085&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/PropagationTasks.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/PropagationTasks.html Wed Mar 13 18:47:42 2013
@@ -42,8 +42,7 @@ under the License.
         <a wicket:id="reload">
           <img src="img/reload.png" alt="reload" class="drop_button" />
         </a>
-        <table class="ui-widget ui-widget-content table-hover"
-               wicket:id="datatable"/>
+        <span wicket:id="datatable">[datatabel]</span>
       </span>
       <span style="float:right">
         <form wicket:id="PaginatorForm" style="display:inline">

Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/SchedTasks.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/SchedTasks.html?rev=1456085&r1=1456084&r2=1456085&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/SchedTasks.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/SchedTasks.html Wed Mar 13 18:47:42 2013
@@ -42,8 +42,7 @@ under the License.
         <a wicket:id="reload">
           <img src="img/reload.png" alt="reload" class="drop_button" />
         </a>
-        <table class="ui-widget ui-widget-content table-hover"
-               wicket:id="datatable"/>
+        <span wicket:id="datatable">[datatabel]</span>
       </span>
 
       <span style="float:right">

Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/SyncTasks.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/SyncTasks.html?rev=1456085&r1=1456084&r2=1456085&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/SyncTasks.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/SyncTasks.html Wed Mar 13 18:47:42 2013
@@ -42,8 +42,7 @@ under the License.
         <a wicket:id="reload">
           <img src="img/reload.png" alt="reload" class="drop_button" />
         </a>
-        <table class="ui-widget ui-widget-content table-hover"
-               wicket:id="datatable"/>
+        <span wicket:id="datatable">[datatable]</span>
       </span>
 
       <span style="float:right">

Modified: syncope/trunk/console/src/main/webapp/css/style.css
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/webapp/css/style.css?rev=1456085&r1=1456084&r2=1456085&view=diff
==============================================================================
--- syncope/trunk/console/src/main/webapp/css/style.css (original)
+++ syncope/trunk/console/src/main/webapp/css/style.css Wed Mar 13 18:47:42 2013
@@ -459,4 +459,28 @@ td.action{
 
 .tree-junction-expanded {
   display: none;
-}
\ No newline at end of file
+}
+
+/* Style for autocomplete field */ 
+div.wicket-aa { 
+  font-family: "Lucida Grande","Lucida Sans Unicode",Tahoma,Verdana;
+  font-size: 12px;
+  background-color: white;
+  border-width: 1px;
+  border-color: #cccccc;
+  border-style: solid; 
+  padding: 2px;
+  margin: 1px 0 0 0;
+  text-align:left;
+}
+div.wicket-aa ul {
+  list-style:none;
+  padding: 2px; 
+  margin:0;
+}
+div.wicket-aa ul li.selected {
+  background-color: #FFFF00;
+  padding: 2px;
+  margin:0;
+}
+