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 2013/10/08 13:18:51 UTC

svn commit: r1530227 - in /syncope/trunk: ./ common/src/main/java/org/apache/syncope/common/report/RoleReportletConf.java core/src/main/java/org/apache/syncope/core/report/RoleReportlet.java

Author: ilgrosso
Date: Tue Oct  8 11:18:50 2013
New Revision: 1530227

URL: http://svn.apache.org/r1530227
Log:
Merge from 1_1_X

Modified:
    syncope/trunk/   (props changed)
    syncope/trunk/common/src/main/java/org/apache/syncope/common/report/RoleReportletConf.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/report/RoleReportlet.java

Propchange: syncope/trunk/
------------------------------------------------------------------------------
  Merged /syncope/branches/1_1_X:r1529192-1530226

Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/report/RoleReportletConf.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/report/RoleReportletConf.java?rev=1530227&r1=1530226&r2=1530227&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/report/RoleReportletConf.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/report/RoleReportletConf.java Tue Oct  8 11:18:50 2013
@@ -45,7 +45,7 @@ public class RoleReportletConf extends A
         name,
         roleOwner,
         userOwner,
-        entitelments,
+        entitlements,
         users,
         resources
 

Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/report/RoleReportlet.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/report/RoleReportlet.java?rev=1530227&r1=1530226&r2=1530227&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/report/RoleReportlet.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/report/RoleReportlet.java Tue Oct  8 11:18:50 2013
@@ -238,7 +238,7 @@ public class RoleReportlet extends Abstr
 
             doExtractAttributes(handler, roleTO, conf.getAttrs(), conf.getDerAttrs(), conf.getVirAttrs());
 
-            if (conf.getFeatures().contains(Feature.entitelments)) {
+            if (conf.getFeatures().contains(Feature.entitlements)) {
                 handler.startElement("", "", "entitlements", null);
 
                 for (String ent : roleTO.getEntitlements()) {