Author: massi
Date: Fri May 24 08:22:48 2013
New Revision: 1485967
URL: http://svn.apache.org/r1485967
Log:
merge from 1_1_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BulkActionModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BulkActionResultModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PolicyModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResultStatusModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PoliciesPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourcesPanel.java
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_1_X:r1485955-1485965
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=1485967&r1=1485966&r2=1485967&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
Fri May 24 08:22:48 2013
@@ -129,7 +129,7 @@ public class BulkActionModalPage<T, S> e
final BulkActionRes res = (BulkActionRes)
bulkActionExecutor.getClass().
getMethod("bulkAction",
BulkAction.class).invoke(bulkActionExecutor, bulkAction);
- setResponsePage(new BulkActionResultModalPage(pageRef,
window, items, columns, res, idFieldName));
+ setResponsePage(new BulkActionResultModalPage(window,
items, columns, res, idFieldName));
} catch (Exception e) {
LOG.error("Operation {} not supported",
bulkAction.getOperation(), e);
}
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BulkActionResultModalPage.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BulkActionResultModalPage.java?rev=1485967&r1=1485966&r2=1485967&view=diff
==============================================================================
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BulkActionResultModalPage.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BulkActionResultModalPage.java
Fri May 24 08:22:48 2013
@@ -23,7 +23,6 @@ import java.util.Iterator;
import java.util.List;
import org.apache.syncope.common.to.BulkActionRes;
import
org.apache.syncope.console.wicket.extensions.markup.html.repeater.data.table.ActionResultColumn;
-import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink;
@@ -45,7 +44,6 @@ public class BulkActionResultModalPage<T
private static final long serialVersionUID = 2646115294319713724L;
public BulkActionResultModalPage(
- final PageReference pageRef,
final ModalWindow window,
final List<T> items,
final List<IColumn<T, S>> columns,
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PolicyModalPage.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PolicyModalPage.java?rev=1485967&r1=1485966&r2=1485967&view=diff
==============================================================================
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PolicyModalPage.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PolicyModalPage.java
Fri May 24 08:22:48 2013
@@ -33,7 +33,6 @@ import org.apache.syncope.console.pages.
import org.apache.syncope.console.rest.PolicyRestClient;
import
org.apache.syncope.console.wicket.markup.html.form.AjaxDropDownChoicePanel;
import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
-import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxButton;
@@ -54,7 +53,7 @@ public class PolicyModalPage<T extends P
@SpringBean
private PolicyRestClient policyRestClient;
- public PolicyModalPage(final ModalWindow window, final T policyTO, final
PageReference pageRef) {
+ public PolicyModalPage(final ModalWindow window, final T policyTO) {
super();
final Form form = new Form(FORM);
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResultStatusModalPage.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResultStatusModalPage.java?rev=1485967&r1=1485966&r2=1485967&view=diff
==============================================================================
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResultStatusModalPage.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResultStatusModalPage.java
Fri May 24 08:22:48 2013
@@ -21,6 +21,8 @@ package org.apache.syncope.console.pages
import static
org.apache.syncope.common.types.PropagationTaskExecStatus.CREATED;
import static
org.apache.syncope.common.types.PropagationTaskExecStatus.SUBMITTED;
import static
org.apache.syncope.common.types.PropagationTaskExecStatus.SUCCESS;
+
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
@@ -37,9 +39,7 @@ import org.apache.syncope.common.types.P
import org.apache.syncope.console.commons.ConnIdSpecialAttributeName;
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.commons.StatusUtils;
-import org.apache.syncope.console.pages.panels.RolePanel;
import org.apache.wicket.Component;
-import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.behavior.Behavior;
@@ -48,7 +48,6 @@ import org.apache.wicket.extensions.ajax
import org.apache.wicket.markup.ComponentTag;
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.image.Image;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
@@ -73,7 +72,9 @@ public class ResultStatusModalPage exten
*/
private final StatusUtils statusUtils;
- public static class Builder {
+ public static class Builder implements Serializable {
+
+ private static final long serialVersionUID = 220361441802274899L;
private ModalWindow window;
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PoliciesPanel.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PoliciesPanel.java?rev=1485967&r1=1485966&r2=1485967&view=diff
==============================================================================
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PoliciesPanel.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PoliciesPanel.java
Fri May 24 08:22:48 2013
@@ -164,7 +164,7 @@ public class PoliciesPanel extends Panel
@Override
public Page createPage() {
- return new PolicyModalPage(mwindow,
accountPolicyTO, pageRef);
+ return new PolicyModalPage(mwindow,
accountPolicyTO);
}
});
@@ -216,7 +216,7 @@ public class PoliciesPanel extends Panel
@Override
public Page createPage() {
- return new PolicyModalPage(mwindow,
getPolicyTOInstance(policyType), pageRef);
+ return new PolicyModalPage(mwindow,
getPolicyTOInstance(policyType));
}
});
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourcesPanel.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourcesPanel.java?rev=1485967&r1=1485966&r2=1485967&view=diff
==============================================================================
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourcesPanel.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourcesPanel.java
Fri May 24 08:22:48 2013
@@ -18,6 +18,7 @@
*/
package org.apache.syncope.console.pages.panels;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
@@ -62,7 +63,9 @@ public class ResourcesPanel extends Pane
private final List<String> allResources;
- public static class Builder {
+ public static class Builder implements Serializable {
+
+ private static final long serialVersionUID = 8644108944633025494L;
private String id;
