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 2015/02/05 17:01:21 UTC
[50/52] syncope git commit: [SYNCOPE-620] Console working,
Selenium IT in
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/java/org/apache/syncope/client/console/pages/Schema.java
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/pages/Schema.java b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/pages/Schema.java
index 8852862..2e26ded 100644
--- a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/pages/Schema.java
+++ b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/pages/Schema.java
@@ -88,10 +88,10 @@ public class Schema extends BasePage {
private static final long serialVersionUID = 3109256773218160485L;
{
- put(SchemaType.PLAIN, Arrays.asList(new String[] { "name", "type",
+ put(SchemaType.PLAIN, Arrays.asList(new String[] { "key", "type",
"mandatoryCondition", "uniqueConstraint", "multivalue", "readonly" }));
- put(SchemaType.DERIVED, Arrays.asList(new String[] { "name", "expression" }));
- put(SchemaType.VIRTUAL, Arrays.asList(new String[] { "name", "readonly" }));
+ put(SchemaType.DERIVED, Arrays.asList(new String[] { "key", "expression" }));
+ put(SchemaType.VIRTUAL, Arrays.asList(new String[] { "key", "readonly" }));
}
};
@@ -210,7 +210,7 @@ public class Schema extends BasePage {
@Override
public String getCssClass() {
String css = super.getCssClass();
- if ("name".equals(field)) {
+ if ("key".equals(field)) {
css = StringUtils.isBlank(css)
? "medium_fixedsize"
: css + " medium_fixedsize";
@@ -282,7 +282,7 @@ public class Schema extends BasePage {
break;
default:
- restClient.deleteSchema(attributableType, schemaTO.getKey());
+ restClient.deletePlainSchema(attributableType, schemaTO.getKey());
break;
}
@@ -377,9 +377,9 @@ public class Schema extends BasePage {
this.schemaType = schemaType;
// Default sorting
- setSort("name", SortOrder.ASCENDING);
+ setSort("key", SortOrder.ASCENDING);
- comparator = new SortableDataProviderComparator<AbstractSchemaTO>(this);
+ comparator = new SortableDataProviderComparator<>(this);
}
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/java/org/apache/syncope/client/console/pages/StatusModalPage.java
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/pages/StatusModalPage.java b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/pages/StatusModalPage.java
index 7580f64..9d0ede2 100644
--- a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/pages/StatusModalPage.java
+++ b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/pages/StatusModalPage.java
@@ -119,7 +119,10 @@ public class StatusModalPage<T extends AbstractSubjectTO> extends AbstractStatus
statusUtils = new StatusUtils(subjectTO instanceof UserTO ? userRestClient : roleRestClient);
- columns = new ArrayList<IColumn<StatusBean, String>>();
+ add(new Label("displayName", subjectTO.getKey() + " "
+ + (subjectTO instanceof UserTO ? ((UserTO) subjectTO).getUsername() : ((RoleTO) subjectTO).getName())));
+
+ columns = new ArrayList<>();
columns.add(new AbstractColumn<StatusBean, String>(
new StringResourceModel("resourceName", this, null, "Resource name"), "resourceName") {
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/java/org/apache/syncope/client/console/pages/TaskModalPage.java
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/pages/TaskModalPage.java b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/pages/TaskModalPage.java
index cd4e812..c251d87 100644
--- a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/pages/TaskModalPage.java
+++ b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/pages/TaskModalPage.java
@@ -75,8 +75,8 @@ public abstract class TaskModalPage extends BaseModalPage {
taskExecMessageWin.setCookieName("task-exec-message-win-modal");
add(taskExecMessageWin);
- form = new Form<AbstractTaskTO>(FORM);
- form.setModel(new CompoundPropertyModel<AbstractTaskTO>(taskTO));
+ form = new Form<>(FORM);
+ form.setModel(new CompoundPropertyModel<>(taskTO));
add(form);
profile = new WebMarkupContainer("profile");
@@ -87,27 +87,23 @@ public abstract class TaskModalPage extends BaseModalPage {
executions.setOutputMarkupId(true);
form.add(executions);
- final Label idLabel = new Label("idLabel", new ResourceModel("id"));
+ final Label idLabel = new Label("idLabel", new ResourceModel("key"));
profile.add(idLabel);
final AjaxTextFieldPanel id =
- new AjaxTextFieldPanel("id", getString("id"), new PropertyModel<String>(taskTO, "id"));
+ new AjaxTextFieldPanel("key", getString("key"), new PropertyModel<String>(taskTO, "key"));
id.setEnabled(false);
profile.add(id);
- final List<IColumn<TaskExecTO, String>> columns = new ArrayList<IColumn<TaskExecTO, String>>();
+ final List<IColumn<TaskExecTO, String>> columns = new ArrayList<>();
final int paginatorRows = 10;
- columns.add(new PropertyColumn<TaskExecTO, String>(new ResourceModel("id"), "id", "id"));
-
+ columns.add(new PropertyColumn<TaskExecTO, String>(new ResourceModel("key"), "key", "key"));
columns.add(new DatePropertyColumn<TaskExecTO>(new ResourceModel("startDate"), "startDate", "startDate"));
-
columns.add(new DatePropertyColumn<TaskExecTO>(new ResourceModel("endDate"), "endDate", "endDate"));
-
columns.add(new PropertyColumn<TaskExecTO, String>(new ResourceModel("status"), "status", "status"));
-
columns.add(new ActionColumn<TaskExecTO, String>(new ResourceModel("actions", "")) {
private static final long serialVersionUID = 2054811145491901166L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/java/org/apache/syncope/client/console/pages/Tasks.java
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/pages/Tasks.java b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/pages/Tasks.java
index 948af72..296c365 100644
--- a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/pages/Tasks.java
+++ b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/pages/Tasks.java
@@ -141,8 +141,8 @@ public class Tasks extends BasePage {
super();
//Default sorting
- setSort("id", SortOrder.DESCENDING);
- comparator = new SortableDataProviderComparator<T>(this);
+ setSort("key", SortOrder.DESCENDING);
+ comparator = new SortableDataProviderComparator<>(this);
this.paginatorRows = paginatorRows;
this.restClient = restClient;
this.id = id;
@@ -151,7 +151,7 @@ public class Tasks extends BasePage {
@Override
public Iterator<T> iterator(final long first, final long count) {
- final List<T> tasks = new ArrayList<T>();
+ final List<T> tasks = new ArrayList<>();
final int page = ((int) first / paginatorRows);
@@ -184,7 +184,7 @@ public class Tasks extends BasePage {
@Override
public IModel<T> model(final T object) {
- return new CompoundPropertyModel<T>(object);
+ return new CompoundPropertyModel<>(object);
}
}
@@ -208,7 +208,7 @@ public class Tasks extends BasePage {
final BaseRestClient restClient) {
@SuppressWarnings("unchecked")
- final AjaxDataTablePanel<AbstractTaskTO, String> table = new AjaxDataTablePanel<AbstractTaskTO, String>(
+ final AjaxDataTablePanel<AbstractTaskTO, String> table = new AjaxDataTablePanel<>(
"datatable",
columns,
(ISortableDataProvider<AbstractTaskTO, String>) dataProvider,
@@ -216,7 +216,7 @@ public class Tasks extends BasePage {
Arrays.asList(new ActionLink.ActionType[] {
ActionLink.ActionType.DELETE, ActionLink.ActionType.DRYRUN, ActionLink.ActionType.EXECUTE }),
restClient,
- "id",
+ "key",
TASKS,
pageRef);
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/java/org/apache/syncope/client/console/pages/UserModalPage.java
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/pages/UserModalPage.java b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/pages/UserModalPage.java
index 7319c38..0215538 100644
--- a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/pages/UserModalPage.java
+++ b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/pages/UserModalPage.java
@@ -18,6 +18,7 @@
*/
package org.apache.syncope.client.console.pages;
+import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.commons.Mode;
import org.apache.syncope.client.console.panels.DerAttrsPanel;
@@ -93,12 +94,12 @@ public abstract class UserModalPage extends BaseModalPage {
@SuppressWarnings({ "unchecked", "rawtypes" })
protected Form setupEditPanel() {
fragment.add(new Label("id", userTO.getKey() == 0
- ? ""
+ ? StringUtils.EMPTY
: userTO.getUsername()));
fragment.add(new Label("new", userTO.getKey() == 0
? new ResourceModel("new")
- : new Model("")));
+ : new Model(StringUtils.EMPTY)));
final Form form = new Form("UserForm");
form.setModel(new CompoundPropertyModel(userTO));
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/java/org/apache/syncope/client/console/pages/Users.java
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/pages/Users.java b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/pages/Users.java
index ed8419e..98f93bf 100644
--- a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/pages/Users.java
+++ b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/pages/Users.java
@@ -95,7 +95,7 @@ public class Users extends BasePage {
setWindowClosedReloadCallback(editModalWin);
- final Form searchForm = new Form("searchForm");
+ final Form<?> searchForm = new Form<>("searchForm");
add(searchForm);
final UserSearchPanel searchPanel = new UserSearchPanel.Builder("searchPanel").build();
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/java/org/apache/syncope/client/console/pages/VirSchemaModalPage.java
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/pages/VirSchemaModalPage.java b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/pages/VirSchemaModalPage.java
index daa65d6..425b9cb 100644
--- a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/pages/VirSchemaModalPage.java
+++ b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/pages/VirSchemaModalPage.java
@@ -54,12 +54,12 @@ public class VirSchemaModalPage extends AbstractSchemaModalPage<VirSchemaTO> {
schema = new VirSchemaTO();
}
- final Form<VirSchemaTO> schemaForm = new Form<VirSchemaTO>(FORM);
+ final Form<VirSchemaTO> schemaForm = new Form<>(FORM);
- schemaForm.setModel(new CompoundPropertyModel<VirSchemaTO>(schema));
+ schemaForm.setModel(new CompoundPropertyModel<>(schema));
- final AjaxTextFieldPanel name = new AjaxTextFieldPanel("name", getString("name"), new PropertyModel<String>(
- schema, "name"));
+ final AjaxTextFieldPanel name =
+ new AjaxTextFieldPanel("key", getString("key"), new PropertyModel<String>(schema, "key"));
name.addRequiredLabel();
name.setEnabled(createFlag);
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractSearchPanel.java
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractSearchPanel.java b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractSearchPanel.java
index aa30fae..d610739 100644
--- a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractSearchPanel.java
+++ b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractSearchPanel.java
@@ -131,11 +131,11 @@ public abstract class AbstractSearchPanel extends Panel {
searchFeedback.setOutputMarkupId(true);
add(searchFeedback);
- this.searchClauses = new ArrayList<SearchClause>();
+ this.searchClauses = new ArrayList<>();
this.searchClauses.add(new SearchClause());
if (StringUtils.isNotBlank(fiql)) {
try {
- FiqlParser<SearchBean> fiqlParser = new FiqlParser<SearchBean>(
+ FiqlParser<SearchBean> fiqlParser = new FiqlParser<>(
SearchBean.class, SyncopeFiqlSearchConditionBuilder.CONTEXTUAL_PROPERTIES);
List<SearchClause> parsed = getSearchClauses(fiqlParser.parse(fiql));
@@ -158,8 +158,8 @@ public abstract class AbstractSearchPanel extends Panel {
@Override
protected List<String> load() {
- return SearchableFields.get(attributableType == AttributableType.USER
- ? SubjectType.USER : SubjectType.ROLE);
+ return SearchableFields.get(
+ attributableType == AttributableType.USER ? SubjectType.USER : SubjectType.ROLE);
}
};
@@ -169,7 +169,7 @@ public abstract class AbstractSearchPanel extends Panel {
@Override
protected List<String> load() {
- return schemaRestClient.getSchemaNames(attributableType);
+ return schemaRestClient.getPlainSchemaNames(attributableType);
}
};
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractSearchResultPanel.java
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractSearchResultPanel.java b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractSearchResultPanel.java
index 386392c..6139ee4 100644
--- a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractSearchResultPanel.java
+++ b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractSearchResultPanel.java
@@ -205,10 +205,10 @@ public abstract class AbstractSearchResultPanel extends Panel implements IEventS
// ---------------------------
// Rows-per-page selector
// ---------------------------
- final Form paginatorForm = new Form("paginator");
+ final Form<?> paginatorForm = new Form<>("paginator");
container.add(paginatorForm);
- final DropDownChoice<Integer> rowsChooser = new DropDownChoice<Integer>(
+ final DropDownChoice<Integer> rowsChooser = new DropDownChoice<>(
"rowsChooser", new PropertyModel<Integer>(this, "rows"), prefMan.getPaginatorChoices());
rowsChooser.add(new AjaxFormComponentUpdatingBehavior(Constants.ON_CHANGE) {
@@ -254,14 +254,14 @@ public abstract class AbstractSearchResultPanel extends Panel implements IEventS
: (int) resultTable.getCurrentPage())
: 0;
- resultTable = new AjaxDataTablePanel<AbstractAttributableTO, String>(
+ resultTable = new AjaxDataTablePanel<>(
"resultTable",
getColumns(),
dataProvider,
rows,
getBulkActions(),
restClient,
- "id",
+ "key",
getPageId(),
page.getPageReference());
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/AttrTemplatesPanel.java
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/AttrTemplatesPanel.java b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/AttrTemplatesPanel.java
index b9162da..1601ca7 100644
--- a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/AttrTemplatesPanel.java
+++ b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/AttrTemplatesPanel.java
@@ -41,7 +41,7 @@ public class AttrTemplatesPanel extends Panel {
public enum Type {
- rAttrTemplates,
+ rPlainAttrTemplates,
rDerAttrTemplates,
rVirAttrTemplates,
mPlainAttrTemplates,
@@ -67,7 +67,7 @@ public class AttrTemplatesPanel extends Panel {
super(id);
this.roleTO = roleTO;
- rPlainAttrTemplates = buildPalette(Type.rAttrTemplates,
+ rPlainAttrTemplates = buildPalette(Type.rPlainAttrTemplates,
schemaRestClient.getSchemaNames(AttributableType.ROLE, SchemaType.PLAIN));
this.add(rPlainAttrTemplates);
rDerAttrTemplates = buildPalette(Type.rDerAttrTemplates,
@@ -89,7 +89,7 @@ public class AttrTemplatesPanel extends Panel {
if (allSchemas != null && !allSchemas.isEmpty()) {
Collections.sort(allSchemas);
}
- ListModel<String> availableSchemas = new ListModel<String>(allSchemas);
+ ListModel<String> availableSchemas = new ListModel<>(allSchemas);
return new NonI18nPalette<String>(type.name(), new PropertyModel<List<String>>(roleTO, type.name()),
availableSchemas, new SelectChoiceRenderer<String>(), 8, false, true) {
@@ -101,7 +101,7 @@ public class AttrTemplatesPanel extends Panel {
final Recorder<String> recorder = super.newRecorderComponent();
switch (type) {
- case rAttrTemplates:
+ case rPlainAttrTemplates:
case rDerAttrTemplates:
case rVirAttrTemplates:
recorder.add(new AjaxFormComponentUpdatingBehavior(Constants.ON_CHANGE) {
@@ -126,7 +126,7 @@ public class AttrTemplatesPanel extends Panel {
public Collection<String> getSelected(final Type type) {
Collection<String> selected;
switch (type) {
- case rAttrTemplates:
+ case rPlainAttrTemplates:
selected = this.rPlainAttrTemplates.getModelCollection();
break;
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/ImagePanel.java
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/ImagePanel.java b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/ImagePanel.java
index b0b3d9a..7969c63 100644
--- a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/ImagePanel.java
+++ b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/ImagePanel.java
@@ -22,6 +22,7 @@ import org.apache.wicket.Component;
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.html.image.Image;
import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.request.resource.ContextRelativeResource;
public class ImagePanel extends Panel {
@@ -29,7 +30,7 @@ public class ImagePanel extends Panel {
final Image img;
- public ImagePanel(final String id, final String img) {
+ public ImagePanel(final String id, final ContextRelativeResource img) {
super(id);
this.img = new Image("img", img);
add(this.img);
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/LayoutsPanel.java
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/LayoutsPanel.java b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/LayoutsPanel.java
index a68d8cd..26f1894 100644
--- a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/LayoutsPanel.java
+++ b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/LayoutsPanel.java
@@ -75,7 +75,7 @@ public class LayoutsPanel extends Panel {
final AttrTO attrLayout = confRestClient.readAttrLayout(attrLayoutType);
form.setModel(new CompoundPropertyModel(attrLayout.getValues()));
- final List<String> fields = schemaRestClient.getSchemaNames(attrLayoutType.getAttrType());
+ final List<String> fields = schemaRestClient.getPlainSchemaNames(attrLayoutType.getAttrType());
final ListModel<String> selectedFields =
new ListModel<String>(attrLayout.getValues().isEmpty() ? fields : attrLayout.getValues());
final ListModel<String> availableFields = new ListModel<String>(fields);
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/NotificationTasks.java
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/NotificationTasks.java b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/NotificationTasks.java
index 41ac64e..d7f52e1 100644
--- a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/NotificationTasks.java
+++ b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/NotificationTasks.java
@@ -137,10 +137,10 @@ public class NotificationTasks extends AbstractTasks {
}
private List<IColumn<AbstractTaskTO, String>> getColumns() {
- final List<IColumn<AbstractTaskTO, String>> columns = new ArrayList<IColumn<AbstractTaskTO, String>>();
+ final List<IColumn<AbstractTaskTO, String>> columns = new ArrayList<>();
columns.add(new PropertyColumn<AbstractTaskTO, String>(
- new StringResourceModel("id", this, null), "id", "id"));
+ new StringResourceModel("key", this, null), "key", "key"));
columns.add(new PropertyColumn<AbstractTaskTO, String>(
new StringResourceModel("sender", this, null), "sender", "sender"));
columns.add(new PropertyColumn<AbstractTaskTO, String>(
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/PlainAttrsPanel.java
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/PlainAttrsPanel.java b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/PlainAttrsPanel.java
index 34d4f81..8e42318 100644
--- a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/PlainAttrsPanel.java
+++ b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/PlainAttrsPanel.java
@@ -154,11 +154,11 @@ public class PlainAttrsPanel extends Panel {
schemaTOs = schemaRestClient.getSchemas(AttributableType.ROLE);
Set<String> allowed;
if (attrTemplates == null) {
- allowed = new HashSet<>(roleTO.getRAttrTemplates());
+ allowed = new HashSet<>(roleTO.getRPlainAttrTemplates());
} else {
- allowed = new HashSet<>(attrTemplates.getSelected(AttrTemplatesPanel.Type.rAttrTemplates));
+ allowed = new HashSet<>(attrTemplates.getSelected(AttrTemplatesPanel.Type.rPlainAttrTemplates));
if (roleTO.isInheritTemplates() && roleTO.getParent() != 0) {
- allowed.addAll(roleRestClient.read(roleTO.getParent()).getRAttrTemplates());
+ allowed.addAll(roleRestClient.read(roleTO.getParent()).getRPlainAttrTemplates());
}
}
schemaRestClient.filter(schemaTOs, allowed, true);
@@ -169,7 +169,7 @@ public class PlainAttrsPanel extends Panel {
attrLayout = confRestClient.readAttrLayout(AttrLayoutType.valueOf(mode, AttributableType.MEMBERSHIP));
schemaTOs = schemaRestClient.getSchemas(AttributableType.MEMBERSHIP);
Set<String> allowed = new HashSet<>(
- roleRestClient.read(((MembershipTO) entityTO).getRoleId()).getMAttrTemplates());
+ roleRestClient.read(((MembershipTO) entityTO).getRoleId()).getMPlainAttrTemplates());
schemaRestClient.filter(schemaTOs, allowed, true);
} else {
schemas = new TreeMap<>();
@@ -385,7 +385,7 @@ public class PlainAttrsPanel extends Panel {
public void onEvent(final IEvent<?> event) {
if ((event.getPayload() instanceof RoleAttrTemplatesChange)) {
final RoleAttrTemplatesChange update = (RoleAttrTemplatesChange) event.getPayload();
- if (attrTemplates != null && update.getType() == AttrTemplatesPanel.Type.rAttrTemplates) {
+ if (attrTemplates != null && update.getType() == AttrTemplatesPanel.Type.rPlainAttrTemplates) {
setSchemas();
setAttrs();
update.getTarget().add(this);
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/PoliciesPanel.java
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/PoliciesPanel.java b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/PoliciesPanel.java
index 9979ee0..4d66eda 100644
--- a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/PoliciesPanel.java
+++ b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/PoliciesPanel.java
@@ -117,9 +117,9 @@ public class PoliciesPanel extends Panel {
setWindowClosedCallback(mwindow, container);
- final List<IColumn<AbstractPolicyTO, String>> columns = new ArrayList<IColumn<AbstractPolicyTO, String>>();
+ final List<IColumn<AbstractPolicyTO, String>> columns = new ArrayList<>();
- columns.add(new PropertyColumn<AbstractPolicyTO, String>(new ResourceModel("id"), "id", "id"));
+ columns.add(new PropertyColumn<AbstractPolicyTO, String>(new ResourceModel("key"), "key", "key"));
columns.add(new PropertyColumn<AbstractPolicyTO, String>(
new ResourceModel("description"), "description", "description"));
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/PolicyBeanPanel.java
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/PolicyBeanPanel.java b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/PolicyBeanPanel.java
index a46bcd1..67d6684 100644
--- a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/PolicyBeanPanel.java
+++ b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/PolicyBeanPanel.java
@@ -80,7 +80,7 @@ public class PolicyBeanPanel extends Panel {
@Override
protected List<String> load() {
- return schemaRestClient.getSchemaNames(AttributableType.USER);
+ return schemaRestClient.getPlainSchemaNames(AttributableType.USER);
}
};
@@ -90,7 +90,7 @@ public class PolicyBeanPanel extends Panel {
@Override
protected List<String> load() {
- return schemaRestClient.getSchemaNames(AttributableType.ROLE);
+ return schemaRestClient.getPlainSchemaNames(AttributableType.ROLE);
}
};
@@ -183,7 +183,7 @@ public class PolicyBeanPanel extends Panel {
item.add(new Label("field", new Model(null)));
} else if (Collection.class.isAssignableFrom(field.getType())) {
if (field.getSchemaList() != null) {
- final List<String> values = new ArrayList<String>();
+ final List<String> values = new ArrayList<>();
if (field.getName().charAt(0) == 'r') {
values.addAll(roleSchemas.getObject());
@@ -194,13 +194,13 @@ public class PolicyBeanPanel extends Panel {
values.addAll(userSchemas.getObject());
if (field.getSchemaList().extended()) {
- values.add("id");
+ values.add("key");
values.add("username");
}
}
component = new AjaxPalettePanel("field", new PropertyModel(policy, field.getName()),
- new ListModel<String>(values));
+ new ListModel<>(values));
item.add(component);
Collection<?> collection = (Collection) propDesc.getReadMethod().invoke(policy);
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/PropagationTasks.java
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/PropagationTasks.java b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/PropagationTasks.java
index 5a942fd..41fdb03 100644
--- a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/PropagationTasks.java
+++ b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/PropagationTasks.java
@@ -124,8 +124,7 @@ public class PropagationTasks extends AbstractTasks {
table = Tasks.updateTaskTable(
getColumns(),
- new TasksProvider<PropagationTaskTO>(restClient, paginatorRows,
- getId(), PropagationTaskTO.class),
+ new TasksProvider<>(restClient, paginatorRows, getId(), PropagationTaskTO.class),
container,
table == null ? 0 : (int) table.getCurrentPage(),
pageRef,
@@ -140,32 +139,24 @@ public class PropagationTasks extends AbstractTasks {
}
private List<IColumn<AbstractTaskTO, String>> getColumns() {
- final List<IColumn<AbstractTaskTO, String>> columns = new ArrayList<IColumn<AbstractTaskTO, String>>();
+ final List<IColumn<AbstractTaskTO, String>> columns = new ArrayList<>();
columns.add(new PropertyColumn<AbstractTaskTO, String>(
- new StringResourceModel("id", this, null), "id", "id"));
-
+ new StringResourceModel("key", this, null), "key", "key"));
columns.add(new PropertyColumn<AbstractTaskTO, String>(
new StringResourceModel("resource", this, null), "resource", "resource"));
-
columns.add(new PropertyColumn<AbstractTaskTO, String>(
new StringResourceModel("accountId", this, null), "accountId", "accountId"));
-
columns.add(new PropertyColumn<AbstractTaskTO, String>(
new StringResourceModel("propagationMode", this, null), "propagationMode", "propagationMode"));
-
columns.add(new PropertyColumn<AbstractTaskTO, String>(new StringResourceModel(
"propagationOperation", this, null), "propagationOperation", "propagationOperation"));
-
columns.add(new DatePropertyColumn<AbstractTaskTO>(
new StringResourceModel("startDate", this, null), "startDate", "startDate"));
-
columns.add(new DatePropertyColumn<AbstractTaskTO>(
new StringResourceModel("endDate", this, null), "endDate", "endDate"));
-
columns.add(new PropertyColumn<AbstractTaskTO, String>(
new StringResourceModel("latestExecStatus", this, null), "latestExecStatus", "latestExecStatus"));
-
columns.add(new ActionColumn<AbstractTaskTO, String>(new StringResourceModel("actions", this, null, "")) {
private static final long serialVersionUID = 2054811145491901166L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/PushTasksPanel.java
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/PushTasksPanel.java b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/PushTasksPanel.java
index 2d25a83..a93000d 100644
--- a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/PushTasksPanel.java
+++ b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/PushTasksPanel.java
@@ -55,7 +55,7 @@ public class PushTasksPanel extends AbstractProvisioningTasksPanel<PushTaskTO> {
final List<IColumn<AbstractTaskTO, String>> pushTasksColumns = new ArrayList<IColumn<AbstractTaskTO, String>>();
pushTasksColumns.add(new PropertyColumn<AbstractTaskTO, String>(
- new StringResourceModel("id", this, null), "id", "id"));
+ new StringResourceModel("key", this, null), "key", "key"));
pushTasksColumns.add(new PropertyColumn<AbstractTaskTO, String>(
new StringResourceModel("name", this, null), "name", "name"));
pushTasksColumns.add(new PropertyColumn<AbstractTaskTO, String>(
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceDetailsPanel.java
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceDetailsPanel.java b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceDetailsPanel.java
index c3b0455..3bff23f 100644
--- a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceDetailsPanel.java
+++ b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceDetailsPanel.java
@@ -73,7 +73,7 @@ public class ResourceDetailsPanel extends Panel {
setOutputMarkupId(true);
final AjaxTextFieldPanel resourceName = new AjaxTextFieldPanel("name", new ResourceModel("name", "name").
- getObject(), new PropertyModel<String>(resourceTO, "name"));
+ getObject(), new PropertyModel<String>(resourceTO, "key"));
resourceName.setEnabled(createFlag);
resourceName.addRequiredLabel();
@@ -90,11 +90,11 @@ public class ResourceDetailsPanel extends Panel {
add(propagationPrimary);
final SpinnerFieldPanel<Integer> propagationPriority =
- new SpinnerFieldPanel<Integer>("propagationPriority", "propagationPriority", Integer.class,
+ new SpinnerFieldPanel<>("propagationPriority", "propagationPriority", Integer.class,
new PropertyModel<Integer>(resourceTO, "propagationPriority"), null, null);
add(propagationPriority);
- final AjaxDropDownChoicePanel<PropagationMode> propagationMode = new AjaxDropDownChoicePanel<PropagationMode>(
+ final AjaxDropDownChoicePanel<PropagationMode> propagationMode = new AjaxDropDownChoicePanel<>(
"propagationMode", new ResourceModel("propagationMode", "propagationMode").getObject(),
new PropertyModel<PropagationMode>(resourceTO, "propagationMode"));
propagationMode.setChoices(Arrays.asList(PropagationMode.values()));
@@ -133,8 +133,8 @@ public class ResourceDetailsPanel extends Panel {
protected void populateItem(final ListItem<String> item) {
final String className = item.getModelObject();
- final DropDownChoice<String> actionsClass = new DropDownChoice<String>(
- "actionsClass", new Model<String>(className), actionClassNames);
+ final DropDownChoice<String> actionsClass = new DropDownChoice<>(
+ "actionsClass", new Model<>(className), actionClassNames);
actionsClass.setNullValid(true);
actionsClass.setRequired(true);
actionsClass.add(new AjaxFormComponentUpdatingBehavior(Constants.ON_BLUR) {
@@ -182,25 +182,25 @@ public class ResourceDetailsPanel extends Panel {
};
propagationActionsClassNames.add(actionsClasses);
- final AjaxDropDownChoicePanel<TraceLevel> createTraceLevel = new AjaxDropDownChoicePanel<TraceLevel>(
+ final AjaxDropDownChoicePanel<TraceLevel> createTraceLevel = new AjaxDropDownChoicePanel<>(
"createTraceLevel", new ResourceModel("createTraceLevel", "createTraceLevel").getObject(),
new PropertyModel<TraceLevel>(resourceTO, "createTraceLevel"));
createTraceLevel.setChoices(Arrays.asList(TraceLevel.values()));
add(createTraceLevel);
- final AjaxDropDownChoicePanel<TraceLevel> updateTraceLevel = new AjaxDropDownChoicePanel<TraceLevel>(
+ final AjaxDropDownChoicePanel<TraceLevel> updateTraceLevel = new AjaxDropDownChoicePanel<>(
"updateTraceLevel", new ResourceModel("updateTraceLevel", "updateTraceLevel").getObject(),
new PropertyModel<TraceLevel>(resourceTO, "updateTraceLevel"));
updateTraceLevel.setChoices(Arrays.asList(TraceLevel.values()));
add(updateTraceLevel);
- final AjaxDropDownChoicePanel<TraceLevel> deleteTraceLevel = new AjaxDropDownChoicePanel<TraceLevel>(
+ final AjaxDropDownChoicePanel<TraceLevel> deleteTraceLevel = new AjaxDropDownChoicePanel<>(
"deleteTraceLevel", new ResourceModel("deleteTraceLevel", "deleteTraceLevel").getObject(),
new PropertyModel<TraceLevel>(resourceTO, "deleteTraceLevel"));
deleteTraceLevel.setChoices(Arrays.asList(TraceLevel.values()));
add(deleteTraceLevel);
- final AjaxDropDownChoicePanel<TraceLevel> syncTraceLevel = new AjaxDropDownChoicePanel<TraceLevel>(
+ final AjaxDropDownChoicePanel<TraceLevel> syncTraceLevel = new AjaxDropDownChoicePanel<>(
"syncTraceLevel", new ResourceModel("syncTraceLevel", "syncTraceLevel").getObject(),
new PropertyModel<TraceLevel>(resourceTO, "syncTraceLevel"));
syncTraceLevel.setChoices(Arrays.asList(TraceLevel.values()));
@@ -218,11 +218,11 @@ public class ResourceDetailsPanel extends Panel {
connInstanceTO = getConectorInstanceTO(connectors.getObject(), resourceTO);
- final AjaxDropDownChoicePanel<ConnInstanceTO> conn = new AjaxDropDownChoicePanel<ConnInstanceTO>("connector",
+ final AjaxDropDownChoicePanel<ConnInstanceTO> conn = new AjaxDropDownChoicePanel<>("connector",
new ResourceModel("connector", "connector").getObject(),
new PropertyModel<ConnInstanceTO>(this, "connInstanceTO"));
conn.setChoices(connectors.getObject());
- conn.setChoiceRenderer(new ChoiceRenderer("displayName", "id"));
+ conn.setChoiceRenderer(new ChoiceRenderer("displayName", "key"));
conn.getField().setModel(new IModel<ConnInstanceTO>() {
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceMappingPanel.java
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceMappingPanel.java b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceMappingPanel.java
index 0e8d34b..ecd7e0c 100644
--- a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceMappingPanel.java
+++ b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceMappingPanel.java
@@ -565,7 +565,7 @@ public class ResourceMappingPanel extends Panel {
case UserPlainSchema:
case RolePlainSchema:
case MembershipPlainSchema:
- toBeUpdated.setChoices(schemaRestClient.getSchemaNames(type.getAttributableType()));
+ toBeUpdated.setChoices(schemaRestClient.getPlainSchemaNames(type.getAttributableType()));
break;
case UserDerivedSchema:
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/RoleDetailsPanel.java
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/RoleDetailsPanel.java b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/RoleDetailsPanel.java
index 2a97b3a..03d2e75 100644
--- a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/RoleDetailsPanel.java
+++ b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/RoleDetailsPanel.java
@@ -140,11 +140,11 @@ public class RoleDetailsPanel extends Panel {
this.add(parentFragment);
final AjaxTextFieldPanel name =
- new AjaxTextFieldPanel("name", "name", new PropertyModel<String>(roleTO, "name"));
+ new AjaxTextFieldPanel("name", "name", new PropertyModel<String>(roleTO, "key"));
final WebMarkupContainer jexlHelp = JexlHelpUtil.getJexlHelpWebContainer("jexlHelp");
- final AjaxLink questionMarkJexlHelp = JexlHelpUtil.getAjaxLink(jexlHelp, "questionMarkJexlHelp");
+ final AjaxLink<Void> questionMarkJexlHelp = JexlHelpUtil.getAjaxLink(jexlHelp, "questionMarkJexlHelp");
this.add(questionMarkJexlHelp);
questionMarkJexlHelp.add(jexlHelp);
@@ -241,7 +241,7 @@ public class RoleDetailsPanel extends Panel {
@Override
protected void onUpdate(final AjaxRequestTarget target) {
- send(getPage(), Broadcast.BREADTH, new RoleAttrTemplatesChange(Type.rAttrTemplates, target));
+ send(getPage(), Broadcast.BREADTH, new RoleAttrTemplatesChange(Type.rPlainAttrTemplates, target));
send(getPage(), Broadcast.BREADTH, new RoleAttrTemplatesChange(Type.rDerAttrTemplates, target));
send(getPage(), Broadcast.BREADTH, new RoleAttrTemplatesChange(Type.rVirAttrTemplates, target));
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/RolePanel.java
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/RolePanel.java b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/RolePanel.java
index 09f838a..da04397 100644
--- a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/RolePanel.java
+++ b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/RolePanel.java
@@ -122,10 +122,10 @@ public class RolePanel extends Panel {
// Attributes panel
//--------------------------------
this.add(new PlainAttrsPanel(
- "attrs", builder.roleTO, builder.form, builder.mode, attrTemplates));
+ "plainAttrs", builder.roleTO, builder.form, builder.mode, attrTemplates));
- final AjaxCheckBoxPanel inhAttributes = new AjaxCheckBoxPanel("inheritAttrs", "inheritAttrs",
- new PropertyModel<Boolean>(builder.roleTO, "inheritAttrs"));
+ final AjaxCheckBoxPanel inhAttributes = new AjaxCheckBoxPanel("inheritPlainAttrs", "inheritPlainAttrs",
+ new PropertyModel<Boolean>(builder.roleTO, "inheritPlainAttrs"));
inhAttributes.setOutputMarkupId(true);
this.add(inhAttributes);
//--------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/RoleSearchResultPanel.java
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/RoleSearchResultPanel.java b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/RoleSearchResultPanel.java
index 3762dee..dfd40d5 100644
--- a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/RoleSearchResultPanel.java
+++ b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/RoleSearchResultPanel.java
@@ -60,13 +60,10 @@ public class RoleSearchResultPanel extends AbstractSearchResultPanel {
@Override
protected List<IColumn<AbstractAttributableTO, String>> getColumns() {
- final List<IColumn<AbstractAttributableTO, String>> columns =
- new ArrayList<IColumn<AbstractAttributableTO, String>>();
+ final List<IColumn<AbstractAttributableTO, String>> columns = new ArrayList<>();
- final String[] colnames = { "id", "name", "entitlements" };
- for (String name : colnames) {
- columns.add(
- new PropertyColumn<AbstractAttributableTO, String>(new ResourceModel(name, name), name, name));
+ for (String item : new String[] { "key", "name", "entitlements" }) {
+ columns.add(new PropertyColumn<AbstractAttributableTO, String>(new ResourceModel(item, item), item, item));
}
columns.add(new AbstractColumn<AbstractAttributableTO, String>(new ResourceModel("actions", "")) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/SchedTasks.java
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/SchedTasks.java b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/SchedTasks.java
index bbc10b7..205bfa5 100644
--- a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/SchedTasks.java
+++ b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/SchedTasks.java
@@ -153,7 +153,7 @@ public class SchedTasks extends AbstractTasks {
final List<IColumn<AbstractTaskTO, String>> columns = new ArrayList<IColumn<AbstractTaskTO, String>>();
columns.add(new PropertyColumn<AbstractTaskTO, String>(
- new StringResourceModel("id", this, null), "id", "id"));
+ new StringResourceModel("key", this, null), "key", "key"));
columns.add(new PropertyColumn<AbstractTaskTO, String>(
new StringResourceModel("name", this, null), "name", "name"));
columns.add(new PropertyColumn<AbstractTaskTO, String>(
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/SyncTasksPanel.java
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/SyncTasksPanel.java b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/SyncTasksPanel.java
index cf75285..f520391 100644
--- a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/SyncTasksPanel.java
+++ b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/SyncTasksPanel.java
@@ -53,10 +53,10 @@ public class SyncTasksPanel extends AbstractProvisioningTasksPanel<SyncTaskTO> {
@Override
protected List<IColumn<AbstractTaskTO, String>> getColumns() {
- final List<IColumn<AbstractTaskTO, String>> syncTaskscolumns = new ArrayList<IColumn<AbstractTaskTO, String>>();
+ final List<IColumn<AbstractTaskTO, String>> syncTaskscolumns = new ArrayList<>();
syncTaskscolumns.add(new PropertyColumn<AbstractTaskTO, String>(
- new StringResourceModel("id", this, null), "id", "id"));
+ new StringResourceModel("key", this, null), "key", "key"));
syncTaskscolumns.add(new PropertyColumn<AbstractTaskTO, String>(
new StringResourceModel("name", this, null), "name", "name"));
syncTaskscolumns.add(new PropertyColumn<AbstractTaskTO, String>(
@@ -202,7 +202,7 @@ public class SyncTasksPanel extends AbstractProvisioningTasksPanel<SyncTaskTO> {
}
@Override
- public Component getHeader(String componentId) {
+ public Component getHeader(final String componentId) {
final ActionLinksPanel panel = new ActionLinksPanel(componentId, new Model(), pageRef);
panel.add(new ActionLink() {
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/UserSearchResultPanel.java
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/UserSearchResultPanel.java b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/UserSearchResultPanel.java
index 7e494a5..132bb66 100644
--- a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/UserSearchResultPanel.java
+++ b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/panels/UserSearchResultPanel.java
@@ -76,7 +76,7 @@ public class UserSearchResultPanel extends AbstractSearchResultPanel {
super(id, filtered, fiql, callerRef, restClient);
- this.pSchemaNames = schemaRestClient.getSchemaNames(AttributableType.USER);
+ this.pSchemaNames = schemaRestClient.getPlainSchemaNames(AttributableType.USER);
this.dSchemaNames = schemaRestClient.getDerSchemaNames(AttributableType.USER);
this.vSchemaNames = schemaRestClient.getVirSchemaNames(AttributableType.USER);
@@ -85,8 +85,7 @@ public class UserSearchResultPanel extends AbstractSearchResultPanel {
@Override
protected List<IColumn<AbstractAttributableTO, String>> getColumns() {
- final List<IColumn<AbstractAttributableTO, String>> columns =
- new ArrayList<IColumn<AbstractAttributableTO, String>>();
+ final List<IColumn<AbstractAttributableTO, String>> columns = new ArrayList<>();
for (String name : prefMan.getList(getRequest(), Constants.PREF_USERS_DETAILS_VIEW)) {
final Field field = ReflectionUtils.findField(UserTO.class, name);
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/java/org/apache/syncope/client/console/preview/PreviewUtil.java
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/preview/PreviewUtil.java b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/preview/PreviewUtil.java
index 2baff26..3ebc28a 100644
--- a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/preview/PreviewUtil.java
+++ b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/preview/PreviewUtil.java
@@ -20,24 +20,17 @@ package org.apache.syncope.client.console.preview;
import java.lang.reflect.InvocationTargetException;
import org.apache.commons.lang3.StringUtils;
-import org.apache.syncope.client.console.init.PreviewPanelClassInitializer;
+import org.apache.syncope.client.console.init.BinaryPreviewersLoader;
import org.apache.syncope.client.console.wicket.markup.html.form.preview.AbstractBinaryPreviewer;
import org.apache.wicket.Component;
import org.apache.wicket.util.crypt.Base64;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@org.springframework.stereotype.Component
public class PreviewUtil {
- /**
- * Logger.
- */
- private static final Logger LOG = LoggerFactory.getLogger(PreviewUtil.class);
-
@Autowired
- private PreviewPanelClassInitializer previewPanelClassInitializer;
+ private BinaryPreviewersLoader previewPanelClassInitializer;
public Component getPreviewer(final String mimeType, final String file) throws ClassNotFoundException,
NoSuchMethodException, InstantiationException, IllegalAccessException, InvocationTargetException {
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/java/org/apache/syncope/client/console/preview/PreviewerClassScanner.java
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/preview/PreviewerClassScanner.java b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/preview/PreviewerClassScanner.java
index 921d783..a70f9cf 100644
--- a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/preview/PreviewerClassScanner.java
+++ b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/preview/PreviewerClassScanner.java
@@ -20,6 +20,7 @@ package org.apache.syncope.client.console.preview;
import java.util.ArrayList;
import java.util.List;
+import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.wicket.markup.html.form.preview.AbstractBinaryPreviewer;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
@@ -30,8 +31,6 @@ import org.springframework.util.ClassUtils;
@Component
public class PreviewerClassScanner extends ClassPathScanningCandidateComponentProvider {
- private static final String BASE_PATH = "org.apache.syncope.console.wicket.markup.html.form";
-
public PreviewerClassScanner() {
super(false);
addIncludeFilter(new AnnotationTypeFilter(BinaryPreview.class));
@@ -39,9 +38,8 @@ public class PreviewerClassScanner extends ClassPathScanningCandidateComponentPr
@SuppressWarnings("unchecked")
public final List<Class<? extends AbstractBinaryPreviewer>> getComponentClasses() {
- List<Class<? extends AbstractBinaryPreviewer>> classes =
- new ArrayList<Class<? extends AbstractBinaryPreviewer>>();
- for (BeanDefinition candidate : findCandidateComponents(BASE_PATH)) {
+ List<Class<? extends AbstractBinaryPreviewer>> classes = new ArrayList<>();
+ for (BeanDefinition candidate : findCandidateComponents(StringUtils.EMPTY)) {
classes.add((Class<AbstractBinaryPreviewer>) ClassUtils.resolveClassName(candidate.getBeanClassName(),
ClassUtils.getDefaultClassLoader()));
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/java/org/apache/syncope/client/console/rest/ConfigurationRestClient.java
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/rest/ConfigurationRestClient.java b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/rest/ConfigurationRestClient.java
index 9d09984..ca00ea8 100644
--- a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/rest/ConfigurationRestClient.java
+++ b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/rest/ConfigurationRestClient.java
@@ -73,7 +73,7 @@ public class ConfigurationRestClient extends BaseRestClient {
attrLayout.setSchema(type.getConfKey());
}
if (attrLayout.getValues().isEmpty()) {
- attrLayout.getValues().addAll(schemaRestClient.getSchemaNames(type.getAttrType()));
+ attrLayout.getValues().addAll(schemaRestClient.getPlainSchemaNames(type.getAttrType()));
}
return attrLayout;
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/java/org/apache/syncope/client/console/rest/ResourceRestClient.java
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/rest/ResourceRestClient.java b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/rest/ResourceRestClient.java
index a62b644..5ed1f45 100644
--- a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/rest/ResourceRestClient.java
+++ b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/rest/ResourceRestClient.java
@@ -28,7 +28,7 @@ import org.apache.syncope.common.lib.to.ResourceTO;
import org.apache.syncope.common.lib.to.UserTO;
import org.apache.syncope.common.lib.types.ResourceDeassociationActionType;
import org.apache.syncope.common.lib.types.SubjectType;
-import org.apache.syncope.common.lib.wrap.SubjectId;
+import org.apache.syncope.common.lib.wrap.SubjectKey;
import org.apache.syncope.common.rest.api.service.ResourceService;
import org.springframework.stereotype.Component;
@@ -85,7 +85,7 @@ public class ResourceRestClient extends BaseRestClient {
public BulkActionResult bulkAssociationAction(
final String resourceName, final Class<? extends AbstractAttributableTO> typeRef,
- final ResourceDeassociationActionType type, final List<SubjectId> subjtectIds) {
+ final ResourceDeassociationActionType type, final List<SubjectKey> subjtectIds) {
return getService(ResourceService.class).bulkDeassociation(resourceName,
UserTO.class.isAssignableFrom(typeRef) ? SubjectType.USER : SubjectType.ROLE,
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/java/org/apache/syncope/client/console/rest/SchemaRestClient.java
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/rest/SchemaRestClient.java b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/rest/SchemaRestClient.java
index d5d7046..378f98d 100644
--- a/syncope620/client/console/src/main/java/org/apache/syncope/client/console/rest/SchemaRestClient.java
+++ b/syncope620/client/console/src/main/java/org/apache/syncope/client/console/rest/SchemaRestClient.java
@@ -89,7 +89,7 @@ public class SchemaRestClient extends BaseRestClient {
}
public List<String> getSchemaNames(final AttributableType attrType, final SchemaType schemaType) {
- final List<String> schemaNames = new ArrayList<String>();
+ final List<String> schemaNames = new ArrayList<>();
try {
final List<? extends AbstractSchemaTO> schemas = getSchemas(attrType, schemaType);
@@ -103,8 +103,8 @@ public class SchemaRestClient extends BaseRestClient {
return schemaNames;
}
- public List<String> getSchemaNames(final AttributableType type) {
- final List<String> schemaNames = new ArrayList<String>();
+ public List<String> getPlainSchemaNames(final AttributableType type) {
+ final List<String> schemaNames = new ArrayList<>();
try {
final List<PlainSchemaTO> schemas = getSchemas(type);
@@ -131,7 +131,7 @@ public class SchemaRestClient extends BaseRestClient {
}
public List<String> getDerSchemaNames(final AttributableType type) {
- final List<String> userDerSchemasNames = new ArrayList<String>();
+ final List<String> userDerSchemasNames = new ArrayList<>();
try {
final List<DerSchemaTO> userDerSchemas = getService(SchemaService.class).list(type, SchemaType.DERIVED);
@@ -174,11 +174,11 @@ public class SchemaRestClient extends BaseRestClient {
return userVirSchemasNames;
}
- public void createSchema(final AttributableType type, final PlainSchemaTO schemaTO) {
+ public void createPlainSchema(final AttributableType type, final PlainSchemaTO schemaTO) {
getService(SchemaService.class).create(type, SchemaType.PLAIN, schemaTO);
}
- public PlainSchemaTO readSchema(final AttributableType type, final String name) {
+ public PlainSchemaTO readPlainSchema(final AttributableType type, final String name) {
PlainSchemaTO schema = null;
try {
@@ -189,11 +189,11 @@ public class SchemaRestClient extends BaseRestClient {
return schema;
}
- public void updateSchema(final AttributableType type, final PlainSchemaTO schemaTO) {
+ public void updatePlainSchema(final AttributableType type, final PlainSchemaTO schemaTO) {
getService(SchemaService.class).update(type, SchemaType.PLAIN, schemaTO.getKey(), schemaTO);
}
- public PlainSchemaTO deleteSchema(final AttributableType type, final String name) {
+ public PlainSchemaTO deletePlainSchema(final AttributableType type, final String name) {
PlainSchemaTO response = getService(SchemaService.class).read(type, SchemaType.PLAIN, name);
getService(SchemaService.class).delete(type, SchemaType.PLAIN, name);
return response;
@@ -237,9 +237,6 @@ public class SchemaRestClient extends BaseRestClient {
return schemaTO;
}
- /**
- * Populator for Validator Schema DropDown components.
- */
public List<String> getAllValidatorClasses() {
List<String> response = null;
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/META-INF/cxf/org.apache.cxf.Logger
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/META-INF/cxf/org.apache.cxf.Logger b/syncope620/client/console/src/main/resources/META-INF/cxf/org.apache.cxf.Logger
new file mode 100644
index 0000000..6e7bd36
--- /dev/null
+++ b/syncope620/client/console/src/main/resources/META-INF/cxf/org.apache.cxf.Logger
@@ -0,0 +1 @@
+org.apache.cxf.common.logging.Slf4jLogger
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/META-INF/resources/img/favicon.ico
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/META-INF/resources/img/favicon.ico b/syncope620/client/console/src/main/resources/META-INF/resources/img/favicon.ico
deleted file mode 100644
index 599ec2b..0000000
Binary files a/syncope620/client/console/src/main/resources/META-INF/resources/img/favicon.ico and /dev/null differ
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/META-INF/resources/img/favicon.png
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/META-INF/resources/img/favicon.png b/syncope620/client/console/src/main/resources/META-INF/resources/img/favicon.png
new file mode 100644
index 0000000..aa2f3e2
Binary files /dev/null and b/syncope620/client/console/src/main/resources/META-INF/resources/img/favicon.png differ
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/META-INF/resources/img/statuses/active.png
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/META-INF/resources/img/statuses/active.png b/syncope620/client/console/src/main/resources/META-INF/resources/img/statuses/active.png
new file mode 100644
index 0000000..79332c0
Binary files /dev/null and b/syncope620/client/console/src/main/resources/META-INF/resources/img/statuses/active.png differ
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/META-INF/resources/img/statuses/inactive.png
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/META-INF/resources/img/statuses/inactive.png b/syncope620/client/console/src/main/resources/META-INF/resources/img/statuses/inactive.png
new file mode 100644
index 0000000..68975bd
Binary files /dev/null and b/syncope620/client/console/src/main/resources/META-INF/resources/img/statuses/inactive.png differ
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/META-INF/resources/img/statuses/objectnotfound.png
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/META-INF/resources/img/statuses/objectnotfound.png b/syncope620/client/console/src/main/resources/META-INF/resources/img/statuses/objectnotfound.png
new file mode 100644
index 0000000..a0a2933
Binary files /dev/null and b/syncope620/client/console/src/main/resources/META-INF/resources/img/statuses/objectnotfound.png differ
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/META-INF/resources/img/statuses/undefined.png
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/META-INF/resources/img/statuses/undefined.png b/syncope620/client/console/src/main/resources/META-INF/resources/img/statuses/undefined.png
new file mode 100644
index 0000000..97188ba
Binary files /dev/null and b/syncope620/client/console/src/main/resources/META-INF/resources/img/statuses/undefined.png differ
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/META-INF/web-fragment.xml
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/META-INF/web-fragment.xml b/syncope620/client/console/src/main/resources/META-INF/web-fragment.xml
index d8e31be..f19df05 100644
--- a/syncope620/client/console/src/main/resources/META-INF/web-fragment.xml
+++ b/syncope620/client/console/src/main/resources/META-INF/web-fragment.xml
@@ -46,6 +46,10 @@ under the License.
<filter-name>SyncopeConsole</filter-name>
<filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
<init-param>
+ <param-name>filterMappingUrlPattern</param-name>
+ <param-value>/*</param-value>
+ </init-param>
+ <init-param>
<param-name>applicationFactoryClassName</param-name>
<param-value>org.apache.wicket.spring.SpringWebApplicationFactory</param-value>
</init-param>
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/console.properties
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/console.properties b/syncope620/client/console/src/main/resources/console.properties
index 75c88de..3f2667b 100644
--- a/syncope620/client/console/src/main/resources/console.properties
+++ b/syncope620/client/console/src/main/resources/console.properties
@@ -14,8 +14,9 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+console.directory=${conf.directory}
scheme=http
host=localhost
port=8080
rootPath=/syncope/rest/
-activitiModelerDirectory=${activiti-modeler.directory}
\ No newline at end of file
+activitiModelerDirectory=${activiti-modeler.directory}
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/consoleContext.xml
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/consoleContext.xml b/syncope620/client/console/src/main/resources/consoleContext.xml
index b451ef1..bb7f94b 100644
--- a/syncope620/client/console/src/main/resources/consoleContext.xml
+++ b/syncope620/client/console/src/main/resources/consoleContext.xml
@@ -31,7 +31,7 @@ under the License.
<bean id="confDirectoryPropertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="order" value="1"/>
- <property name="location" value="file:${conf.directory}/console.properties"/>
+ <property name="location" value="file:${console.directory}/console.properties"/>
<property name="ignoreResourceNotFound" value="true"/>
<property name="ignoreUnresolvablePlaceholders" value="true"/>
</bean>
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/SyncopeApplication.properties
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/SyncopeApplication.properties b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/SyncopeApplication.properties
index 223b27a..83cb198 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/SyncopeApplication.properties
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/SyncopeApplication.properties
@@ -52,3 +52,4 @@ jexl_ex1=surname + ',' + firstname
jexl_ex2='new.' + surname
jexl_syntax_url=Full JEXL reference
create=Create
+key=Key
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/SyncopeApplication_it.properties
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/SyncopeApplication_it.properties b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/SyncopeApplication_it.properties
index 3a54be5..96edcee 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/SyncopeApplication_it.properties
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/SyncopeApplication_it.properties
@@ -51,3 +51,4 @@ jexl_ex1=surname + ',' + firstname
jexl_ex2='new.' + surname
jexl_syntax_url=Sintassi JEXL completa
create=Crea
+key=Chiave
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/SyncopeApplication_pt_BR.properties
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/SyncopeApplication_pt_BR.properties b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/SyncopeApplication_pt_BR.properties
index dd9ecd7..a7e2880 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/SyncopeApplication_pt_BR.properties
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/SyncopeApplication_pt_BR.properties
@@ -51,3 +51,4 @@ jexl_ex1=sobrenome + ',' + nome
jexl_ex2='novo.' + sobrenome
jexl_syntax_url=Refer\u00eancia JEXL completa
create=Criar
+key=Chave
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/AbstractStatusModalPage.html
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/AbstractStatusModalPage.html b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/AbstractStatusModalPage.html
index ef013ce..0c43c4b 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/AbstractStatusModalPage.html
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/AbstractStatusModalPage.html
@@ -72,7 +72,9 @@ under the License.
</style>
</wicket:head>
<wicket:extend>
- <p class="ui-widget ui-corner-all ui-widget-header"><wicket:message key="title"/></p>
+ <p class="ui-widget ui-corner-all ui-widget-header">
+ <wicket:message key="title"/> <span wicket:id="displayName"/>
+ </p>
<span wicket:id="resourceDatatable" id="dataTableSpan">[resources]</span>
<span wicket:id="pwdMgtFields">[password management]</span>
http://git-wip-us.apache.org/repos/asf/syncope/blob/07aa4585/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html
----------------------------------------------------------------------
diff --git a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html
index 44b0e45..1b274a9 100644
--- a/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html
+++ b/syncope620/client/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html
@@ -25,7 +25,7 @@ under the License.
<title>Apache Syncope</title>
- <link rel="shortcut icon" href="img/favicon.ico" />
+ <link rel="shortcut icon" href="img/favicon.png" type="image/png"/>
<style type="text/css">
div.wicket-modal div.w_caption {