Author: jbernhardt
Date: Wed Dec 5 09:04:17 2012
New Revision: 1417319
URL: http://svn.apache.org/viewvc?rev=1417319&view=rev
Log:
Fixes from previous merging
Removed:
syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/RoleControllerImpl.java
syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/UnauthorizedRoleException.java
syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/UserControllerImpl.java
syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/util/NotFoundException.java
syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/notification/NotificationTests.java
syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java
syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
Modified:
syncope/branches/cxf/console/ (props changed)
syncope/branches/cxf/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java
syncope/branches/cxf/core/ (props changed)
syncope/branches/cxf/core/pom.xml
syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/QueryResourceInfoComperator.java
syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java
syncope/branches/cxf/core/src/main/resources/ (props changed)
syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/notification/NotificationTest.java
Propchange: syncope/branches/cxf/console/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Dec 5 09:04:17 2012
@@ -4,3 +4,6 @@ nb-configuration.xml
.pom.xml.swp
.classpath
.project
+.externalToolBuilders
+.settings
+maven-eclipse.xml
Modified:
syncope/branches/cxf/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java
URL:
http://svn.apache.org/viewvc/syncope/branches/cxf/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java?rev=1417319&r1=1417318&r2=1417319&view=diff
==============================================================================
---
syncope/branches/cxf/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java
(original)
+++
syncope/branches/cxf/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java
Wed Dec 5 09:04:17 2012
@@ -88,7 +88,7 @@ public class RolePanel extends Panel {
this.add(new ResourcesPanel("resources", roleTO));
//--------------------------------
- ListModel<String> selectedEntitlements = new
ListModel<String>(roleTO.getEntitlements());
+ ListModel<String> selectedEntitlements = new
ListModel<String>(roleTO.getEntitlementList());
ListModel<String> availableEntitlements = new
ListModel<String>(entitlementRestClient.getAllEntitlements());
Propchange: syncope/branches/cxf/core/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Dec 5 09:04:17 2012
@@ -1,6 +1,10 @@
-target
nb-configuration.xml
nbactions.xml
.pom.xml.swp
+target
.classpath
+.externalToolBuilders
+.settings
.project
+maven-eclipse.xml
+maven.log
