Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Evolveum/midpoint
Browse files Browse the repository at this point in the history 
Conflicts:
	infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
  • Loading branch information
@katkav
katkav committed Jun 23, 2015
2 parents 5da2535 + 7540ff5 commit c852c0b
Show file tree
Hide file tree
Showing 180 changed files with 5,330 additions and 2,627 deletions.
1 change: 1 addition & 0 deletions build-system/pom.xml
View file
Expand Up @@ -37,6 +37,7 @@
<properties>
<!-- Build system options -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.locale>en_US</project.build.locale>
<ansi.color>true</ansi.color>
<verbose.jaxb2>false</verbose.jaxb2>
<verbose.jaxws>false</verbose.jaxws>
Expand Down
6 changes: 6 additions & 0 deletions gui/admin-gui/pom.xml
View file
Expand Up @@ -528,6 +528,12 @@
<groupId>com.evolveum.polygon</groupId>
<artifactId>connector-ldap</artifactId>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.evolveum.polygon</groupId>
Expand Down
4 changes: 3 additions & 1 deletion gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/DescriptorLoader.java
View file
Expand Up @@ -204,8 +204,10 @@ private void loadActions(PageDescriptor descriptor) {
//add http://.../..#guAll authorization only for displayable pages, not for pages used for development..
if (canAccess){

actions.add(new AuthorizationActionValue(AuthorizationConstants.AUTZ_GUI_ALL_URI,
actions.add(new AuthorizationActionValue(AuthorizationConstants.AUTZ_GUI_ALL_DEPRECATED_URL,
AuthorizationConstants.AUTZ_GUI_ALL_LABEL, AuthorizationConstants.AUTZ_GUI_ALL_DESCRIPTION));
actions.add(new AuthorizationActionValue(AuthorizationConstants.AUTZ_GUI_ALL_URL,
AuthorizationConstants.AUTZ_GUI_ALL_LABEL, AuthorizationConstants.AUTZ_GUI_ALL_DESCRIPTION));
}
this.actions.put(url, actions.toArray(new DisplayableValue[actions.size()]));
}
Expand Down
18 changes: 9 additions & 9 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdmin.java
View file
Expand Up @@ -83,50 +83,50 @@ protected List<MenuBarItem> createMenuItems() {

// todo fix with visible behaviour [lazyman]
if (WebMiscUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_DASHBOARD_URL,
AuthorizationConstants.AUTZ_UI_HOME_ALL_URL, AuthorizationConstants.AUTZ_GUI_ALL_URI)) {
AuthorizationConstants.AUTZ_UI_HOME_ALL_URL, AuthorizationConstants.AUTZ_GUI_ALL_URL, AuthorizationConstants.AUTZ_GUI_ALL_DEPRECATED_URL)) {
items.add(createHomeItems());
}

if (WebMiscUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_USERS_URL,
AuthorizationConstants.AUTZ_UI_USERS_ALL_URL, AuthorizationConstants.AUTZ_GUI_ALL_URI)) {
AuthorizationConstants.AUTZ_UI_USERS_ALL_URL, AuthorizationConstants.AUTZ_GUI_ALL_URL, AuthorizationConstants.AUTZ_GUI_ALL_DEPRECATED_URL)) {
items.add(createUsersItems());
}

if (WebMiscUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_ROLES_URL,
AuthorizationConstants.AUTZ_UI_ROLES_ALL_URL, AuthorizationConstants.AUTZ_GUI_ALL_URI)) {
AuthorizationConstants.AUTZ_UI_ROLES_ALL_URL, AuthorizationConstants.AUTZ_GUI_ALL_URL, AuthorizationConstants.AUTZ_GUI_ALL_DEPRECATED_URL)) {
items.add(createRolesItems());
}

if (WebMiscUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_RESOURCES_URL,
AuthorizationConstants.AUTZ_UI_RESOURCES_ALL_URL, AuthorizationConstants.AUTZ_GUI_ALL_URI)) {
AuthorizationConstants.AUTZ_UI_RESOURCES_ALL_URL, AuthorizationConstants.AUTZ_GUI_ALL_URL, AuthorizationConstants.AUTZ_GUI_ALL_DEPRECATED_URL)) {
items.add(createResourcesItems());
}

if (WebMiscUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_WORK_ITEMS_URL,
AuthorizationConstants.AUTZ_UI_WORK_ITEMS_ALL_URL, AuthorizationConstants.AUTZ_GUI_ALL_URI)) {
AuthorizationConstants.AUTZ_UI_WORK_ITEMS_ALL_URL, AuthorizationConstants.AUTZ_GUI_ALL_URL, AuthorizationConstants.AUTZ_GUI_ALL_DEPRECATED_URL)) {
if (getWorkflowManager().isEnabled()) {
items.add(createWorkItemsItems());
}
}

if (WebMiscUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_CERTIFICATION_URL,
AuthorizationConstants.AUTZ_GUI_ALL_URI)
AuthorizationConstants.AUTZ_GUI_ALL_URL, AuthorizationConstants.AUTZ_GUI_ALL_DEPRECATED_URL)
&& SystemConfigurationHolder.isExperimentalCodeEnabled()) {
items.add(createCertificationItems());
}

if (WebMiscUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_TASKS_URL,
AuthorizationConstants.AUTZ_UI_TASKS_ALL_URL, AuthorizationConstants.AUTZ_GUI_ALL_URI)) {
AuthorizationConstants.AUTZ_UI_TASKS_ALL_URL, AuthorizationConstants.AUTZ_GUI_ALL_URL, AuthorizationConstants.AUTZ_GUI_ALL_DEPRECATED_URL)) {
items.add(createServerTasksItems());
}

if (WebMiscUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_REPORTS_URL,
AuthorizationConstants.AUTZ_GUI_ALL_URI)) {
AuthorizationConstants.AUTZ_GUI_ALL_DEPRECATED_URL)) {
items.add(createReportsItems());
}

if (WebMiscUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_CONFIGURATION_URL,
AuthorizationConstants.AUTZ_UI_CONFIGURATION_ALL_URL, AuthorizationConstants.AUTZ_GUI_ALL_URI)) {
AuthorizationConstants.AUTZ_UI_CONFIGURATION_ALL_URL, AuthorizationConstants.AUTZ_GUI_ALL_URL, AuthorizationConstants.AUTZ_GUI_ALL_DEPRECATED_URL)) {
items.add(createConfigurationItems());
}

Expand Down
2 changes: 1 addition & 1 deletion .../main/java/com/evolveum/midpoint/web/page/admin/certification/PageAdminCertification.java
View file
Expand Up @@ -25,7 +25,7 @@
*/
public class PageAdminCertification extends PageAdmin {

public static final String AUTH_CERTIFICATION_ALL = AuthorizationConstants.NS_AUTHORIZATION + "#certificationAll";
public static final String AUTH_CERTIFICATION_ALL = AuthorizationConstants.AUTZ_UI_CERTIFICATION_ALL_URL;
public static final String AUTH_CERTIFICATION_ALL_LABEL = "PageAdminWorkItems.auth.workItemsAll.label";
public static final String AUTH_CERTIFICATION_ALL_DESCRIPTION = "PageAdminWorkItems.auth.workItemsAll.description";
}
4 changes: 3 additions & 1 deletion ...i/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaigns.html
View file
Expand Up @@ -18,7 +18,9 @@
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<body>
<wicket:extend>


<div wicket:id="confirmMultipleCloseStagePopup" />
<div wicket:id="confirmCloseStagePopup" />
<form wicket:id="mainForm" class="clearfix form-horizontal">
<div wicket:id="campaignsTable"/>
</form>
Expand Down

0 comments on commit c852c0b

Please sign in to comment.