This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 280ae5a [SYNCOPE-1421] Small fixes to Enduser application
280ae5a is described below
commit 280ae5acc840b91a19d89b891508566c2be5e462
Author: skylark17 <matteo.alessandr...@tirasa.net>
AuthorDate: Thu May 16 11:32:12 2019 +0200
[SYNCOPE-1421] Small fixes to Enduser application
---
.../syncope/client/console}/annotations/ExtPage.java | 2 +-
.../init/ClassPathScanImplementationLookup.java | 2 +-
.../apache/syncope/client/console/pages/BasePage.java | 2 +-
.../syncope/client/ui/commons/wizards/AjaxWizard.html | 0
.../client/ui/commons/wizards/AjaxWizard.properties | 0
.../ui/commons/wizards/AjaxWizardMgtButtonBar.html | 4 ++--
.../client/ui/commons/wizards/AjaxWizard_it.properties | 0
.../client/ui/commons/wizards/AjaxWizard_ja.properties | 0
.../ui/commons/wizards/AjaxWizard_pt_BR.properties | 0
.../client/ui/commons/wizards/AjaxWizard_ru.properties | 0
.../syncope/client/enduser}/annotations/ExtPage.java | 18 +-----------------
.../init/ClassPathScanImplementationLookup.java | 2 +-
.../syncope/client/enduser/navigation/Navbar.java | 8 +-------
.../client/enduser/assets/css/syncopeEnduser.scss | 4 ++--
.../syncope/client/ui/commons/wizards/AjaxWizard.html | 1 -
.../client/ui/commons/wizards/AjaxWizard.properties | 0
.../ui/commons/wizards/AjaxWizardMgtButtonBar.html | 14 +++++++-------
.../client/ui/commons/wizards/AjaxWizard_it.properties | 0
.../client/ui/commons/wizards/AjaxWizard_ja.properties | 0
.../ui/commons/wizards/AjaxWizard_pt_BR.properties | 0
.../client/ui/commons/wizards/AjaxWizard_ru.properties | 0
.../syncope/client/console/pages/CamelRoutes.java | 2 +-
.../apache/syncope/client/console/pages/Flowable.java | 2 +-
.../apache/syncope/client/enduser/pages/Flowable.java | 6 ++----
.../syncope/client/console/pages/OIDCClient.java | 2 +-
.../apache/syncope/client/console/pages/SAML2SP.java | 2 +-
.../syncope/client/console/pages/SCIMConfPage.java | 2 +-
27 files changed, 24 insertions(+), 49 deletions(-)
diff --git
a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/annotations/ExtPage.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/annotations/ExtPage.java
similarity index 96%
copy from
client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/annotations/ExtPage.java
copy to
client/idrepo/console/src/main/java/org/apache/syncope/client/console/annotations/ExtPage.java
index 4e1d146..f0ed504 100644
---
a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/annotations/ExtPage.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/annotations/ExtPage.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.syncope.client.ui.commons.annotations;
+package org.apache.syncope.client.console.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/init/ClassPathScanImplementationLookup.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/init/ClassPathScanImplementationLookup.java
index 09b69eb..995168b 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/init/ClassPathScanImplementationLookup.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/init/ClassPathScanImplementationLookup.java
@@ -30,9 +30,9 @@ import java.util.Map;
import java.util.Set;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.ObjectUtils;
+import org.apache.syncope.client.console.annotations.ExtPage;
import org.apache.syncope.client.console.pages.BaseExtPage;
import org.apache.syncope.client.ui.commons.annotations.BinaryPreview;
-import org.apache.syncope.client.ui.commons.annotations.ExtPage;
import org.apache.syncope.client.ui.commons.annotations.ExtWidget;
import org.apache.syncope.client.console.annotations.IdMPage;
import org.apache.syncope.client.console.annotations.Resource;
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java
index 3e55ccf..8bbb663 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.BookmarkablePageLinkBuilder;
import org.apache.syncope.client.console.SyncopeConsoleSession;
-import org.apache.syncope.client.ui.commons.annotations.ExtPage;
+import org.apache.syncope.client.console.annotations.ExtPage;
import org.apache.syncope.client.console.annotations.IdMPage;
import org.apache.syncope.client.ui.commons.HttpResourceStream;
import
org.apache.syncope.client.console.init.ClassPathScanImplementationLookup;
diff --git
a/client/idrepo/common-ui/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard.html
b/client/idrepo/console/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard.html
similarity index 100%
copy from
client/idrepo/common-ui/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard.html
copy to
client/idrepo/console/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard.html
diff --git
a/client/idrepo/common-ui/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard.properties
b/client/idrepo/console/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard.properties
similarity index 100%
copy from
client/idrepo/common-ui/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard.properties
copy to
client/idrepo/console/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard.properties
diff --git
a/client/idrepo/common-ui/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizardMgtButtonBar.html
b/client/idrepo/console/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizardMgtButtonBar.html
similarity index 95%
copy from
client/idrepo/common-ui/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizardMgtButtonBar.html
copy to
client/idrepo/console/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizardMgtButtonBar.html
index 6d9ac20..fb20962 100644
---
a/client/idrepo/common-ui/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizardMgtButtonBar.html
+++
b/client/idrepo/console/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizardMgtButtonBar.html
@@ -28,8 +28,8 @@ under the License.
</div>
<div class="pull-right">
<input wicket:id="previous" type="submit"
wicket:message="value:previous" class="btn btn-default"/>
- <input wicket:id="next" type="submit" wicket:message="value:next"
class="btn btn-default"/>
- <input wicket:id="last" type="submit" wicket:message="value:last"
class="btn btn-default"/>
+ <input wicket:id="next" type="submit" wicket:message="value:next"
class="btn btn-default"/>
+ <input wicket:id="last" type="submit" wicket:message="value:last"
class="btn btn-default"/>
<input wicket:id="finish" type="submit" wicket:message="value:finish"
class="btn btn-primary"/>
</div>
diff --git
a/client/idrepo/common-ui/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard_it.properties
b/client/idrepo/console/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard_it.properties
similarity index 100%
copy from
client/idrepo/common-ui/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard_it.properties
copy to
client/idrepo/console/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard_it.properties
diff --git
a/client/idrepo/common-ui/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard_ja.properties
b/client/idrepo/console/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard_ja.properties
similarity index 100%
copy from
client/idrepo/common-ui/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard_ja.properties
copy to
client/idrepo/console/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard_ja.properties
diff --git
a/client/idrepo/common-ui/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard_pt_BR.properties
b/client/idrepo/console/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard_pt_BR.properties
similarity index 100%
copy from
client/idrepo/common-ui/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard_pt_BR.properties
copy to
client/idrepo/console/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard_pt_BR.properties
diff --git
a/client/idrepo/common-ui/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard_ru.properties
b/client/idrepo/console/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard_ru.properties
similarity index 100%
copy from
client/idrepo/common-ui/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard_ru.properties
copy to
client/idrepo/console/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard_ru.properties
diff --git
a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/annotations/ExtPage.java
b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/annotations/ExtPage.java
similarity index 67%
rename from
client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/annotations/ExtPage.java
rename to
client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/annotations/ExtPage.java
index 4e1d146..74b7c77 100644
---
a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/annotations/ExtPage.java
+++
b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/annotations/ExtPage.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.syncope.client.ui.commons.annotations;
+package org.apache.syncope.client.enduser.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@@ -34,20 +34,4 @@ public @interface ExtPage {
*/
String label();
- /**
- * @return the icon shown next to the label, under the "Extensions" menu
item, on the left pane;
- * check https://fortawesome.github.io/Font-Awesome/icons/ for more
- */
- String icon() default "fa-circle-o";
-
- /**
- * @return the entitlement required to access this extension page
- */
- String listEntitlement();
-
- /**
- * @return the priority used to determine the display order under the
"Extensions" menu item, on the left pane; the
- * higher value, the higher rank
- */
- int priority() default 0;
}
diff --git
a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/init/ClassPathScanImplementationLookup.java
b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/init/ClassPathScanImplementationLookup.java
index 78b2c0f..ca1ec53 100644
---
a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/init/ClassPathScanImplementationLookup.java
+++
b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/init/ClassPathScanImplementationLookup.java
@@ -23,10 +23,10 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.apache.commons.lang3.ArrayUtils;
+import org.apache.syncope.client.enduser.annotations.ExtPage;
import org.apache.syncope.client.enduser.annotations.Resource;
import org.apache.syncope.client.enduser.pages.BaseExtPage;
import org.apache.syncope.client.ui.commons.annotations.BinaryPreview;
-import org.apache.syncope.client.ui.commons.annotations.ExtPage;
import
org.apache.syncope.client.ui.commons.markup.html.form.preview.AbstractBinaryPreviewer;
import org.apache.syncope.client.ui.commons.panels.SSOLoginFormPanel;
import org.apache.wicket.request.resource.AbstractResource;
diff --git
a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/navigation/Navbar.java
b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/navigation/Navbar.java
index 18b6298..80356e1 100644
---
a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/navigation/Navbar.java
+++
b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/navigation/Navbar.java
@@ -21,20 +21,17 @@ package org.apache.syncope.client.enduser.navigation;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.syncope.client.enduser.annotations.ExtPage;
import org.apache.syncope.client.enduser.pages.BaseExtPage;
import org.apache.syncope.client.enduser.pages.Login;
import org.apache.syncope.client.enduser.pages.Self;
-import org.apache.syncope.client.ui.commons.annotations.ExtPage;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import
org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.list.ListItem;
@@ -85,9 +82,6 @@ public class Navbar extends Panel {
new BookmarkablePageLink<>("extPageLILink",
item.getModelObject());
extLIPageLink.setOutputMarkupId(true);
extLIPageLink.add(new Label("extPageLabel", ann.label()));
- if (StringUtils.isNotBlank(ann.listEntitlement())) {
- MetaDataRoleAuthorizationStrategy.authorize(extLIPageLink,
WebPage.RENDER, ann.listEntitlement());
- }
extPageLI.add(extLIPageLink);
}
};
diff --git
a/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/enduser/assets/css/syncopeEnduser.scss
b/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/enduser/assets/css/syncopeEnduser.scss
index c72ac28..80c2eb3 100644
---
a/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/enduser/assets/css/syncopeEnduser.scss
+++
b/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/enduser/assets/css/syncopeEnduser.scss
@@ -209,11 +209,11 @@ body {
}
-.wizard-buttons {
+form .wizard-buttons {
display: table;
height: 65px;
width: 100%;
- padding: 0;
+ padding: 6px 0px 5px 0px;
position: absolute;
bottom: 0;
diff --git
a/client/idrepo/common-ui/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard.html
b/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard.html
similarity index 97%
rename from
client/idrepo/common-ui/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard.html
rename to
client/idrepo/enduser/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard.html
index 7bd13e6..96f296e 100644
---
a/client/idrepo/common-ui/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard.html
+++
b/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard.html
@@ -38,7 +38,6 @@ under the License.
</div>
</form>
</div>
- <div class="background-footer"></div>
<span wicket:id="outerObjectsRepeater">
<div wicket:id="outer"/>
</span>
diff --git
a/client/idrepo/common-ui/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard.properties
b/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard.properties
similarity index 100%
rename from
client/idrepo/common-ui/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard.properties
rename to
client/idrepo/enduser/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard.properties
diff --git
a/client/idrepo/common-ui/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizardMgtButtonBar.html
b/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizardMgtButtonBar.html
similarity index 86%
rename from
client/idrepo/common-ui/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizardMgtButtonBar.html
rename to
client/idrepo/enduser/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizardMgtButtonBar.html
index 6d9ac20..8b51391 100644
---
a/client/idrepo/common-ui/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizardMgtButtonBar.html
+++
b/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizardMgtButtonBar.html
@@ -23,15 +23,15 @@ under the License.
<body>
<wicket:panel xmlns:wicket="http://wicket.apache.org";>
- <div class="pull-left">
- <input wicket:id="cancel" type="submit" wicket:message="value:cancel"
class="btn btn-default pull-left"/>
- </div>
- <div class="pull-right">
+ <span class="pull-left">
+ <input wicket:id="cancel" type="submit" wicket:message="value:cancel"
class="btn btn-default"/>
+ </span>
+ <span class="pull-right">
<input wicket:id="previous" type="submit"
wicket:message="value:previous" class="btn btn-default"/>
- <input wicket:id="next" type="submit" wicket:message="value:next"
class="btn btn-default"/>
- <input wicket:id="last" type="submit" wicket:message="value:last"
class="btn btn-default"/>
+ <input wicket:id="next" type="submit" wicket:message="value:next"
class="btn btn-default"/>
+ <input wicket:id="last" type="submit" wicket:message="value:last"
class="btn btn-default"/>
<input wicket:id="finish" type="submit" wicket:message="value:finish"
class="btn btn-primary"/>
- </div>
+ </span>
</wicket:panel>
</body>
diff --git
a/client/idrepo/common-ui/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard_it.properties
b/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard_it.properties
similarity index 100%
rename from
client/idrepo/common-ui/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard_it.properties
rename to
client/idrepo/enduser/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard_it.properties
diff --git
a/client/idrepo/common-ui/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard_ja.properties
b/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard_ja.properties
similarity index 100%
rename from
client/idrepo/common-ui/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard_ja.properties
rename to
client/idrepo/enduser/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard_ja.properties
diff --git
a/client/idrepo/common-ui/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard_pt_BR.properties
b/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard_pt_BR.properties
similarity index 100%
rename from
client/idrepo/common-ui/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard_pt_BR.properties
rename to
client/idrepo/enduser/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard_pt_BR.properties
diff --git
a/client/idrepo/common-ui/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard_ru.properties
b/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard_ru.properties
similarity index 100%
rename from
client/idrepo/common-ui/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard_ru.properties
rename to
client/idrepo/enduser/src/main/resources/org/apache/syncope/client/ui/commons/wizards/AjaxWizard_ru.properties
diff --git
a/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/pages/CamelRoutes.java
b/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/pages/CamelRoutes.java
index 3f6150d..59e99f1 100644
---
a/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/pages/CamelRoutes.java
+++
b/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/pages/CamelRoutes.java
@@ -22,12 +22,12 @@ import
de.agilecoders.wicket.core.markup.html.bootstrap.tabs.AjaxBootstrapTabbed
import java.util.ArrayList;
import java.util.List;
import org.apache.syncope.client.console.BookmarkablePageLinkBuilder;
+import org.apache.syncope.client.console.annotations.ExtPage;
import org.apache.syncope.client.console.rest.CamelRoutesRestClient;
import org.apache.syncope.common.lib.types.AnyTypeKind;
import org.apache.syncope.common.lib.types.CamelEntitlement;
import
org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.syncope.client.ui.commons.annotations.ExtPage;
import org.apache.syncope.client.console.panels.CamelRoutesDirectoryPanel;
import org.apache.wicket.extensions.markup.html.tabs.AbstractTab;
import org.apache.wicket.extensions.markup.html.tabs.ITab;
diff --git
a/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/pages/Flowable.java
b/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/pages/Flowable.java
index 7e972ab..1eb40c6 100644
---
a/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/pages/Flowable.java
+++
b/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/pages/Flowable.java
@@ -19,7 +19,7 @@
package org.apache.syncope.client.console.pages;
import org.apache.syncope.client.console.BookmarkablePageLinkBuilder;
-import org.apache.syncope.client.ui.commons.annotations.ExtPage;
+import org.apache.syncope.client.console.annotations.ExtPage;
import org.apache.syncope.client.console.panels.BpmnProcessDirectoryPanel;
import org.apache.syncope.client.console.wizards.WizardMgtPanel;
import org.apache.syncope.common.lib.to.BpmnProcess;
diff --git
a/ext/flowable/client-enduser/src/main/java/org/apache/syncope/client/enduser/pages/Flowable.java
b/ext/flowable/client-enduser/src/main/java/org/apache/syncope/client/enduser/pages/Flowable.java
index eee8f9a..113f222 100644
---
a/ext/flowable/client-enduser/src/main/java/org/apache/syncope/client/enduser/pages/Flowable.java
+++
b/ext/flowable/client-enduser/src/main/java/org/apache/syncope/client/enduser/pages/Flowable.java
@@ -22,15 +22,14 @@ import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
import org.apache.syncope.client.enduser.SyncopeEnduserSession;
+import org.apache.syncope.client.enduser.annotations.ExtPage;
import
org.apache.syncope.client.enduser.markup.html.form.BpmnProcessesAjaxPanel;
import org.apache.syncope.client.enduser.rest.BpmnProcessRestClient;
import org.apache.syncope.client.enduser.rest.UserRequestRestClient;
import org.apache.syncope.client.ui.commons.Constants;
import
org.apache.syncope.client.ui.commons.ajax.form.IndicatorAjaxFormComponentUpdatingBehavior;
-import org.apache.syncope.client.ui.commons.annotations.ExtPage;
import
org.apache.syncope.client.ui.commons.wicket.markup.html.bootstrap.tabs.Accordion;
import org.apache.syncope.common.lib.to.UserRequest;
-import org.apache.syncope.common.lib.types.FlowableEntitlement;
import org.apache.wicket.ajax.AjaxRequestTarget;
import
org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigator;
import org.apache.wicket.extensions.markup.html.repeater.util.SortParam;
@@ -46,8 +45,7 @@ import org.apache.wicket.model.StringResourceModel;
import org.apache.wicket.model.util.ListModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-@ExtPage(label = "User Requests",
- listEntitlement = FlowableEntitlement.BPMN_PROCESS_GET, priority = 200)
+@ExtPage(label = "User Requests")
public class Flowable extends BaseExtPage {
private static final long serialVersionUID = -8781434495150074529L;
diff --git
a/ext/oidcclient/client-console/src/main/java/org/apache/syncope/client/console/pages/OIDCClient.java
b/ext/oidcclient/client-console/src/main/java/org/apache/syncope/client/console/pages/OIDCClient.java
index d335c4b..66bb812 100644
---
a/ext/oidcclient/client-console/src/main/java/org/apache/syncope/client/console/pages/OIDCClient.java
+++
b/ext/oidcclient/client-console/src/main/java/org/apache/syncope/client/console/pages/OIDCClient.java
@@ -22,7 +22,7 @@ import
de.agilecoders.wicket.core.markup.html.bootstrap.tabs.AjaxBootstrapTabbed
import java.util.ArrayList;
import java.util.List;
import org.apache.syncope.client.console.BookmarkablePageLinkBuilder;
-import org.apache.syncope.client.ui.commons.annotations.ExtPage;
+import org.apache.syncope.client.console.annotations.ExtPage;
import org.apache.syncope.client.console.panels.OIDCProvidersDirectoryPanel;
import org.apache.syncope.common.lib.types.OIDCClientEntitlement;
import org.apache.wicket.extensions.markup.html.tabs.AbstractTab;
diff --git
a/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/pages/SAML2SP.java
b/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/pages/SAML2SP.java
index 9f020dd..71ef8e5 100644
---
a/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/pages/SAML2SP.java
+++
b/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/pages/SAML2SP.java
@@ -22,7 +22,7 @@ import
de.agilecoders.wicket.core.markup.html.bootstrap.tabs.AjaxBootstrapTabbed
import java.util.ArrayList;
import java.util.List;
import org.apache.syncope.client.console.BookmarkablePageLinkBuilder;
-import org.apache.syncope.client.ui.commons.annotations.ExtPage;
+import org.apache.syncope.client.console.annotations.ExtPage;
import org.apache.syncope.client.console.panels.SAML2IdPsDirectoryPanel;
import org.apache.syncope.client.console.panels.SAML2SPPanel;
import org.apache.syncope.common.lib.types.SAML2SPEntitlement;
diff --git
a/ext/scimv2/client-console/src/main/java/org/apache/syncope/client/console/pages/SCIMConfPage.java
b/ext/scimv2/client-console/src/main/java/org/apache/syncope/client/console/pages/SCIMConfPage.java
index dc3c098..918961d 100644
---
a/ext/scimv2/client-console/src/main/java/org/apache/syncope/client/console/pages/SCIMConfPage.java
+++
b/ext/scimv2/client-console/src/main/java/org/apache/syncope/client/console/pages/SCIMConfPage.java
@@ -23,7 +23,7 @@ import java.io.Serializable;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.BookmarkablePageLinkBuilder;
import org.apache.syncope.client.console.SyncopeConsoleSession;
-import org.apache.syncope.client.ui.commons.annotations.ExtPage;
+import org.apache.syncope.client.console.annotations.ExtPage;
import org.apache.syncope.client.console.panels.SCIMConfPanel;
import org.apache.syncope.client.console.rest.SCIMConfRestClient;
import
org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
