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 2014/11/03 19:35:42 UTC
[4/8] [SYNCOPE-599] Merge from 1_1_X
http://git-wip-us.apache.org/repos/asf/syncope/blob/f1607400/console/src/main/java/org/apache/syncope/console/pages/panels/RoleSummaryPanel.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/f1607400/console/src/main/java/org/apache/syncope/console/pages/panels/RoleTabPanel.java
----------------------------------------------------------------------
diff --cc console/src/main/java/org/apache/syncope/console/pages/panels/RoleTabPanel.java
index 0cce34a,9debde4..10d739c
--- a/console/src/main/java/org/apache/syncope/console/pages/panels/RoleTabPanel.java
+++ b/console/src/main/java/org/apache/syncope/console/pages/panels/RoleTabPanel.java
@@@ -109,7 -110,7 +109,7 @@@ public class RoleTabPanel extends Pane
window.show(target);
}
- }, ActionLink.ActionType.MANAGE_RESOURCES, xmlRolesReader.getAllAllowedRoles("Roles", "update"));
- }, ActionLink.ActionType.SEARCH, xmlRolesReader.getEntitlement("Roles", "update"));
++ }, ActionLink.ActionType.MANAGE_RESOURCES, xmlRolesReader.getEntitlement("Roles", "update"));
links.addWithRoles(new ActionLink() {
private static final long serialVersionUID = -3722207913631435501L;
@@@ -152,12 -154,12 +152,12 @@@
});
window.show(target);
- } catch (SyncopeClientCompositeErrorException scce) {
- error(getString(Constants.OPERATION_ERROR) + ": " + scce.getMessage());
- target.add(((Roles) pageRef.getPage()).getFeedbackPanel());
+ } catch (SyncopeClientException e) {
+ error(getString(Constants.OPERATION_ERROR) + ": " + e.getMessage());
+ ((Roles) pageRef.getPage()).getFeedbackPanel().refresh(target);
}
}
- }, ActionLink.ActionType.DELETE, xmlRolesReader.getAllAllowedRoles("Roles", "delete"));
+ }, ActionLink.ActionType.DELETE, xmlRolesReader.getEntitlement("Roles", "delete"));
final Form form = new Form("roleForm");
form.setModel(new CompoundPropertyModel(selectedNode));
http://git-wip-us.apache.org/repos/asf/syncope/blob/f1607400/console/src/main/java/org/apache/syncope/console/pages/panels/SchedTasks.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/f1607400/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/f1607400/console/src/main/resources/consoleContext.xml
----------------------------------------------------------------------
diff --cc console/src/main/resources/consoleContext.xml
index ded9983,0000000..91c884b
mode 100644,000000..100644
--- a/console/src/main/resources/consoleContext.xml
+++ b/console/src/main/resources/consoleContext.xml
@@@ -1,82 -1,0 +1,82 @@@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context.xsd
+ http://cxf.apache.org/core
+ http://cxf.apache.org/schemas/core.xsd">
+
+ <context:component-scan base-package="org.apache.syncope.console.rest"/>
+ <context:component-scan base-package="org.apache.syncope.console.init"/>
+ <context:component-scan base-package="org.apache.syncope.console.preview"/>
+
+ <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="ignoreResourceNotFound" value="true"/>
+ <property name="ignoreUnresolvablePlaceholders" value="true"/>
+ </bean>
+ <bean id="classpathPropertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="location" value="classpath:console.properties"/>
+ </bean>
+
+ <bean id="version" class="java.lang.String">
+ <constructor-arg value="${syncope.version}"/>
+ </bean>
+
+ <bean id="site" class="java.lang.String">
+ <constructor-arg value="${project.parent.url}"/>
+ </bean>
+
+ <bean id="license" class="java.lang.String">
+ <constructor-arg value="${licenseUrl}"/>
+ </bean>
+
+ <bean id="anonymousUser" class="java.lang.String">
+ <constructor-arg value="${anonymousUser}"/>
+ </bean>
+ <bean id="anonymousKey" class="java.lang.String">
+ <constructor-arg value="${anonymousKey}"/>
+ </bean>
+
+ <bean id="activitiModelerDirectory" class="java.lang.String">
+ <constructor-arg value="${activitiModelerDirectory}"/>
+ </bean>
+
+ <bean id="syncopeApplication" class="org.apache.syncope.console.SyncopeApplication"/>
+
+ <bean id="preferenceManager" class="org.apache.syncope.console.commons.PreferenceManager"/>
+
- <bean id="xmlRolesReader" class="org.apache.syncope.console.commons.XMLRolesReader">
++ <bean id="xmlRolesReader" class="org.apache.syncope.console.commons.XMLRolesReader" scope="singleton">
+ <property name="authorizations" value="authorizations.xml"/>
+ </bean>
+
+ <bean id="roleTreeBuilder" class="org.apache.syncope.console.commons.RoleTreeBuilder"/>
+
+ <bean id="syncopeClientFactory" class="org.apache.syncope.client.SyncopeClientFactoryBean">
+ <property name="address" value="${scheme}://${host}:${port}/${rootPath}"/>
+ </bean>
+
+</beans>