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 2013/05/18 14:08:16 UTC
svn commit: r1484097 - in /syncope/trunk: ./
common/src/main/java/org/apache/syncope/common/
console/src/main/java/org/apache/syncope/console/
console/src/main/java/org/apache/syncope/console/commons/
console/src/main/java/org/apache/syncope/console/pa...
Author: ilgrosso
Date: Sat May 18 12:08:15 2013
New Revision: 1484097
URL: http://svn.apache.org/r1484097
Log:
Merge from 1_1_X
Added:
syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/ConnIdSpecialAttributeName.java
- copied unchanged from r1484096, syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/commons/ConnIdSpecialAttributeName.java
Modified:
syncope/trunk/ (props changed)
syncope/trunk/common/src/main/java/org/apache/syncope/common/SyncopeConstants.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeApplication.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/Constants.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/HttpResourceStream.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/StatusUtils.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/AbstractBasePage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/AbstractSchedTaskModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ApprovalModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BasePage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.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/ReportModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.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/RoleModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Roles.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/StatusModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/TaskModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Todo.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Users.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/VirtualSchemaModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractSearchResultPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractTasks.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AjaxDataTablePanel.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/PoliciesPanel.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/StatusPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasks.java
syncope/trunk/console/src/main/resources/org/apache/syncope/console/markup/html/CrontabContainer.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/markup/html/CrontabContainer_it.properties
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_1_X:r1484009-1484096
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/SyncopeConstants.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/SyncopeConstants.java?rev=1484097&r1=1484096&r2=1484097&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/SyncopeConstants.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/SyncopeConstants.java Sat May 18 12:08:15 2013
@@ -49,9 +49,4 @@ public class SyncopeConstants {
public static final String ON_BLUR = "onblur";
- /**
- * Default image suffix
- */
- public static final String DEFAULT_IMG_SUFFIX = ".png";
-
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeApplication.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeApplication.java?rev=1484097&r1=1484096&r2=1484097&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeApplication.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeApplication.java Sat May 18 12:08:15 2013
@@ -19,7 +19,7 @@
package org.apache.syncope.console;
import java.io.Serializable;
-import org.apache.syncope.common.SyncopeConstants;
+import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.commons.XMLRolesReader;
import org.apache.syncope.console.pages.Configuration;
import org.apache.syncope.console.pages.InfoModalPage;
@@ -117,7 +117,7 @@ public class SyncopeApplication
page.add(schemaLink);
schemaLink.add(new Image("schemaIcon", new ContextRelativeResource(IMG_PREFIX + (notsel
? IMG_NOTSEL
- : "") + "schema" + SyncopeConstants.DEFAULT_IMG_SUFFIX)));
+ : "") + "schema" + Constants.PNG_EXT)));
BookmarkablePageLink<Void> usersLink = new BookmarkablePageLink<Void>("users", Users.class);
String allowedUsersRoles = xmlRolesReader.getAllAllowedRoles("Users", "list");
@@ -125,21 +125,21 @@ public class SyncopeApplication
page.add(usersLink);
usersLink.add(new Image("usersIcon", new ContextRelativeResource(IMG_PREFIX + (notsel
? IMG_NOTSEL
- : "") + "users" + SyncopeConstants.DEFAULT_IMG_SUFFIX)));
+ : "") + "users" + Constants.PNG_EXT)));
BookmarkablePageLink<Void> rolesLink = new BookmarkablePageLink<Void>("roles", Roles.class);
MetaDataRoleAuthorizationStrategy.authorizeAll(rolesLink, WebPage.ENABLE);
page.add(rolesLink);
rolesLink.add(new Image("rolesIcon", new ContextRelativeResource(IMG_PREFIX + (notsel
? IMG_NOTSEL
- : "") + "roles" + SyncopeConstants.DEFAULT_IMG_SUFFIX)));
+ : "") + "roles" + Constants.PNG_EXT)));
BookmarkablePageLink<Void> resourcesLink = new BookmarkablePageLink<Void>("resources", Resources.class);
MetaDataRoleAuthorizationStrategy.authorizeAll(resourcesLink, WebPage.ENABLE);
page.add(resourcesLink);
resourcesLink.add(new Image("resourcesIcon", new ContextRelativeResource(IMG_PREFIX + (notsel
? IMG_NOTSEL
- : "") + "resources" + SyncopeConstants.DEFAULT_IMG_SUFFIX)));
+ : "") + "resources" + Constants.PNG_EXT)));
BookmarkablePageLink<Void> todoLink = new BookmarkablePageLink<Void>("todo", Todo.class);
MetaDataRoleAuthorizationStrategy.authorize(todoLink, WebPage.ENABLE, xmlRolesReader.getAllAllowedRoles(
@@ -147,7 +147,7 @@ public class SyncopeApplication
page.add(todoLink);
todoLink.add(new Image("todoIcon", new ContextRelativeResource(IMG_PREFIX + (notsel
? IMG_NOTSEL
- : "") + "todo" + SyncopeConstants.DEFAULT_IMG_SUFFIX)));
+ : "") + "todo" + Constants.PNG_EXT)));
BookmarkablePageLink<Void> reportLink = new BookmarkablePageLink<Void>("reports", Reports.class);
String allowedReportRoles = xmlRolesReader.getAllAllowedRoles("Reports", "list");
@@ -155,7 +155,7 @@ public class SyncopeApplication
page.add(reportLink);
reportLink.add(new Image("reportsIcon", new ContextRelativeResource(IMG_PREFIX + (notsel
? IMG_NOTSEL
- : "") + "reports" + SyncopeConstants.DEFAULT_IMG_SUFFIX)));
+ : "") + "reports" + Constants.PNG_EXT)));
BookmarkablePageLink<Void> configurationLink = new BookmarkablePageLink<Void>("configuration",
Configuration.class);
@@ -164,7 +164,7 @@ public class SyncopeApplication
page.add(configurationLink);
configurationLink.add(new Image("configurationIcon", new ContextRelativeResource(IMG_PREFIX + (notsel
? IMG_NOTSEL
- : "") + "configuration" + SyncopeConstants.DEFAULT_IMG_SUFFIX)));
+ : "") + "configuration" + Constants.PNG_EXT)));
BookmarkablePageLink<Void> taskLink = new BookmarkablePageLink<Void>("tasks", Tasks.class);
String allowedTasksRoles = xmlRolesReader.getAllAllowedRoles("Tasks", "list");
@@ -172,7 +172,7 @@ public class SyncopeApplication
page.add(taskLink);
taskLink.add(new Image("tasksIcon", new ContextRelativeResource(IMG_PREFIX + (notsel
? IMG_NOTSEL
- : "") + "tasks" + SyncopeConstants.DEFAULT_IMG_SUFFIX)));
+ : "") + "tasks" + Constants.PNG_EXT)));
page.add(new BookmarkablePageLink<Void>("logout", Logout.class));
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/Constants.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/Constants.java?rev=1484097&r1=1484096&r2=1484097&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/Constants.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/Constants.java Sat May 18 12:08:15 2013
@@ -20,6 +20,14 @@ package org.apache.syncope.console.commo
public final class Constants {
+ public static final String PNG_EXT = ".png";
+
+ public static final String FEEDBACK = "feedback";
+
+ public static final String OPERATION_SUCCEEDED = "operation_succeeded";
+
+ public static final String ERROR = "error";
+
public static final String PREF_USERS_DETAILS_VIEW = "users.details.view";
public static final String PREF_USERS_ATTRIBUTES_VIEW = "users.attributes.view";
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/HttpResourceStream.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/HttpResourceStream.java?rev=1484097&r1=1484096&r2=1484097&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/HttpResourceStream.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/HttpResourceStream.java Sat May 18 12:08:15 2013
@@ -92,7 +92,7 @@ public class HttpResourceStream extends
public String getFilename() {
return filename == null
- ? "error"
+ ? Constants.ERROR
: filename;
}
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/StatusUtils.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/StatusUtils.java?rev=1484097&r1=1484096&r2=1484097&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/StatusUtils.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/StatusUtils.java Sat May 18 12:08:15 2013
@@ -115,11 +115,9 @@ public class StatusUtils implements Seri
}
private Boolean isEnabled(final ConnObjectTO objectTO) {
- final String STATUSATTR = ConnidAttribute.ENABLE;
-
final Map<String, AttributeTO> attributeTOs = objectTO.getAttributeMap();
- final AttributeTO status = attributeTOs.get(STATUSATTR);
+ final AttributeTO status = attributeTOs.get(ConnIdSpecialAttributeName.ENABLE);
return status != null && status.getValues() != null && !status.getValues().isEmpty()
? Boolean.parseBoolean(status.getValues().get(0))
@@ -127,13 +125,11 @@ public class StatusUtils implements Seri
}
private String getAccountLink(final ConnObjectTO objectTO) {
- final String NAME = ConnidAttribute.NAME;
-
final Map<String, AttributeTO> attributeTOs = objectTO == null
? Collections.<String, AttributeTO>emptyMap()
: objectTO.getAttributeMap();
- final AttributeTO name = attributeTOs.get(NAME);
+ final AttributeTO name = attributeTOs.get(ConnIdSpecialAttributeName.NAME);
return name != null && name.getValues() != null && !name.getValues().isEmpty()
? name.getValues().get(0)
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/AbstractBasePage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/AbstractBasePage.java?rev=1484097&r1=1484096&r2=1484097&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/AbstractBasePage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/AbstractBasePage.java Sat May 18 12:08:15 2013
@@ -18,6 +18,7 @@
*/
package org.apache.syncope.console.pages;
+import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.commons.XMLRolesReader;
import org.apache.syncope.markup.head.MetaHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
@@ -60,7 +61,7 @@ public class AbstractBasePage extends We
}
protected final void setupFeedbackPanel() {
- feedbackPanel = new FeedbackPanel("feedback");
+ feedbackPanel = new FeedbackPanel(Constants.FEEDBACK);
feedbackPanel.setOutputMarkupId(true);
add(feedbackPanel);
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/AbstractSchedTaskModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/AbstractSchedTaskModalPage.java?rev=1484097&r1=1484096&r2=1484097&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/AbstractSchedTaskModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/AbstractSchedTaskModalPage.java Sat May 18 12:08:15 2013
@@ -21,6 +21,7 @@ package org.apache.syncope.console.pages
import org.apache.syncope.common.to.SchedTaskTO;
import org.apache.syncope.common.to.SyncTaskTO;
import org.apache.syncope.common.validation.SyncopeClientCompositeErrorException;
+import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.commons.DateFormatROModel;
import org.apache.syncope.console.markup.html.CrontabContainer;
import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
@@ -104,7 +105,7 @@ public abstract class AbstractSchedTaskM
window.close(target);
} catch (SyncopeClientCompositeErrorException e) {
LOG.error("While creating or updating task", e);
- error(getString("error") + ":" + e.getMessage());
+ error(getString(Constants.ERROR) + ":" + e.getMessage());
target.add(feedbackPanel);
}
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ApprovalModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ApprovalModalPage.java?rev=1484097&r1=1484096&r2=1484097&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ApprovalModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ApprovalModalPage.java Sat May 18 12:08:15 2013
@@ -30,6 +30,7 @@ import org.apache.commons.lang.StringUti
import org.apache.syncope.common.to.WorkflowFormPropertyTO;
import org.apache.syncope.common.to.WorkflowFormTO;
import org.apache.syncope.common.validation.SyncopeClientCompositeErrorException;
+import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.commons.MapChoiceRenderer;
import org.apache.syncope.console.markup.html.list.AltListView;
import org.apache.syncope.console.rest.ApprovalRestClient;
@@ -235,7 +236,7 @@ public class ApprovalModalPage extends B
((Todo) pageRef.getPage()).setModalResult(true);
window.close(target);
} catch (SyncopeClientCompositeErrorException e) {
- error(getString("error") + ":" + e.getMessage());
+ error(getString(Constants.ERROR) + ":" + e.getMessage());
LOG.error("While submitting form {}", formTO, e);
target.add(feedbackPanel);
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BasePage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BasePage.java?rev=1484097&r1=1484096&r2=1484097&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BasePage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BasePage.java Sat May 18 12:08:15 2013
@@ -18,10 +18,10 @@
*/
package org.apache.syncope.console.pages;
-import org.apache.syncope.common.SyncopeConstants;
import org.apache.syncope.common.to.UserTO;
import org.apache.syncope.console.SyncopeApplication;
import org.apache.syncope.console.SyncopeSession;
+import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.rest.UserRestClient;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
@@ -91,8 +91,7 @@ public class BasePage extends AbstractBa
@Override
public void onComponentTag(final Component component, final ComponentTag tag) {
- tag.put("src", "../.." + SyncopeApplication.IMG_PREFIX + kind
- + SyncopeConstants.DEFAULT_IMG_SUFFIX);
+ tag.put("src", "../.." + SyncopeApplication.IMG_PREFIX + kind + Constants.PNG_EXT);
}
});
}
@@ -161,7 +160,7 @@ public class BasePage extends AbstractBa
public void onClose(final AjaxRequestTarget target) {
target.add(container);
if (isModalResult()) {
- info(getString("operation_succeeded"));
+ info(getString(Constants.OPERATION_SUCCEEDED));
target.add(feedbackPanel);
setModalResult(false);
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java?rev=1484097&r1=1484096&r2=1484097&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java Sat May 18 12:08:15 2013
@@ -165,9 +165,9 @@ public class Configuration extends BaseP
protected void onSubmitInternal(final AjaxRequestTarget target, final Form<?> form) {
try {
wfRestClient.updateDefinition(workflowDef);
- info(getString("operation_succeeded"));
+ info(getString(Constants.OPERATION_SUCCEEDED));
} catch (SyncopeClientCompositeErrorException scee) {
- error(getString("error") + ":" + scee.getMessage());
+ error(getString(Constants.ERROR) + ":" + scee.getMessage());
}
target.add(feedbackPanel);
}
@@ -272,7 +272,7 @@ public class Configuration extends BaseP
return;
}
- info(getString("operation_succeeded"));
+ info(getString(Constants.OPERATION_SUCCEEDED));
target.add(feedbackPanel);
target.add(confContainer);
@@ -346,7 +346,7 @@ public class Configuration extends BaseP
getRequestCycle().scheduleRequestHandlerAfterCurrent(rsrh);
} catch (Exception e) {
- error(getString("error") + ": " + e.getMessage());
+ error(getString(Constants.ERROR) + ": " + e.getMessage());
}
}
};
@@ -441,7 +441,7 @@ public class Configuration extends BaseP
return;
}
- info(getString("operation_succeeded"));
+ info(getString(Constants.OPERATION_SUCCEEDED));
target.add(feedbackPanel);
target.add(notificationContainer);
@@ -658,7 +658,7 @@ public class Configuration extends BaseP
item.getModelObject().getLevel());
}
- info(getString("operation_succeeded"));
+ info(getString(Constants.OPERATION_SUCCEEDED));
} catch (SyncopeClientCompositeErrorException e) {
info(getString("operation_error"));
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java?rev=1484097&r1=1484096&r2=1484097&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java Sat May 18 12:08:15 2013
@@ -36,6 +36,7 @@ import org.apache.syncope.common.types.C
import org.apache.syncope.common.types.ConnConfProperty;
import org.apache.syncope.common.types.ConnectorCapability;
import org.apache.syncope.common.validation.SyncopeClientCompositeErrorException;
+import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.markup.html.list.AltListView;
import org.apache.syncope.console.rest.ConnectorRestClient;
import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel;
@@ -424,7 +425,7 @@ public class ConnectorModalPage extends
((Resources) pageRef.getPage()).setModalResult(true);
window.close(target);
} catch (SyncopeClientCompositeErrorException e) {
- error(getString("error") + ":" + e.getMessage());
+ error(getString(Constants.ERROR) + ":" + e.getMessage());
target.add(feedbackPanel);
((Resources) pageRef.getPage()).setModalResult(false);
LOG.error("While creating or updating connector {}", conn, e);
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java?rev=1484097&r1=1484096&r2=1484097&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java Sat May 18 12:08:15 2013
@@ -22,6 +22,7 @@ import org.apache.syncope.common.Abstrac
import org.apache.syncope.common.to.DerivedSchemaTO;
import org.apache.syncope.common.types.AttributableType;
import org.apache.syncope.common.validation.SyncopeClientCompositeErrorException;
+import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.commons.JexlHelpUtil;
import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
import org.apache.wicket.PageReference;
@@ -99,7 +100,7 @@ public class DerivedSchemaModalPage exte
window.close(target);
} catch (SyncopeClientCompositeErrorException e) {
- error(getString("error") + ":" + e.getMessage());
+ error(getString(Constants.ERROR) + ":" + e.getMessage());
target.add(feedbackPanel);
}
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java?rev=1484097&r1=1484096&r2=1484097&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java Sat May 18 12:08:15 2013
@@ -33,6 +33,7 @@ import org.apache.syncope.common.to.Enti
import org.apache.syncope.common.to.UserTO;
import org.apache.syncope.common.util.CollectionWrapper;
import org.apache.syncope.console.SyncopeSession;
+import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxLink;
import org.apache.syncope.console.wicket.markup.html.form.LinkPanel;
import org.apache.wicket.Page;
@@ -134,7 +135,7 @@ public class Login extends WebPage {
form.add(submitButton);
add(form);
- add(new FeedbackPanel("feedback"));
+ add(new FeedbackPanel(Constants.FEEDBACK));
// Modal window for self registration
final ModalWindow editProfileModalWin = new ModalWindow("selfRegModal");
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java?rev=1484097&r1=1484096&r2=1484097&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java Sat May 18 12:08:15 2013
@@ -29,6 +29,7 @@ import org.apache.syncope.common.types.A
import org.apache.syncope.common.types.IntMappingType;
import org.apache.syncope.common.types.TraceLevel;
import org.apache.syncope.common.validation.SyncopeClientCompositeErrorException;
+import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.pages.panels.UserSearchPanel;
import org.apache.syncope.console.rest.NotificationRestClient;
import org.apache.syncope.console.rest.SchemaRestClient;
@@ -199,14 +200,14 @@ class NotificationModalPage extends Base
} else {
restClient.updateNotification(notificationTO);
}
- info(getString("operation_succeeded"));
+ info(getString(Constants.OPERATION_SUCCEEDED));
Configuration callerPage = (Configuration) pageRef.getPage();
callerPage.setModalResult(true);
window.close(target);
} catch (SyncopeClientCompositeErrorException scee) {
- error(getString("error") + ":" + scee.getMessage());
+ error(getString(Constants.ERROR) + ":" + scee.getMessage());
target.add(feedbackPanel);
}
}
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=1484097&r1=1484096&r2=1484097&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 Sat May 18 12:08:15 2013
@@ -28,6 +28,7 @@ import org.apache.syncope.common.types.A
import org.apache.syncope.common.types.PasswordPolicySpec;
import org.apache.syncope.common.types.PolicyType;
import org.apache.syncope.common.types.SyncPolicySpec;
+import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.pages.panels.PolicyBeanPanel;
import org.apache.syncope.console.rest.PolicyRestClient;
import org.apache.syncope.console.wicket.markup.html.form.AjaxDropDownChoicePanel;
@@ -121,14 +122,14 @@ public class PolicyModalPage<T extends P
} catch (Exception e) {
LOG.error("While creating policy", e);
- error(getString("error") + ":" + e.getMessage());
- target.add(getPage().get("feedback"));
+ error(getString(Constants.ERROR) + ":" + e.getMessage());
+ target.add(getPage().get(Constants.FEEDBACK));
}
}
@Override
protected void onError(final AjaxRequestTarget target, final Form<?> form) {
- target.add(getPage().get("feedback"));
+ target.add(getPage().get(Constants.FEEDBACK));
}
};
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportModalPage.java?rev=1484097&r1=1484096&r2=1484097&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportModalPage.java Sat May 18 12:08:15 2013
@@ -30,6 +30,7 @@ import org.apache.syncope.common.to.Repo
import org.apache.syncope.common.types.ReportExecExportFormat;
import org.apache.syncope.common.types.ReportExecStatus;
import org.apache.syncope.common.validation.SyncopeClientCompositeErrorException;
+import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.commons.DateFormatROModel;
import org.apache.syncope.console.commons.HttpResourceStream;
import org.apache.syncope.console.commons.SortableDataProviderComparator;
@@ -153,7 +154,7 @@ public class ReportModalPage extends Bas
window.close(target);
} catch (SyncopeClientCompositeErrorException e) {
LOG.error("While creating or updating report", e);
- error(getString("error") + ":" + e.getMessage());
+ error(getString(Constants.ERROR) + ":" + e.getMessage());
target.add(feedbackPanel);
}
}
@@ -510,7 +511,7 @@ public class ReportModalPage extends Bas
reportTO.removeExecution(taskExecutionTO);
- info(getString("operation_succeeded"));
+ info(getString(Constants.OPERATION_SUCCEEDED));
} catch (SyncopeClientCompositeErrorException scce) {
error(scce.getMessage());
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java?rev=1484097&r1=1484096&r2=1484097&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java Sat May 18 12:08:15 2013
@@ -176,7 +176,7 @@ public class Reports extends BasePage {
public void onClick(final AjaxRequestTarget target) {
try {
reportRestClient.startExecution(reportTO.getId());
- getSession().info(getString("operation_succeeded"));
+ getSession().info(getString(Constants.OPERATION_SUCCEEDED));
} catch (SyncopeClientCompositeErrorException scce) {
error(scce.getMessage());
}
@@ -194,7 +194,7 @@ public class Reports extends BasePage {
public void onClick(final AjaxRequestTarget target) {
try {
reportRestClient.delete(reportTO.getId());
- info(getString("operation_succeeded"));
+ info(getString(Constants.OPERATION_SUCCEEDED));
} catch (SyncopeClientCompositeErrorException scce) {
error(scce.getMessage());
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java?rev=1484097&r1=1484096&r2=1484097&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java Sat May 18 12:08:15 2013
@@ -22,6 +22,7 @@ import org.apache.commons.lang.StringUti
import org.apache.syncope.common.to.MappingItemTO;
import org.apache.syncope.common.to.ResourceTO;
import org.apache.syncope.common.types.AttributableType;
+import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.pages.panels.ResourceConnConfPanel;
import org.apache.syncope.console.pages.panels.ResourceDetailsPanel;
import org.apache.syncope.console.pages.panels.ResourceMappingPanel;
@@ -141,7 +142,7 @@ public class ResourceModalPage extends B
window.close(target);
} catch (Exception e) {
LOG.error("Failure managing resource {}", resourceTO, e);
- error(getString("error") + ": " + e.getMessage());
+ error(getString(Constants.ERROR) + ": " + e.getMessage());
target.add(feedbackPanel);
}
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java?rev=1484097&r1=1484096&r2=1484097&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java Sat May 18 12:08:15 2013
@@ -119,9 +119,9 @@ public class Resources extends BasePage
protected void onClickInternal(final AjaxRequestTarget target) {
try {
connectorRestClient.reload();
- info(getString("operation_succeeded"));
+ info(getString(Constants.OPERATION_SUCCEEDED));
} catch (Exception e) {
- error(getString("error") + ": " + e.getMessage());
+ error(getString(Constants.ERROR) + ": " + e.getMessage());
}
target.add(feedbackPanel);
target.add(connectorContainer);
@@ -255,9 +255,9 @@ public class Resources extends BasePage
try {
resourceRestClient.delete(resourceTO.getName());
- info(getString("operation_succeeded"));
+ info(getString(Constants.OPERATION_SUCCEEDED));
} catch (SyncopeClientCompositeErrorException e) {
- error(getString("error") + ":" + e.getMessage());
+ error(getString(Constants.ERROR) + ":" + e.getMessage());
LOG.error("While deleting resource " + resourceTO.getName(), e);
}
@@ -410,9 +410,9 @@ public class Resources extends BasePage
public void onClick(final AjaxRequestTarget target) {
try {
connectorRestClient.delete(connectorTO.getId());
- info(getString("operation_succeeded"));
+ info(getString(Constants.OPERATION_SUCCEEDED));
} catch (SyncopeClientCompositeErrorException e) {
- error(getString("error") + ":" + e.getMessage());
+ error(getString(Constants.ERROR) + ":" + e.getMessage());
LOG.error("While deleting connector " + connectorTO.getId(), e);
}
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=1484097&r1=1484096&r2=1484097&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 Sat May 18 12:08:15 2013
@@ -24,7 +24,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.syncope.common.SyncopeConstants;
import org.apache.syncope.common.to.AbstractAttributableTO;
import org.apache.syncope.common.to.AttributeTO;
import org.apache.syncope.common.to.ConnObjectTO;
@@ -32,7 +31,8 @@ import org.apache.syncope.common.to.Prop
import org.apache.syncope.common.to.RoleTO;
import org.apache.syncope.common.to.UserTO;
import org.apache.syncope.common.types.PropagationTaskExecStatus;
-import org.apache.syncope.console.commons.ConnidAttribute;
+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.rest.UserRestClient;
import org.apache.wicket.Component;
@@ -56,12 +56,9 @@ import org.apache.wicket.spring.injectio
*/
public class ResultStatusModalPage extends BaseModalPage {
- /**
- * Serial version id.
- */
private static final long serialVersionUID = 2646115294319713723L;
- public static final String IMG_STATUES = "statuses/";
+ private static final String IMG_STATUSES = "statuses/";
@SpringBean
private UserRestClient userRestClient;
@@ -150,15 +147,15 @@ public class ResultStatusModalPage exten
case SUCCESS:
case SUBMITTED:
case CREATED:
- image = new Image("icon", IMG_STATUES + StatusUtils.Status.ACTIVE.toString()
- + SyncopeConstants.DEFAULT_IMG_SUFFIX);
+ image = new Image("icon", IMG_STATUSES + StatusUtils.Status.ACTIVE.toString()
+ + Constants.PNG_EXT);
alt = "success icon";
title = "success";
break;
default:
- image = new Image("icon", IMG_STATUES + StatusUtils.Status.SUSPENDED.toString()
- + SyncopeConstants.DEFAULT_IMG_SUFFIX);
+ image = new Image("icon", IMG_STATUSES + StatusUtils.Status.SUSPENDED.toString()
+ + Constants.PNG_EXT);
alt = "failure icon";
title = "failure";
}
@@ -207,11 +204,11 @@ public class ResultStatusModalPage exten
// sorted in reversed presentation order
final List<String> head = new ArrayList<String>();
if (attributable instanceof UserTO) {
- head.add(ConnidAttribute.PASSWORD);
- head.add(ConnidAttribute.ENABLE);
+ head.add(ConnIdSpecialAttributeName.PASSWORD);
+ head.add(ConnIdSpecialAttributeName.ENABLE);
}
- head.add(ConnidAttribute.UID);
- head.add(ConnidAttribute.NAME);
+ head.add(ConnIdSpecialAttributeName.UID);
+ head.add(ConnIdSpecialAttributeName.NAME);
final Map<String, AttributeTO> beforeAttrMap;
if (before == null) {
@@ -232,8 +229,8 @@ public class ResultStatusModalPage exten
attributes.addAll(afterAttrMap.keySet());
if (!(attributable instanceof UserTO)) {
- attributes.remove(ConnidAttribute.PASSWORD);
- attributes.remove(ConnidAttribute.ENABLE);
+ attributes.remove(ConnIdSpecialAttributeName.PASSWORD);
+ attributes.remove(ConnIdSpecialAttributeName.ENABLE);
}
final List<String> profile = new ArrayList<String>();
@@ -257,7 +254,7 @@ public class ResultStatusModalPage exten
final Fragment beforeValue;
final Fragment afterValue;
- if (ConnidAttribute.ENABLE.equals(name)) {
+ if (ConnIdSpecialAttributeName.ENABLE.equals(name)) {
beforeValue = getStatusIcon("beforeValue", propTO.getResource(), before);
afterValue = getStatusIcon("afterValue", propTO.getResource(), after);
} else {
@@ -289,7 +286,7 @@ public class ResultStatusModalPage exten
if (attr == null || attr.getValues() == null || attr.getValues().isEmpty()) {
value = "";
} else {
- if (ConnidAttribute.PASSWORD.equals(attrName)) {
+ if (ConnIdSpecialAttributeName.PASSWORD.equals(attrName)) {
value = "********";
} else {
value = attr.getValues().size() > 1
@@ -328,15 +325,15 @@ public class ResultStatusModalPage exten
switch (statusUtils.getStatusBean(resourceName, objectTO).getStatus()) {
case ACTIVE:
- image = new Image("status", IMG_STATUES + StatusUtils.Status.ACTIVE.toString()
- + SyncopeConstants.DEFAULT_IMG_SUFFIX);
+ image = new Image("status", IMG_STATUSES + StatusUtils.Status.ACTIVE.toString()
+ + Constants.PNG_EXT);
alt = "active icon";
title = "Enabled";
break;
case SUSPENDED:
- image = new Image("status", IMG_STATUES + StatusUtils.Status.SUSPENDED.toString()
- + SyncopeConstants.DEFAULT_IMG_SUFFIX);
+ image = new Image("status", IMG_STATUSES + StatusUtils.Status.SUSPENDED.toString()
+ + Constants.PNG_EXT);
alt = "inactive icon";
title = "Disabled";
break;
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java?rev=1484097&r1=1484096&r2=1484097&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java Sat May 18 12:08:15 2013
@@ -23,6 +23,7 @@ import java.util.List;
import org.apache.syncope.common.mod.RoleMod;
import org.apache.syncope.common.to.RoleTO;
import org.apache.syncope.common.util.AttributableOperations;
+import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.pages.panels.RolePanel;
import org.apache.syncope.console.rest.RoleRestClient;
import org.apache.wicket.PageReference;
@@ -111,7 +112,7 @@ public class RoleModalPage extends BaseM
closeAction(target, form);
} catch (Exception e) {
- error(getString("error") + ":" + e.getMessage());
+ error(getString(Constants.ERROR) + ":" + e.getMessage());
target.add(feedbackPanel);
}
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Roles.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Roles.java?rev=1484097&r1=1484096&r2=1484097&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Roles.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Roles.java Sat May 18 12:08:15 2013
@@ -19,6 +19,7 @@
package org.apache.syncope.console.pages;
import org.apache.syncope.common.search.NodeCond;
+import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.pages.panels.AbstractSearchResultPanel;
import org.apache.syncope.console.pages.panels.RoleSearchPanel;
import org.apache.syncope.console.pages.panels.RoleSearchResultPanel;
@@ -86,7 +87,7 @@ public class Roles extends BasePage {
send(getPage(), Broadcast.BREADTH, data);
if (modalResult) {
- getSession().info(getString("operation_succeeded"));
+ getSession().info(getString(Constants.OPERATION_SUCCEEDED));
target.add(feedbackPanel);
modalResult = false;
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java?rev=1484097&r1=1484096&r2=1484097&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java Sat May 18 12:08:15 2013
@@ -284,7 +284,7 @@ public class Schema extends BasePage {
break;
}
- info(getString("operation_succeeded"));
+ info(getString(Constants.OPERATION_SUCCEEDED));
target.add(feedbackPanel);
target.add(webContainer);
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java?rev=1484097&r1=1484096&r2=1484097&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java Sat May 18 12:08:15 2013
@@ -253,7 +253,7 @@ public class SchemaModalPage extends Abs
window.close(target);
} catch (SyncopeClientCompositeErrorException e) {
- error(getString("error") + ":" + e.getMessage());
+ error(getString(Constants.ERROR) + ":" + e.getMessage());
target.add(feedbackPanel);
}
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/StatusModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/StatusModalPage.java?rev=1484097&r1=1484096&r2=1484097&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/StatusModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/StatusModalPage.java Sat May 18 12:08:15 2013
@@ -22,6 +22,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.syncope.common.to.AbstractAttributableTO;
import org.apache.syncope.common.to.UserTO;
+import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.commons.StatusBean;
import org.apache.syncope.console.pages.panels.StatusPanel;
import org.apache.syncope.console.rest.UserRestClient;
@@ -75,7 +76,7 @@ public class StatusModalPage extends Bas
window.close(target);
} catch (Exception e) {
LOG.error("Error disabling resources", e);
- error(getString("error") + ":" + e.getMessage());
+ error(getString(Constants.ERROR) + ":" + e.getMessage());
target.add(feedbackPanel);
}
}
@@ -111,7 +112,7 @@ public class StatusModalPage extends Bas
window.close(target);
} catch (Exception e) {
LOG.error("Error enabling resources", e);
- error(getString("error") + ":" + e.getMessage());
+ error(getString(Constants.ERROR) + ":" + e.getMessage());
target.add(feedbackPanel);
}
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/TaskModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/TaskModalPage.java?rev=1484097&r1=1484096&r2=1484097&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/TaskModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/TaskModalPage.java Sat May 18 12:08:15 2013
@@ -29,6 +29,7 @@ import org.apache.syncope.common.to.Sync
import org.apache.syncope.common.to.TaskExecTO;
import org.apache.syncope.common.to.TaskTO;
import org.apache.syncope.common.validation.SyncopeClientCompositeErrorException;
+import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.commons.SortableDataProviderComparator;
import org.apache.syncope.console.rest.TaskRestClient;
import org.apache.syncope.console.wicket.extensions.markup.html.repeater.data.table.ActionColumn;
@@ -153,7 +154,7 @@ public abstract class TaskModalPage exte
taskTO.removeExecution(taskExecutionTO);
- info(getString("operation_succeeded"));
+ info(getString(Constants.OPERATION_SUCCEEDED));
} catch (SyncopeClientCompositeErrorException scce) {
error(scce.getMessage());
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Todo.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Todo.java?rev=1484097&r1=1484096&r2=1484097&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Todo.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Todo.java Sat May 18 12:08:15 2013
@@ -147,9 +147,9 @@ public class Todo extends BasePage {
public void onClick(final AjaxRequestTarget target) {
try {
approvalRestClient.claimForm(formTO.getTaskId());
- info(getString("operation_succeeded"));
+ info(getString(Constants.OPERATION_SUCCEEDED));
} catch (SyncopeClientCompositeErrorException scee) {
- error(getString("error") + ":" + scee.getMessage());
+ error(getString(Constants.ERROR) + ":" + scee.getMessage());
}
target.add(feedbackPanel);
target.add(approvalContainer);
@@ -288,7 +288,7 @@ public class Todo extends BasePage {
return;
}
- info(getString("operation_succeeded"));
+ info(getString(Constants.OPERATION_SUCCEEDED));
target.add(feedbackPanel);
target.add(userRequestContainer);
@@ -310,7 +310,7 @@ public class Todo extends BasePage {
return;
}
- info(getString("operation_succeeded"));
+ info(getString(Constants.OPERATION_SUCCEEDED));
target.add(feedbackPanel);
target.add(userRequestContainer);
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java?rev=1484097&r1=1484096&r2=1484097&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java Sat May 18 12:08:15 2013
@@ -19,6 +19,7 @@
package org.apache.syncope.console.pages;
import org.apache.syncope.common.to.UserTO;
+import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.pages.panels.AttributesPanel;
import org.apache.syncope.console.pages.panels.DerivedAttributesPanel;
import org.apache.syncope.console.pages.panels.MembershipsPanel;
@@ -194,7 +195,7 @@ public abstract class UserModalPage exte
closeAction(target, form);
} catch (Exception e) {
LOG.error("While creating or updating user", e);
- error(getString("error") + ":" + e.getMessage());
+ error(getString(Constants.ERROR) + ":" + e.getMessage());
target.add(feedbackPanel);
}
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Users.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Users.java?rev=1484097&r1=1484096&r2=1484097&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Users.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Users.java Sat May 18 12:08:15 2013
@@ -20,6 +20,7 @@ package org.apache.syncope.console.pages
import org.apache.syncope.common.search.NodeCond;
import org.apache.syncope.common.to.UserTO;
+import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.pages.panels.AbstractSearchResultPanel;
import org.apache.syncope.console.pages.panels.AbstractSearchResultPanel.EventDataWrapper;
import org.apache.syncope.console.pages.panels.UserSearchPanel;
@@ -157,7 +158,7 @@ public class Users extends BasePage {
// reset modal result
setModalResult(false);
// set operation succeeded
- getSession().info(getString("operation_succeeded"));
+ getSession().info(getString(Constants.OPERATION_SUCCEEDED));
// refresh feedback panel
target.add(feedbackPanel);
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/VirtualSchemaModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/VirtualSchemaModalPage.java?rev=1484097&r1=1484096&r2=1484097&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/VirtualSchemaModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/VirtualSchemaModalPage.java Sat May 18 12:08:15 2013
@@ -22,6 +22,7 @@ import org.apache.syncope.common.Abstrac
import org.apache.syncope.common.to.VirtualSchemaTO;
import org.apache.syncope.common.types.AttributableType;
import org.apache.syncope.common.validation.SyncopeClientCompositeErrorException;
+import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel;
import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
import org.apache.wicket.PageReference;
@@ -86,7 +87,7 @@ public class VirtualSchemaModalPage exte
window.close(target);
} catch (SyncopeClientCompositeErrorException e) {
- error(getString("error") + ":" + e.getMessage());
+ error(getString(Constants.ERROR) + ":" + e.getMessage());
target.add(feedbackPanel);
}
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractSearchResultPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractSearchResultPanel.java?rev=1484097&r1=1484096&r2=1484097&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractSearchResultPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractSearchResultPanel.java Sat May 18 12:08:15 2013
@@ -309,7 +309,7 @@ public abstract class AbstractSearchResu
// reset modal result
page.setModalResult(false);
// set operation succeeded
- getSession().info(getString("operation_succeeded"));
+ getSession().info(getString(Constants.OPERATION_SUCCEEDED));
// refresh feedback panel
target.add(feedbackPanel);
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractTasks.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractTasks.java?rev=1484097&r1=1484096&r2=1484097&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractTasks.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractTasks.java Sat May 18 12:08:15 2013
@@ -1,17 +1,20 @@
/*
- * Copyright 2013 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * 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
*
- * 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.
+ * 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 org.apache.syncope.console.pages.panels;
@@ -29,10 +32,6 @@ public abstract class AbstractTasks exte
protected static final String TASKS = "Tasks";
- protected static final String FEEDBACK = "feedback";
-
- protected final String OPERATION_SUCCEEDED = getString("operation_succeeded");
-
protected static final int WIN_HEIGHT = 500;
protected static final int WIN_WIDTH = 700;
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AjaxDataTablePanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AjaxDataTablePanel.java?rev=1484097&r1=1484096&r2=1484097&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AjaxDataTablePanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AjaxDataTablePanel.java Sat May 18 12:08:15 2013
@@ -21,6 +21,7 @@ package org.apache.syncope.console.pages
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.pages.AbstractBasePage;
import org.apache.syncope.console.pages.BulkActionModalPage;
import org.apache.syncope.console.pages.panels.AbstractSearchResultPanel.EventDataWrapper;
@@ -113,7 +114,7 @@ public class AjaxDataTablePanel<T, S> ex
// reset modal result
page.setModalResult(false);
// set operation succeeded
- getSession().info(getString("operation_succeeded"));
+ getSession().info(getString(Constants.OPERATION_SUCCEEDED));
// refresh feedback panel
target.add(page.getFeedbackPanel());
}
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=1484097&r1=1484096&r2=1484097&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 Sat May 18 12:08:15 2013
@@ -131,12 +131,12 @@ public class NotificationTasks extends A
public void onClick(final AjaxRequestTarget target) {
try {
restClient.startExecution(taskTO.getId(), false);
- getSession().info(OPERATION_SUCCEEDED);
+ getSession().info(getString(Constants.OPERATION_SUCCEEDED));
} catch (SyncopeClientCompositeErrorException scce) {
error(scce.getMessage());
}
- target.add(getPage().get(FEEDBACK));
+ target.add(getPage().get(Constants.FEEDBACK));
target.add(container);
}
}, ActionLink.ActionType.EXECUTE, TASKS);
@@ -149,12 +149,12 @@ public class NotificationTasks extends A
public void onClick(final AjaxRequestTarget target) {
try {
restClient.delete(taskTO.getId(), NotificationTaskTO.class);
- info(OPERATION_SUCCEEDED);
+ info(getString(Constants.OPERATION_SUCCEEDED));
} catch (SyncopeClientCompositeErrorException scce) {
error(scce.getMessage());
}
target.add(container);
- target.add(getPage().get(FEEDBACK));
+ target.add(getPage().get(Constants.FEEDBACK));
}
}, ActionLink.ActionType.DELETE, TASKS);
@@ -199,8 +199,8 @@ public class NotificationTasks extends A
public void onClose(final AjaxRequestTarget target) {
target.add(container);
if (operationResult) {
- info(OPERATION_SUCCEEDED);
- target.add(getPage().get(FEEDBACK));
+ info(getString(Constants.OPERATION_SUCCEEDED));
+ target.add(getPage().get(Constants.FEEDBACK));
operationResult = false;
}
}
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=1484097&r1=1484096&r2=1484097&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 Sat May 18 12:08:15 2013
@@ -181,7 +181,7 @@ public class PoliciesPanel extends Panel
try {
policyRestClient.delete(accountPolicyTO.getId(), accountPolicyTO.getClass());
- info(getString("operation_succeeded"));
+ info(getString(Constants.OPERATION_SUCCEEDED));
} catch (SyncopeClientCompositeErrorException e) {
error(getString("operation_error"));
@@ -191,7 +191,7 @@ public class PoliciesPanel extends Panel
}
target.add(container);
- target.add(getPage().get("feedback"));
+ target.add(getPage().get(Constants.FEEDBACK));
}
}, ActionLink.ActionType.DELETE, "Policies");
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=1484097&r1=1484096&r2=1484097&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 Sat May 18 12:08:15 2013
@@ -152,12 +152,12 @@ public class PropagationTasks extends Ab
public void onClick(final AjaxRequestTarget target) {
try {
restClient.startExecution(taskTO.getId(), false);
- getSession().info(OPERATION_SUCCEEDED);
+ getSession().info(getString(Constants.OPERATION_SUCCEEDED));
} catch (SyncopeClientCompositeErrorException scce) {
error(scce.getMessage());
}
- target.add(getPage().get(FEEDBACK));
+ target.add(getPage().get(Constants.FEEDBACK));
target.add(container);
}
}, ActionLink.ActionType.EXECUTE, TASKS);
@@ -170,12 +170,12 @@ public class PropagationTasks extends Ab
public void onClick(final AjaxRequestTarget target) {
try {
restClient.delete(taskTO.getId(), PropagationTaskTO.class);
- info(OPERATION_SUCCEEDED);
+ info(getString(Constants.OPERATION_SUCCEEDED));
} catch (SyncopeClientCompositeErrorException scce) {
error(scce.getMessage());
}
target.add(container);
- target.add(getPage().get(FEEDBACK));
+ target.add(getPage().get(Constants.FEEDBACK));
}
}, ActionLink.ActionType.DELETE, TASKS);
@@ -218,8 +218,8 @@ public class PropagationTasks extends Ab
public void onClose(final AjaxRequestTarget target) {
target.add(container);
if (operationResult) {
- info(OPERATION_SUCCEEDED);
- target.add(getPage().get(FEEDBACK));
+ info(getString(Constants.OPERATION_SUCCEEDED));
+ target.add(getPage().get(Constants.FEEDBACK));
operationResult = false;
}
}
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=1484097&r1=1484096&r2=1484097&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 Sat May 18 12:08:15 2013
@@ -141,12 +141,12 @@ public class SchedTasks extends Abstract
public void onClick(final AjaxRequestTarget target) {
try {
restClient.startExecution(taskTO.getId(), false);
- getSession().info(OPERATION_SUCCEEDED);
+ getSession().info(getString(Constants.OPERATION_SUCCEEDED));
} catch (SyncopeClientCompositeErrorException scce) {
error(scce.getMessage());
}
- target.add(getPage().get(FEEDBACK));
+ target.add(getPage().get(Constants.FEEDBACK));
target.add(container);
}
}, ActionLink.ActionType.EXECUTE, TASKS);
@@ -159,12 +159,12 @@ public class SchedTasks extends Abstract
public void onClick(final AjaxRequestTarget target) {
try {
restClient.startExecution(taskTO.getId(), true);
- getSession().info(OPERATION_SUCCEEDED);
+ getSession().info(getString(Constants.OPERATION_SUCCEEDED));
} catch (SyncopeClientCompositeErrorException scce) {
error(scce.getMessage());
}
- target.add(getPage().get(FEEDBACK));
+ target.add(getPage().get(Constants.FEEDBACK));
target.add(container);
}
}, ActionLink.ActionType.DRYRUN, TASKS);
@@ -177,12 +177,12 @@ public class SchedTasks extends Abstract
public void onClick(final AjaxRequestTarget target) {
try {
restClient.delete(taskTO.getId(), SchedTaskTO.class);
- info(OPERATION_SUCCEEDED);
+ info(getString(Constants.OPERATION_SUCCEEDED));
} catch (SyncopeClientCompositeErrorException scce) {
error(scce.getMessage());
}
target.add(container);
- target.add(getPage().get(FEEDBACK));
+ target.add(getPage().get(Constants.FEEDBACK));
}
}, ActionLink.ActionType.DELETE, TASKS);
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/StatusPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/StatusPanel.java?rev=1484097&r1=1484096&r2=1484097&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/StatusPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/StatusPanel.java Sat May 18 12:08:15 2013
@@ -24,12 +24,12 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
-import org.apache.syncope.common.SyncopeConstants;
import org.apache.syncope.common.to.AbstractAttributableTO;
import org.apache.syncope.common.to.ConnObjectTO;
import org.apache.syncope.common.to.PropagationRequestTO;
import org.apache.syncope.common.to.RoleTO;
import org.apache.syncope.common.to.UserTO;
+import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.commons.StatusBean;
import org.apache.syncope.console.commons.StatusUtils;
import org.apache.syncope.console.commons.StatusUtils.Status;
@@ -166,21 +166,21 @@ public class StatusPanel extends Panel i
case NOT_YET_SUBMITTED:
image = new Image("icon", IMG_STATUES + StatusUtils.Status.UNDEFINED.toString()
- + SyncopeConstants.DEFAULT_IMG_SUFFIX);
+ + Constants.PNG_EXT);
alt = "undefined icon";
title = "Not yet submitted";
break;
case ACTIVE:
image = new Image("icon", IMG_STATUES + StatusUtils.Status.ACTIVE.toString()
- + SyncopeConstants.DEFAULT_IMG_SUFFIX);
+ + Constants.PNG_EXT);
alt = "active icon";
title = "Enabled";
break;
case UNDEFINED:
image = new Image("icon", IMG_STATUES + StatusUtils.Status.UNDEFINED.toString()
- + SyncopeConstants.DEFAULT_IMG_SUFFIX);
+ + Constants.PNG_EXT);
checkVisibility = false;
alt = "undefined icon";
title = "Undefined status";
@@ -189,7 +189,7 @@ public class StatusPanel extends Panel i
case OBJECT_NOT_FOUND:
image =
new Image("icon", IMG_STATUES + StatusUtils.Status.OBJECT_NOT_FOUND.toString()
- + SyncopeConstants.DEFAULT_IMG_SUFFIX);
+ + Constants.PNG_EXT);
checkVisibility = false;
alt = "notfound icon";
title = "User not found";
@@ -197,7 +197,7 @@ public class StatusPanel extends Panel i
default:
image = new Image("icon", IMG_STATUES + StatusUtils.Status.SUSPENDED.toString()
- + SyncopeConstants.DEFAULT_IMG_SUFFIX);
+ + Constants.PNG_EXT);
alt = "inactive icon";
title = "Disabled";
}
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=1484097&r1=1484096&r2=1484097&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 Sat May 18 12:08:15 2013
@@ -185,13 +185,13 @@ public class SyncTasks extends AbstractT
public void onClick(final AjaxRequestTarget target) {
try {
restClient.startExecution(taskTO.getId(), false);
- getSession().info(OPERATION_SUCCEEDED);
+ getSession().info(getString(Constants.OPERATION_SUCCEEDED));
} catch (SyncopeClientCompositeErrorException scce) {
error(scce.getMessage());
}
target.add(container);
- target.add(getPage().get(FEEDBACK));
+ target.add(getPage().get(Constants.FEEDBACK));
}
}, ActionLink.ActionType.EXECUTE, TASKS);
@@ -203,13 +203,13 @@ public class SyncTasks extends AbstractT
public void onClick(final AjaxRequestTarget target) {
try {
restClient.startExecution(taskTO.getId(), true);
- getSession().info(OPERATION_SUCCEEDED);
+ getSession().info(getString(Constants.OPERATION_SUCCEEDED));
} catch (SyncopeClientCompositeErrorException scce) {
error(scce.getMessage());
}
target.add(container);
- target.add(getPage().get(FEEDBACK));
+ target.add(getPage().get(Constants.FEEDBACK));
}
}, ActionLink.ActionType.DRYRUN, TASKS);
@@ -221,12 +221,12 @@ public class SyncTasks extends AbstractT
public void onClick(final AjaxRequestTarget target) {
try {
restClient.delete(taskTO.getId(), SyncTaskTO.class);
- info(OPERATION_SUCCEEDED);
+ info(getString(Constants.OPERATION_SUCCEEDED));
} catch (SyncopeClientCompositeErrorException scce) {
error(scce.getMessage());
}
target.add(container);
- target.add(getPage().get(FEEDBACK));
+ target.add(getPage().get(Constants.FEEDBACK));
}
}, ActionLink.ActionType.DELETE, TASKS);
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/markup/html/CrontabContainer.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/markup/html/CrontabContainer.properties?rev=1484097&r1=1484096&r2=1484097&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/markup/html/CrontabContainer.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/markup/html/CrontabContainer.properties Sat May 18 12:08:15 2013
@@ -1,17 +1,19 @@
-# Copyright 2013 The Apache Software Foundation.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
#
-# 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
#
-# 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.
-
+# 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.
selOpt1=Unschedule
selOpt2=Every 5 minutes
selOpt3=Fire at 12pm (noon) every day
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/markup/html/CrontabContainer_it.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/markup/html/CrontabContainer_it.properties?rev=1484097&r1=1484096&r2=1484097&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/markup/html/CrontabContainer_it.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/markup/html/CrontabContainer_it.properties Sat May 18 12:08:15 2013
@@ -1,17 +1,19 @@
-# Copyright 2013 The Apache Software Foundation.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
#
-# 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
#
-# 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.
-
+# 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.
selOpt1=Non schedulato
selOpt2=Ogni 5 minuti
selOpt3=Lanciato ogni giorno a mezzanotte