You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2012/09/10 16:46:55 UTC
svn commit: r1382901 - in /incubator/syncope/trunk: ./
console/src/main/java/org/apache/syncope/console/pages/
console/src/main/resources/org/apache/syncope/console/pages/
Author: ilgrosso
Date: Mon Sep 10 14:46:54 2012
New Revision: 1382901
URL: http://svn.apache.org/viewvc?rev=1382901&view=rev
Log:
Merge from 1_0_X
Modified:
incubator/syncope/trunk/ (props changed)
incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchedTaskModalPage.java
incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SyncTaskModalPage.java
incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SyncTaskModalPage.properties
Propchange: incubator/syncope/trunk/
------------------------------------------------------------------------------
Merged /incubator/syncope/branches/1_0_X:r1382666-1382899
Modified: incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchedTaskModalPage.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchedTaskModalPage.java?rev=1382901&r1=1382900&r2=1382901&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchedTaskModalPage.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchedTaskModalPage.java Mon Sep 10 14:46:54 2012
@@ -19,13 +19,13 @@
package org.apache.syncope.console.pages;
import java.util.List;
+import org.apache.syncope.client.to.SchedTaskTO;
+import org.apache.syncope.console.wicket.markup.html.form.AjaxDropDownChoicePanel;
import org.apache.wicket.PageReference;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.PropertyModel;
-import org.apache.syncope.client.to.SchedTaskTO;
-import org.apache.syncope.console.wicket.markup.html.form.AjaxDropDownChoicePanel;
/**
* Modal window with Task form (to stop and start execution).
Modified: incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SyncTaskModalPage.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SyncTaskModalPage.java?rev=1382901&r1=1382900&r2=1382901&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SyncTaskModalPage.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SyncTaskModalPage.java Mon Sep 10 14:46:54 2012
@@ -101,9 +101,9 @@ public class SyncTaskModalPage extends A
new PropertyModel<Boolean>(taskTO, "performDelete"));
profile.add(deletes);
- final AjaxCheckBoxPanel status = new AjaxCheckBoxPanel("syncStatus", getString("status"),
+ final AjaxCheckBoxPanel syncStatus = new AjaxCheckBoxPanel("syncStatus", getString("syncStatus"),
new PropertyModel<Boolean>(taskTO, "syncStatus"));
- profile.add(status);
+ profile.add(syncStatus);
final AjaxCheckBoxPanel fullReconciliation = new AjaxCheckBoxPanel("fullReconciliation",
getString("fullReconciliation"), new PropertyModel<Boolean>(taskTO, "fullReconciliation"));
Modified: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SyncTaskModalPage.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SyncTaskModalPage.properties?rev=1382901&r1=1382900&r2=1382901&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SyncTaskModalPage.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SyncTaskModalPage.properties Mon Sep 10 14:46:54 2012
@@ -36,6 +36,6 @@ showMessage=Show
chooseForTemplate=Use A Template
creates=Create new identities
deletes=Delete matching identities
-status=Synchronize user status
+syncStatus=Synchronize user status
fullReconciliation=Full reconciliation
actionsClass=Actions class