syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject svn commit: r1531003 [1/9] - in /syncope/trunk: ./ common/src/main/java/org/apache/syncope/common/ common/src/main/java/org/apache/syncope/common/mod/ common/src/main/java/org/apache/syncope/common/to/ common/src/main/java/org/apache/syncope/common/uti...
Date Thu, 10 Oct 2013 14:38:00 GMT
Author: ilgrosso
Date: Thu Oct 10 14:37:56 2013
New Revision: 1531003

URL: http://svn.apache.org/r1531003
Log:
[SYNCOPE-131] Introducing at any level the concept of attribute template (for roles and memberships)

Added:
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttrTemplatesPanel.java   (with props)
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/AttrTemplatesPanel.html   (with props)
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/AttrTemplatesPanel.properties   (with props)
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/AttrTemplatesPanel_it.properties   (with props)
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/AttrTemplatesPanel_pt_BR.properties   (with props)
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/SQLSchemaGenerator.java   (with props)
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/SysInfoListener.java
      - copied, changed from r1528111, syncope/trunk/core/src/main/java/org/apache/syncope/core/util/SysInfoListener.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractAttrTemplate.java   (with props)
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractNormalSchema.java
      - copied, changed from r1529782, syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractSchema.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MAttrTemplate.java   (with props)
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MDerAttrTemplate.java   (with props)
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MVirAttrTemplate.java   (with props)
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RAttrTemplate.java   (with props)
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RDerAttrTemplate.java   (with props)
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RVirAttrTemplate.java   (with props)
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/AttrTemplateDAO.java   (with props)
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/AttrTemplateDAOImpl.java   (with props)
Removed:
    syncope/trunk/core/src/main/java/org/apache/syncope/core/util/SysInfoListener.java
Modified:
    syncope/trunk/common/src/main/java/org/apache/syncope/common/SyncopeConstants.java
    syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/AbstractAttributableMod.java
    syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/MembershipMod.java
    syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/RoleMod.java
    syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/UserMod.java
    syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractAttributableTO.java
    syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConnObjectTO.java
    syncope/trunk/common/src/main/java/org/apache/syncope/common/to/RoleTO.java
    syncope/trunk/common/src/main/java/org/apache/syncope/common/util/AttributableOperations.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/Constants.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/SortableAttributableProviderComparator.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/StatusUtils.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnObjectModalPage.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DisplayAttributesModalPage.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/MembershipModalPage.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportletConfModalPage.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResultStatusModalPage.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Roles.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Tasks.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/VirtualSchemaModalPage.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractSearchPanel.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/DerivedAttributesPanel.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleDetailsPanel.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasks.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserSearchResultPanel.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/VirtualAttributesPanel.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/SchemaRestClient.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/extensions/markup/html/repeater/data/table/AttrColumn.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxCheckBoxPanel.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxPalettePanel.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/FieldPanel.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/TreeActionLinkPanel.java
    syncope/trunk/console/src/main/resources/log4j2.xml
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/MembershipModalPage.html
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/MembershipModalPage.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/MembershipModalPage_it.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/MembershipModalPage_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResultStatusModalPage.html
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/RoleModalPage.html
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/RoleModalPage.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/RoleModalPage_it.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/RoleModalPage_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/UserModalPage.html
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/UserModalPage.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/UserModalPage_it.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/UserModalPage_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/DerivedAttributesPanel.html
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleDetailsPanel.html
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleDetailsPanel.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleDetailsPanel_it.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleDetailsPanel_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RolePanel.html
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RolePanel.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RolePanel_it.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RolePanel_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleSummaryPanel.html
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleTabPanel.html
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleTabPanel.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleTabPanel_it.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleTabPanel_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/VirtualAttributesPanel.html
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/AjaxPalettePanel.html
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/NonI18nPalette.html
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/tree/TreeActionLinkPanel.html
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/tree/TreeActionLinkPanel_pt_BR.properties
    syncope/trunk/console/src/test/java/org/apache/syncope/console/RoleTestITCase.java
    syncope/trunk/core/pom.xml
    syncope/trunk/core/src/main/java/org/apache/syncope/core/connid/ConnObjectUtil.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/init/JobInstanceLoader.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/notification/NotificationManager.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractAttr.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractAttrUniqueValue.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractAttrValue.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractAttributable.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractDerAttr.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractDerSchema.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractSchema.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractSysInfo.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractVirAttr.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractVirSchema.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MAttr.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MAttrUniqueValue.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MDerAttr.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MSchema.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MVirAttr.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/Membership.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RAttr.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RAttrUniqueValue.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RDerAttr.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RSchema.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RVirAttr.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/SyncopeRole.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UAttr.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UAttrUniqueValue.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UDerAttr.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/USchema.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UVirAttr.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/AttrDAO.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/DerSchemaDAO.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/SchemaDAO.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/VirSchemaDAO.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/AbstractAttributableDAOImpl.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/AttrDAOImpl.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/AttributableSearchDAOImpl.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/ContentLoader.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/DerAttrDAOImpl.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/DerSchemaDAOImpl.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/PolicyDAOImpl.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/RoleDAOImpl.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/SchemaDAOImpl.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/UserDAOImpl.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/VirAttrDAOImpl.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/VirSchemaDAOImpl.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/attrvalue/AbstractValidator.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/attrvalue/AlwaysTrueValidator.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/attrvalue/BasicValidator.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/attrvalue/EmailAddressValidator.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/AttrValueValidator.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SchemaValidator.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/policy/PolicyEvaluator.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/LDAPMembershipPropagationActions.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/PropagationManager.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/report/AbstractReportlet.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/report/ReportJob.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/report/RoleReportlet.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/report/UserReportlet.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/ResourceController.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/SchemaController.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/AbstractAttributableDataBinder.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/PolicyDataBinder.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/RoleDataBinder.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/SchemaDataBinder.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/TaskDataBinder.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/UserDataBinder.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/LDAPMembershipSyncActions.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/SyncopeSyncResultHandler.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/util/AttributableUtil.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/util/EntitlementUtil.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/util/JexlUtil.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/util/MappingUtil.java
    syncope/trunk/core/src/main/resources/indexes.xml
    syncope/trunk/core/src/main/resources/views.xml
    syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/AttrTest.java
    syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/DerAttrTest.java
    syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/DerSchemaTest.java
    syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/RoleTest.java
    syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/SchemaTest.java
    syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/VirAttrTest.java
    syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/VirSchemaTest.java
    syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/relationships/AttrTest.java
    syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/relationships/DerSchemaTest.java
    syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/relationships/SchemaTest.java
    syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AuthenticationTestITCase.java
    syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/DerivedSchemaTestITCase.java
    syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java
    syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/SchemaTestITCase.java
    syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/SearchTestITCase.java
    syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
    syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
    syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/VirtualSchemaTestITCase.java
    syncope/trunk/core/src/test/java/org/apache/syncope/core/sync/TestSyncActions.java
    syncope/trunk/core/src/test/resources/content.xml
    syncope/trunk/pom.xml

Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/SyncopeConstants.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/SyncopeConstants.java?rev=1531003&r1=1531002&r2=1531003&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/SyncopeConstants.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/SyncopeConstants.java Thu Oct 10 14:37:56 2013
@@ -20,6 +20,10 @@ package org.apache.syncope.common;
 
 public class SyncopeConstants {
 
+    public static final String ANONYMOUS_USER = "anonymous";
+
+    public static final String ENUM_VALUES_SEPARATOR = ";";
+
     public static final String[] DATE_PATTERNS = {
         "yyyy-MM-dd'T'HH:mm:ssZ",
         "EEE, dd MMM yyyy HH:mm:ss z",

Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/AbstractAttributableMod.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/AbstractAttributableMod.java?rev=1531003&r1=1531002&r2=1531003&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/AbstractAttributableMod.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/AbstractAttributableMod.java Thu Oct 10 14:37:56 2013
@@ -40,21 +40,21 @@ public abstract class AbstractAttributab
 
     protected long id;
 
-    protected Set<AttributeMod> attributesToBeUpdated;
+    protected Set<AttributeMod> attrsToUpdate;
 
-    protected Set<String> attributesToBeRemoved;
+    protected Set<String> attrsToRemove;
 
-    protected Set<String> derivedAttributesToBeAdded;
+    protected Set<String> derAttrsToAdd;
 
-    protected Set<String> derivedAttributesToBeRemoved;
+    protected Set<String> derAttrsToRemove;
 
-    protected Set<AttributeMod> virtualAttributesToBeUpdated;
+    protected Set<AttributeMod> virAttrsToUpdate;
 
-    protected Set<String> virtualAttributesToBeRemoved;
+    protected Set<String> virAttrsToRemove;
 
-    protected Set<String> resourcesToBeAdded;
+    protected Set<String> resourcesToAdd;
 
-    protected Set<String> resourcesToBeRemoved;
+    protected Set<String> resourcesToRemove;
 
     /**
      * All attributes are initialized to empty sets.
@@ -62,14 +62,14 @@ public abstract class AbstractAttributab
     public AbstractAttributableMod() {
         super();
 
-        attributesToBeUpdated = new HashSet<AttributeMod>();
-        attributesToBeRemoved = new HashSet<String>();
-        derivedAttributesToBeAdded = new HashSet<String>();
-        derivedAttributesToBeRemoved = new HashSet<String>();
-        virtualAttributesToBeUpdated = new HashSet<AttributeMod>();
-        virtualAttributesToBeRemoved = new HashSet<String>();
-        resourcesToBeAdded = new HashSet<String>();
-        resourcesToBeRemoved = new HashSet<String>();
+        attrsToUpdate = new HashSet<AttributeMod>();
+        attrsToRemove = new HashSet<String>();
+        derAttrsToAdd = new HashSet<String>();
+        derAttrsToRemove = new HashSet<String>();
+        virAttrsToUpdate = new HashSet<AttributeMod>();
+        virAttrsToRemove = new HashSet<String>();
+        resourcesToAdd = new HashSet<String>();
+        resourcesToRemove = new HashSet<String>();
     }
 
     public long getId() {
@@ -80,69 +80,69 @@ public abstract class AbstractAttributab
         this.id = id;
     }
 
-    @XmlElementWrapper(name = "attributesToBeRemoved")
+    @XmlElementWrapper(name = "attributesToRemove")
     @XmlElement(name = "attribute")
-    @JsonProperty("attributesToBeRemoved")
-    public Set<String> getAttributesToBeRemoved() {
-        return attributesToBeRemoved;
+    @JsonProperty("attributesToRemove")
+    public Set<String> getAttrsToRemove() {
+        return attrsToRemove;
     }
 
-    @XmlElementWrapper(name = "attributesToBeUpdated")
+    @XmlElementWrapper(name = "attributesToUpdate")
     @XmlElement(name = "attributeMod")
-    @JsonProperty("attributesToBeUpdated")
-    public Set<AttributeMod> getAttributesToBeUpdated() {
-        return attributesToBeUpdated;
+    @JsonProperty("attributesToUpdate")
+    public Set<AttributeMod> getAttrsToUpdate() {
+        return attrsToUpdate;
     }
 
-    @XmlElementWrapper(name = "derivedAttributesToBeAdded")
-    @XmlElement(name = "attributeName")
-    @JsonProperty("derivedAttributesToBeAdded")
-    public Set<String> getDerivedAttributesToBeAdded() {
-        return derivedAttributesToBeAdded;
+    @XmlElementWrapper(name = "derAttrsToAdd")
+    @XmlElement(name = "attribute")
+    @JsonProperty("derAttrsToAdd")
+    public Set<String> getDerAttrsToAdd() {
+        return derAttrsToAdd;
     }
 
-    @XmlElementWrapper(name = "derivedAttributesToBeRemoved")
+    @XmlElementWrapper(name = "derAttrsToRemove")
     @XmlElement(name = "attribute")
-    @JsonProperty("derivedAttributesToBeRemoved")
-    public Set<String> getDerivedAttributesToBeRemoved() {
-        return derivedAttributesToBeRemoved;
+    @JsonProperty("derAttrsToRemove")
+    public Set<String> getDerAttrsToRemove() {
+        return derAttrsToRemove;
     }
 
-    @XmlElementWrapper(name = "virtualAttributesToBeRemoved")
+    @XmlElementWrapper(name = "virAttrsToRemove")
     @XmlElement(name = "attribute")
-    @JsonProperty("virtualAttributesToBeRemoved")
-    public Set<String> getVirtualAttributesToBeRemoved() {
-        return virtualAttributesToBeRemoved;
+    @JsonProperty("virAttrsToRemove")
+    public Set<String> getVirAttrsToRemove() {
+        return virAttrsToRemove;
     }
 
-    @XmlElementWrapper(name = "virtualAttributesToBeUpdated")
+    @XmlElementWrapper(name = "virAttrsToUpdate")
     @XmlElement(name = "attribute")
-    @JsonProperty("virtualAttributesToBeUpdated")
-    public Set<AttributeMod> getVirtualAttributesToBeUpdated() {
-        return virtualAttributesToBeUpdated;
+    @JsonProperty("virAttrsToUpdate")
+    public Set<AttributeMod> getVirAttrsToUpdate() {
+        return virAttrsToUpdate;
     }
 
-    @XmlElementWrapper(name = "resourcesToBeAdded")
+    @XmlElementWrapper(name = "resourcesToAdd")
     @XmlElement(name = "resource")
-    @JsonProperty("resourcesToBeAdded")
-    public Set<String> getResourcesToBeAdded() {
-        return resourcesToBeAdded;
+    @JsonProperty("resourcesToAdd")
+    public Set<String> getResourcesToAdd() {
+        return resourcesToAdd;
     }
 
-    @XmlElementWrapper(name = "resourcesToBeRemoved")
+    @XmlElementWrapper(name = "resourcesToRemove")
     @XmlElement(name = "resource")
-    @JsonProperty("resourcesToBeRemoved")
-    public Set<String> getResourcesToBeRemoved() {
-        return resourcesToBeRemoved;
+    @JsonProperty("resourcesToRemove")
+    public Set<String> getResourcesToRemove() {
+        return resourcesToRemove;
     }
 
     /**
      * @return true is all backing Sets are empty.
      */
     public boolean isEmpty() {
-        return attributesToBeUpdated.isEmpty() && attributesToBeRemoved.isEmpty()
-                && derivedAttributesToBeAdded.isEmpty() && derivedAttributesToBeRemoved.isEmpty()
-                && virtualAttributesToBeUpdated.isEmpty() && virtualAttributesToBeRemoved.isEmpty()
-                && resourcesToBeAdded.isEmpty() && resourcesToBeRemoved.isEmpty();
+        return attrsToUpdate.isEmpty() && attrsToRemove.isEmpty()
+                && derAttrsToAdd.isEmpty() && derAttrsToRemove.isEmpty()
+                && virAttrsToUpdate.isEmpty() && virAttrsToRemove.isEmpty()
+                && resourcesToAdd.isEmpty() && resourcesToRemove.isEmpty();
     }
 }

Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/MembershipMod.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/MembershipMod.java?rev=1531003&r1=1531002&r2=1531003&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/MembershipMod.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/MembershipMod.java Thu Oct 10 14:37:56 2013
@@ -44,19 +44,19 @@ public class MembershipMod extends Abstr
         this.role = role;
     }
 
-    @XmlElementWrapper(name = "resourcesToBeAdded")
+    @XmlElementWrapper(name = "resourcesToAdd")
     @XmlElement(name = "resource")
-    @JsonProperty("resourcesToBeAdded")
+    @JsonProperty("resourcesToAdd")
     @Override
-    public Set<String> getResourcesToBeAdded() {
+    public Set<String> getResourcesToAdd() {
         return Collections.emptySet();
     }
 
-    @XmlElementWrapper(name = "resourcesToBeRemoved")
+    @XmlElementWrapper(name = "resourcesToRemove")
     @XmlElement(name = "resource")
-    @JsonProperty("resourcesToBeRemoved")
+    @JsonProperty("resourcesToRemove")
     @Override
-    public Set<String> getResourcesToBeRemoved() {
+    public Set<String> getResourcesToRemove() {
         return Collections.emptySet();
     }
 

Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/RoleMod.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/RoleMod.java?rev=1531003&r1=1531002&r2=1531003&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/RoleMod.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/RoleMod.java Thu Oct 10 14:37:56 2013
@@ -42,20 +42,46 @@ public class RoleMod extends AbstractAtt
 
     private Boolean inheritOwner;
 
-    private Boolean inheritAttributes;
+    private Boolean inheritTemplates;
 
-    private Boolean inheritDerivedAttributes;
+    private Boolean inheritAttrs;
 
-    private Boolean inheritVirtualAttributes;
+    private Boolean inheritDerAttrs;
+
+    private Boolean inheritVirAttrs;
 
     private Boolean inheritAccountPolicy;
 
     private Boolean inheritPasswordPolicy;
 
     private boolean modEntitlements;
-    
+
     private List<String> entitlements = new ArrayList<String>();
 
+    private boolean modRAttrTemplates;
+
+    private List<String> rAttrTemplates = new ArrayList<String>();
+
+    private boolean modRDerAttrTemplates;
+
+    private List<String> rDerAttrTemplates = new ArrayList<String>();
+
+    private boolean modRVirAttrTemplates;
+
+    private List<String> rVirAttrTemplates = new ArrayList<String>();
+
+    private boolean modMAttrTemplates;
+
+    private List<String> mAttrTemplates = new ArrayList<String>();
+
+    private boolean modMDerAttrTemplates;
+
+    private List<String> mDerAttrTemplates = new ArrayList<String>();
+
+    private boolean modMVirAttrTemplates;
+
+    private List<String> mVirAttrTemplates = new ArrayList<String>();
+
     private ReferenceMod passwordPolicy;
 
     private ReferenceMod accountPolicy;
@@ -92,28 +118,36 @@ public class RoleMod extends AbstractAtt
         this.inheritOwner = inheritOwner;
     }
 
-    public Boolean getInheritAttributes() {
-        return inheritAttributes;
+    public Boolean getInheritTemplates() {
+        return inheritTemplates;
     }
 
-    public void setInheritAttributes(final Boolean inheritAttributes) {
-        this.inheritAttributes = inheritAttributes;
+    public void setInheritTemplates(final Boolean inheritTemplates) {
+        this.inheritTemplates = inheritTemplates;
     }
 
-    public Boolean getInheritDerivedAttributes() {
-        return inheritDerivedAttributes;
+    public Boolean getInheritAttrs() {
+        return inheritAttrs;
     }
 
-    public void setInheritDerivedAttributes(final Boolean inheritDerivedAttributes) {
-        this.inheritDerivedAttributes = inheritDerivedAttributes;
+    public void setInheritAttributes(final Boolean inheritAttrs) {
+        this.inheritAttrs = inheritAttrs;
     }
 
-    public Boolean getInheritVirtualAttributes() {
-        return inheritVirtualAttributes;
+    public Boolean getInheritDerAttrs() {
+        return inheritDerAttrs;
     }
 
-    public void setInheritVirtualAttributes(final Boolean inheritVirtualAttributes) {
-        this.inheritVirtualAttributes = inheritVirtualAttributes;
+    public void setInheritDerAttrs(final Boolean inheritDerAttrs) {
+        this.inheritDerAttrs = inheritDerAttrs;
+    }
+
+    public Boolean getInheritVirAttrs() {
+        return inheritVirAttrs;
+    }
+
+    public void setInheritVirAttrs(final Boolean inheritVirAttrs) {
+        this.inheritVirAttrs = inheritVirAttrs;
     }
 
     public boolean isModEntitlements() {
@@ -122,7 +156,7 @@ public class RoleMod extends AbstractAtt
 
     public void setModEntitlements(final boolean modEntitlements) {
         this.modEntitlements = modEntitlements;
-    }    
+    }
 
     @XmlElementWrapper(name = "entitlements")
     @XmlElement(name = "entitlement")
@@ -131,6 +165,96 @@ public class RoleMod extends AbstractAtt
         return entitlements;
     }
 
+    public boolean isModRAttrTemplates() {
+        return modRAttrTemplates;
+    }
+
+    public void setModRAttrTemplates(final boolean modRAttrTemplates) {
+        this.modRAttrTemplates = modRAttrTemplates;
+    }
+
+    @XmlElementWrapper(name = "rAttrTemplates")
+    @XmlElement(name = "rAttrTemplate")
+    @JsonProperty("rAttrTemplates")
+    public List<String> getRAttrTemplates() {
+        return rAttrTemplates;
+    }
+
+    public boolean isModRDerAttrTemplates() {
+        return modRDerAttrTemplates;
+    }
+
+    public void setModRDerAttrTemplates(final boolean modRDerAttrTemplates) {
+        this.modRDerAttrTemplates = modRDerAttrTemplates;
+    }
+
+    @XmlElementWrapper(name = "rDerAttrTemplates")
+    @XmlElement(name = "rDerAttrTemplate")
+    @JsonProperty("rDerAttrTemplates")
+    public List<String> getRDerAttrTemplates() {
+        return rDerAttrTemplates;
+    }
+
+    public boolean isModRVirAttrTemplates() {
+        return modRVirAttrTemplates;
+    }
+
+    public void setModRVirAttrTemplates(final boolean modRVirAttrTemplates) {
+        this.modRVirAttrTemplates = modRVirAttrTemplates;
+    }
+
+    @XmlElementWrapper(name = "rVirAttrTemplates")
+    @XmlElement(name = "rVirAttrTemplate")
+    @JsonProperty("rVirAttrTemplates")
+    public List<String> getRVirAttrTemplates() {
+        return rVirAttrTemplates;
+    }
+
+    public boolean isModMAttrTemplates() {
+        return modMAttrTemplates;
+    }
+
+    public void setModMAttrTemplates(final boolean modMAttrTemplates) {
+        this.modMAttrTemplates = modMAttrTemplates;
+    }
+
+    @XmlElementWrapper(name = "mAttrTemplates")
+    @XmlElement(name = "mAttrTemplate")
+    @JsonProperty("mAttrTemplates")
+    public List<String> getMAttrTemplates() {
+        return mAttrTemplates;
+    }
+
+    public boolean isModMDerAttrTemplates() {
+        return modMDerAttrTemplates;
+    }
+
+    public void setModMDerAttrTemplates(final boolean modMDerAttrTemplates) {
+        this.modMDerAttrTemplates = modMDerAttrTemplates;
+    }
+
+    @XmlElementWrapper(name = "mDerAttrTemplates")
+    @XmlElement(name = "mDerAttrTemplate")
+    @JsonProperty("mDerAttrTemplates")
+    public List<String> getMDerAttrTemplates() {
+        return mDerAttrTemplates;
+    }
+
+    public boolean isModMVirAttrTemplates() {
+        return modMVirAttrTemplates;
+    }
+
+    public void setModMVirAttrTemplates(final boolean modMVirAttrTemplates) {
+        this.modMVirAttrTemplates = modMVirAttrTemplates;
+    }
+
+    @XmlElementWrapper(name = "mVirAttrTemplates")
+    @XmlElement(name = "mVirAttrTemplate")
+    @JsonProperty("mVirAttrTemplates")
+    public List<String> getMVirAttrTemplates() {
+        return mVirAttrTemplates;
+    }
+
     public ReferenceMod getPasswordPolicy() {
         return passwordPolicy;
     }
@@ -167,8 +291,11 @@ public class RoleMod extends AbstractAtt
     @Override
     public boolean isEmpty() {
         return super.isEmpty() && name == null && userOwner == null && roleOwner == null
-                && inheritOwner == null && inheritAccountPolicy == null && inheritPasswordPolicy == null
-                && inheritAttributes == null && inheritDerivedAttributes == null && inheritVirtualAttributes == null
-                && accountPolicy == null && passwordPolicy == null && (entitlements == null || entitlements.isEmpty());
+                && inheritTemplates == null && inheritOwner == null
+                && inheritAccountPolicy == null && inheritPasswordPolicy == null
+                && inheritAttrs == null && inheritDerAttrs == null && inheritVirAttrs == null
+                && accountPolicy == null && passwordPolicy == null && entitlements.isEmpty()
+                && rAttrTemplates.isEmpty() && rDerAttrTemplates.isEmpty() && rVirAttrTemplates.isEmpty()
+                && mAttrTemplates.isEmpty() && mDerAttrTemplates.isEmpty() && mVirAttrTemplates.isEmpty();
     }
 }

Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/UserMod.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/UserMod.java?rev=1531003&r1=1531002&r2=1531003&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/UserMod.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/UserMod.java Thu Oct 10 14:37:56 2013
@@ -38,17 +38,17 @@ public class UserMod extends AbstractAtt
 
     private String username;
 
-    private final Set<MembershipMod> membershipsToBeAdded;
+    private final Set<MembershipMod> membershipsToAdd;
 
-    private final Set<Long> membershipsToBeRemoved;
+    private final Set<Long> membershipsToRemove;
 
     private PropagationRequestTO pwdPropRequest;
 
     public UserMod() {
         super();
 
-        membershipsToBeAdded = new HashSet<MembershipMod>();
-        membershipsToBeRemoved = new HashSet<Long>();
+        membershipsToAdd = new HashSet<MembershipMod>();
+        membershipsToRemove = new HashSet<Long>();
     }
 
     public String getUsername() {
@@ -67,18 +67,18 @@ public class UserMod extends AbstractAtt
         this.password = password;
     }
 
-    @XmlElementWrapper(name = "membershipsToBeAdded")
+    @XmlElementWrapper(name = "membershipsToAdd")
     @XmlElement(name = "membership")
-    @JsonProperty("membershipsToBeAdded")
-    public Set<MembershipMod> getMembershipsToBeAdded() {
-        return membershipsToBeAdded;
+    @JsonProperty("membershipsToAdd")
+    public Set<MembershipMod> getMembershipsToAdd() {
+        return membershipsToAdd;
     }
 
-    @XmlElementWrapper(name = "membershipsToBeRemoved")
+    @XmlElementWrapper(name = "membershipsToRemove")
     @XmlElement(name = "membership")
-    @JsonProperty("membershipsToBeRemoved")
-    public Set<Long> getMembershipsToBeRemoved() {
-        return membershipsToBeRemoved;
+    @JsonProperty("membershipsToRemove")
+    public Set<Long> getMembershipsToRemove() {
+        return membershipsToRemove;
     }
 
     public PropagationRequestTO getPwdPropRequest() {
@@ -95,8 +95,8 @@ public class UserMod extends AbstractAtt
         return super.isEmpty()
                 && password == null
                 && username == null
-                && membershipsToBeAdded.isEmpty()
-                && membershipsToBeRemoved.isEmpty()
+                && membershipsToAdd.isEmpty()
+                && membershipsToRemove.isEmpty()
                 && pwdPropRequest == null;
     }
 }

Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractAttributableTO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractAttributableTO.java?rev=1531003&r1=1531002&r2=1531003&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractAttributableTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractAttributableTO.java Thu Oct 10 14:37:56 2013
@@ -38,9 +38,9 @@ public abstract class AbstractAttributab
 
     private long id;
 
-    private List<AttributeTO> derivedAttributes;
+    private List<AttributeTO> derAttrs;
 
-    private List<AttributeTO> virtualAttributes;
+    private List<AttributeTO> virAttrs;
 
     private Set<String> resources;
 
@@ -49,8 +49,8 @@ public abstract class AbstractAttributab
     protected AbstractAttributableTO() {
         super();
 
-        derivedAttributes = new ArrayList<AttributeTO>();
-        virtualAttributes = new ArrayList<AttributeTO>();
+        derAttrs = new ArrayList<AttributeTO>();
+        virAttrs = new ArrayList<AttributeTO>();
         resources = new HashSet<String>();
         propagationStatusTOs = new ArrayList<PropagationStatusTO>();
     }
@@ -64,14 +64,14 @@ public abstract class AbstractAttributab
     }
 
     @JsonIgnore
-    public Map<String, AttributeTO> getDerivedAttributeMap() {
+    public Map<String, AttributeTO> getDerAttrMap() {
         Map<String, AttributeTO> result;
 
-        if (derivedAttributes == null) {
+        if (derAttrs == null) {
             result = Collections.emptyMap();
         } else {
-            result = new HashMap<String, AttributeTO>(derivedAttributes.size());
-            for (AttributeTO attributeTO : derivedAttributes) {
+            result = new HashMap<String, AttributeTO>(derAttrs.size());
+            for (AttributeTO attributeTO : derAttrs) {
                 result.put(attributeTO.getSchema(), attributeTO);
             }
             result = Collections.unmodifiableMap(result);
@@ -81,14 +81,14 @@ public abstract class AbstractAttributab
     }
 
     @JsonIgnore
-    public Map<String, AttributeTO> getVirtualAttributeMap() {
+    public Map<String, AttributeTO> getVirAttrMap() {
         Map<String, AttributeTO> result;
 
-        if (derivedAttributes == null) {
+        if (derAttrs == null) {
             result = Collections.emptyMap();
         } else {
-            result = new HashMap<String, AttributeTO>(virtualAttributes.size());
-            for (AttributeTO attributeTO : virtualAttributes) {
+            result = new HashMap<String, AttributeTO>(virAttrs.size());
+            for (AttributeTO attributeTO : virAttrs) {
                 result.put(attributeTO.getSchema(), attributeTO);
             }
             result = Collections.unmodifiableMap(result);
@@ -100,15 +100,15 @@ public abstract class AbstractAttributab
     @XmlElementWrapper(name = "derivedAttributes")
     @XmlElement(name = "attribute")
     @JsonProperty("derivedAttributes")
-    public List<AttributeTO> getDerivedAttributes() {
-        return derivedAttributes;
+    public List<AttributeTO> getDerAttrs() {
+        return derAttrs;
     }
 
     @XmlElementWrapper(name = "virtualAttributes")
     @XmlElement(name = "attribute")
     @JsonProperty("virtualAttributes")
-    public List<AttributeTO> getVirtualAttributes() {
-        return virtualAttributes;
+    public List<AttributeTO> getVirAttrs() {
+        return virAttrs;
     }
 
     @XmlElementWrapper(name = "resources")

Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConnObjectTO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConnObjectTO.java?rev=1531003&r1=1531002&r2=1531003&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConnObjectTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConnObjectTO.java Thu Oct 10 14:37:56 2013
@@ -36,24 +36,24 @@ public class ConnObjectTO extends Abstra
 
     private static final long serialVersionUID = 5139554911265442497L;
 
-    private List<AttributeTO> attributes = new ArrayList<AttributeTO>();
+    private List<AttributeTO> attrs = new ArrayList<AttributeTO>();
 
     @XmlElementWrapper(name = "attributes")
     @XmlElement(name = "attribute")
     @JsonProperty("attributes")
-    public List<AttributeTO> getAttributes() {
-        return attributes;
+    public List<AttributeTO> getAttrs() {
+        return attrs;
     }
 
     @JsonIgnore
-    public Map<String, AttributeTO> getAttributeMap() {
+    public Map<String, AttributeTO> getAttrMap() {
         Map<String, AttributeTO> result;
 
-        if (attributes == null) {
+        if (attrs == null) {
             result = Collections.<String, AttributeTO>emptyMap();
         } else {
-            result = new HashMap<String, AttributeTO>(attributes.size());
-            for (AttributeTO attributeTO : attributes) {
+            result = new HashMap<String, AttributeTO>(attrs.size());
+            for (AttributeTO attributeTO : attrs) {
                 result.put(attributeTO.getSchema(), attributeTO);
             }
             result = Collections.<String, AttributeTO>unmodifiableMap(result);

Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/to/RoleTO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/RoleTO.java?rev=1531003&r1=1531002&r2=1531003&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/RoleTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/RoleTO.java Thu Oct 10 14:37:56 2013
@@ -45,11 +45,13 @@ public class RoleTO extends AbstractAttr
 
     private boolean inheritOwner;
 
-    private boolean inheritAttributes;
+    private boolean inheritTemplates;
 
-    private boolean inheritDerivedAttributes;
+    private boolean inheritAttrs;
 
-    private boolean inheritVirtualAttributes;
+    private boolean inheritDerAttrs;
+
+    private boolean inheritVirAttrs;
 
     private boolean inheritPasswordPolicy;
 
@@ -57,6 +59,18 @@ public class RoleTO extends AbstractAttr
 
     private final List<String> entitlements = new ArrayList<String>();
 
+    private List<String> rAttrTemplates = new ArrayList<String>();
+
+    private List<String> rDerAttrTemplates = new ArrayList<String>();
+
+    private List<String> rVirAttrTemplates = new ArrayList<String>();
+
+    private List<String> mAttrTemplates = new ArrayList<String>();
+
+    private List<String> mDerAttrTemplates = new ArrayList<String>();
+
+    private List<String> mVirAttrTemplates = new ArrayList<String>();
+
     private Long passwordPolicy;
 
     private Long accountPolicy;
@@ -101,29 +115,36 @@ public class RoleTO extends AbstractAttr
         this.inheritOwner = inheritOwner;
     }
 
-    public boolean isInheritAttributes() {
-        return inheritAttributes;
+    public boolean isInheritTemplates() {
+        return inheritTemplates;
+    }
+
+    public void setInheritTemplates(boolean inheritTemplates) {
+        this.inheritTemplates = inheritTemplates;
     }
 
-    public void setInheritAttributes(final boolean inheritAttributes) {
-        this.inheritAttributes = inheritAttributes;
+    public boolean isInheritAttrs() {
+        return inheritAttrs;
     }
 
-    public boolean isInheritDerivedAttributes() {
-        return inheritDerivedAttributes;
+    public void setInheritAttrs(final boolean inheritAttrs) {
+        this.inheritAttrs = inheritAttrs;
     }
 
-    public void setInheritDerivedAttributes(final boolean inheritDerivedAttributes) {
+    public boolean isInheritDerAttrs() {
+        return inheritDerAttrs;
+    }
 
-        this.inheritDerivedAttributes = inheritDerivedAttributes;
+    public void setInheritDerAttrs(final boolean inheritDerAttrs) {
+        this.inheritDerAttrs = inheritDerAttrs;
     }
 
-    public boolean isInheritVirtualAttributes() {
-        return inheritVirtualAttributes;
+    public boolean isInheritVirAttrs() {
+        return inheritVirAttrs;
     }
 
-    public void setInheritVirtualAttributes(final boolean inheritVirtualAttributes) {
-        this.inheritVirtualAttributes = inheritVirtualAttributes;
+    public void setInheritVirAttrs(final boolean inheritVirAttrs) {
+        this.inheritVirAttrs = inheritVirAttrs;
     }
 
     @XmlElementWrapper(name = "entitlements")
@@ -133,6 +154,48 @@ public class RoleTO extends AbstractAttr
         return entitlements;
     }
 
+    @XmlElementWrapper(name = "rAttrTemplates")
+    @XmlElement(name = "rAttrTemplate")
+    @JsonProperty("rAttrTemplates")
+    public List<String> getRAttrTemplates() {
+        return rAttrTemplates;
+    }
+
+    @XmlElementWrapper(name = "rDerAttrTemplates")
+    @XmlElement(name = "rDerAttrTemplate")
+    @JsonProperty("rDerAttrTemplates")
+    public List<String> getRDerAttrTemplates() {
+        return rDerAttrTemplates;
+    }
+
+    @XmlElementWrapper(name = "rVirAttrTemplates")
+    @XmlElement(name = "rVirAttrTemplate")
+    @JsonProperty("rVirAttrTemplates")
+    public List<String> getRVirAttrTemplates() {
+        return rVirAttrTemplates;
+    }
+
+    @XmlElementWrapper(name = "mAttrTemplates")
+    @XmlElement(name = "mAttrTemplate")
+    @JsonProperty("mAttrTemplates")
+    public List<String> getMAttrTemplates() {
+        return mAttrTemplates;
+    }
+
+    @XmlElementWrapper(name = "mDerAttrTemplates")
+    @XmlElement(name = "mDerAttrTemplate")
+    @JsonProperty("mDerAttrTemplates")
+    public List<String> getMDerAttrTemplates() {
+        return mDerAttrTemplates;
+    }
+
+    @XmlElementWrapper(name = "mVirAttrTemplates")
+    @XmlElement(name = "mVirAttrTemplate")
+    @JsonProperty("mVirAttrTemplates")
+    public List<String> getMVirAttrTemplates() {
+        return mVirAttrTemplates;
+    }
+
     public Long getPasswordPolicy() {
         return passwordPolicy;
     }

Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/util/AttributableOperations.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/util/AttributableOperations.java?rev=1531003&r1=1531002&r2=1531003&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/util/AttributableOperations.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/util/AttributableOperations.java Thu Oct 10 14:37:56 2013
@@ -82,9 +82,9 @@ public final class AttributableOperation
 
                     if (!mod.isEmpty()) {
                         if (virtuals) {
-                            result.getVirtualAttributesToBeRemoved().add(mod.getSchema());
+                            result.getVirAttrsToRemove().add(mod.getSchema());
                         } else {
-                            result.getAttributesToBeRemoved().add(mod.getSchema());
+                            result.getAttrsToRemove().add(mod.getSchema());
                         }
                     }
                 }
@@ -93,9 +93,9 @@ public final class AttributableOperation
 
                 if (!mod.isEmpty()) {
                     if (virtuals) {
-                        result.getVirtualAttributesToBeUpdated().add(mod);
+                        result.getVirAttrsToUpdate().add(mod);
                     } else {
-                        result.getAttributesToBeUpdated().add(mod);
+                        result.getAttrsToUpdate().add(mod);
                     }
                 }
             }
@@ -115,15 +115,15 @@ public final class AttributableOperation
         result.setId(updated.getId());
 
         // 2. attributes
-        Map<String, AttributeTO> updatedAttrs = new HashMap<String, AttributeTO>(updated.getAttributeMap());
-        Map<String, AttributeTO> originalAttrs = new HashMap<String, AttributeTO>(original.getAttributeMap());
+        Map<String, AttributeTO> updatedAttrs = new HashMap<String, AttributeTO>(updated.getAttrMap());
+        Map<String, AttributeTO> originalAttrs = new HashMap<String, AttributeTO>(original.getAttrMap());
 
         Set<String> originalAttrNames = new HashSet<String>(originalAttrs.keySet());
         originalAttrNames.removeAll(updatedAttrs.keySet());
 
         if (!incremental) {
-            result.getAttributesToBeRemoved().clear();
-            result.getAttributesToBeRemoved().addAll(originalAttrNames);
+            result.getAttrsToRemove().clear();
+            result.getAttrsToRemove().addAll(originalAttrNames);
         }
 
         Set<String> emptyUpdatedAttrs = new HashSet<String>();
@@ -135,38 +135,38 @@ public final class AttributableOperation
         }
         for (String emptyUpdatedAttr : emptyUpdatedAttrs) {
             updatedAttrs.remove(emptyUpdatedAttr);
-            result.getAttributesToBeRemoved().add(emptyUpdatedAttr);
+            result.getAttrsToRemove().add(emptyUpdatedAttr);
         }
 
         populate(updatedAttrs, originalAttrs, result);
 
         // 3. derived attributes
-        updatedAttrs = updated.getDerivedAttributeMap();
-        originalAttrs = original.getDerivedAttributeMap();
+        updatedAttrs = updated.getDerAttrMap();
+        originalAttrs = original.getDerAttrMap();
 
         originalAttrNames = new HashSet<String>(originalAttrs.keySet());
         originalAttrNames.removeAll(updatedAttrs.keySet());
 
         if (!incremental) {
-            result.getDerivedAttributesToBeRemoved().clear();
-            result.getDerivedAttributesToBeRemoved().addAll(originalAttrNames);
+            result.getDerAttrsToRemove().clear();
+            result.getDerAttrsToRemove().addAll(originalAttrNames);
         }
 
         Set<String> updatedAttrNames = new HashSet<String>(updatedAttrs.keySet());
         updatedAttrNames.removeAll(originalAttrs.keySet());
-        result.getDerivedAttributesToBeAdded().clear();
-        result.getDerivedAttributesToBeAdded().addAll(updatedAttrNames);
+        result.getDerAttrsToAdd().clear();
+        result.getDerAttrsToAdd().addAll(updatedAttrNames);
 
         // 4. virtual attributes
-        updatedAttrs = updated.getVirtualAttributeMap();
-        originalAttrs = original.getVirtualAttributeMap();
+        updatedAttrs = updated.getVirAttrMap();
+        originalAttrs = original.getVirAttrMap();
 
         originalAttrNames = new HashSet<String>(originalAttrs.keySet());
         originalAttrNames.removeAll(updatedAttrs.keySet());
 
         if (!incremental) {
-            result.getVirtualAttributesToBeRemoved().clear();
-            result.getVirtualAttributesToBeRemoved().addAll(originalAttrNames);
+            result.getVirAttrsToRemove().clear();
+            result.getVirAttrsToRemove().addAll(originalAttrNames);
         }
 
         populate(updatedAttrs, originalAttrs, result, true);
@@ -176,14 +176,14 @@ public final class AttributableOperation
         Set<String> originalRes = new HashSet<String>(original.getResources());
 
         updatedRes.removeAll(originalRes);
-        result.getResourcesToBeAdded().clear();
-        result.getResourcesToBeAdded().addAll(updatedRes);
+        result.getResourcesToAdd().clear();
+        result.getResourcesToAdd().addAll(updatedRes);
 
         originalRes.removeAll(updated.getResources());
 
         if (!incremental) {
-            result.getResourcesToBeRemoved().clear();
-            result.getResourcesToBeRemoved().addAll(originalRes);
+            result.getResourcesToRemove().clear();
+            result.getResourcesToRemove().addAll(originalRes);
         }
     }
 
@@ -232,35 +232,35 @@ public final class AttributableOperation
             if (originalMembs.containsKey(entry.getKey())) {
                 diff(entry.getValue(), originalMembs.get(entry.getKey()), membMod, false);
             } else {
-                for (AttributeTO attr : entry.getValue().getAttributes()) {
+                for (AttributeTO attr : entry.getValue().getAttrs()) {
 
                     AttributeMod attrMod = new AttributeMod();
                     attrMod.setSchema(attr.getSchema());
                     attrMod.getValuesToBeAdded().addAll(attr.getValues());
 
                     if (!attrMod.isEmpty()) {
-                        membMod.getAttributesToBeUpdated().add(attrMod);
-                        membMod.getAttributesToBeRemoved().add(attrMod.getSchema());
+                        membMod.getAttrsToUpdate().add(attrMod);
+                        membMod.getAttrsToRemove().add(attrMod.getSchema());
                     }
                 }
-                for (AttributeTO attr : entry.getValue().getDerivedAttributes()) {
-                    membMod.getDerivedAttributesToBeAdded().add(attr.getSchema());
+                for (AttributeTO attr : entry.getValue().getDerAttrs()) {
+                    membMod.getDerAttrsToAdd().add(attr.getSchema());
                 }
-                for (AttributeTO attr : entry.getValue().getVirtualAttributes()) {
+                for (AttributeTO attr : entry.getValue().getVirAttrs()) {
                     AttributeMod attrMod = new AttributeMod();
                     attrMod.setSchema(attr.getSchema());
                     attrMod.getValuesToBeAdded().addAll(attr.getValues());
 
                     if (!attrMod.isEmpty()) {
-                        membMod.getVirtualAttributesToBeUpdated().add(attrMod);
-                        membMod.getAttributesToBeRemoved().add(attrMod.getSchema());
+                        membMod.getVirAttrsToUpdate().add(attrMod);
+                        membMod.getAttrsToRemove().add(attrMod.getSchema());
                     }
                 }
-                membMod.getResourcesToBeAdded().addAll(entry.getValue().getResources());
+                membMod.getResourcesToAdd().addAll(entry.getValue().getResources());
             }
 
             if (!membMod.isEmpty()) {
-                result.getMembershipsToBeAdded().add(membMod);
+                result.getMembershipsToAdd().add(membMod);
             }
         }
 
@@ -268,7 +268,7 @@ public final class AttributableOperation
             Set<Long> originalRoles = new HashSet<Long>(originalMembs.keySet());
             originalRoles.removeAll(updatedMembs.keySet());
             for (Long roleId : originalRoles) {
-                result.getMembershipsToBeRemoved().add(originalMembs.get(roleId).getId());
+                result.getMembershipsToRemove().add(originalMembs.get(roleId).getId());
             }
         }
 
@@ -301,11 +301,12 @@ public final class AttributableOperation
 
         // 1. inheritance
         result.setInheritOwner(updated.isInheritOwner());
+        result.setInheritTemplates(updated.isInheritTemplates());
         result.setInheritAccountPolicy(updated.isInheritAccountPolicy());
         result.setInheritPasswordPolicy(updated.isInheritPasswordPolicy());
-        result.setInheritAttributes(updated.isInheritAttributes());
-        result.setInheritDerivedAttributes(updated.isInheritDerivedAttributes());
-        result.setInheritVirtualAttributes(updated.isInheritVirtualAttributes());
+        result.setInheritAttributes(updated.isInheritAttrs());
+        result.setInheritDerAttrs(updated.isInheritDerAttrs());
+        result.setInheritVirAttrs(updated.isInheritVirAttrs());
 
         // 2. policies
         result.setAccountPolicy(new ReferenceMod(updated.getAccountPolicy()));
@@ -327,7 +328,63 @@ public final class AttributableOperation
             result.getEntitlements().addAll(updated.getEntitlements());
         }
 
-        // 5. owner
+        // 5. templates
+        Set<String> updatedTemplates = new HashSet<String>(updated.getRAttrTemplates());
+        Set<String> originalTemplates = new HashSet<String>(original.getRAttrTemplates());
+        if (updatedTemplates.equals(originalTemplates)) {
+            result.setModRAttrTemplates(false);
+            result.getRAttrTemplates().clear();
+        } else {
+            result.setModRAttrTemplates(true);
+            result.getRAttrTemplates().addAll(updated.getRAttrTemplates());
+        }
+        updatedTemplates = new HashSet<String>(updated.getRDerAttrTemplates());
+        originalTemplates = new HashSet<String>(original.getRDerAttrTemplates());
+        if (updatedTemplates.equals(originalTemplates)) {
+            result.setModRDerAttrTemplates(false);
+            result.getRDerAttrTemplates().clear();
+        } else {
+            result.setModRDerAttrTemplates(true);
+            result.getRDerAttrTemplates().addAll(updated.getRDerAttrTemplates());
+        }
+        updatedTemplates = new HashSet<String>(updated.getRVirAttrTemplates());
+        originalTemplates = new HashSet<String>(original.getRVirAttrTemplates());
+        if (updatedTemplates.equals(originalTemplates)) {
+            result.setModRVirAttrTemplates(false);
+            result.getRVirAttrTemplates().clear();
+        } else {
+            result.setModRVirAttrTemplates(true);
+            result.getRVirAttrTemplates().addAll(updated.getRVirAttrTemplates());
+        }
+        updatedTemplates = new HashSet<String>(updated.getMAttrTemplates());
+        originalTemplates = new HashSet<String>(original.getMAttrTemplates());
+        if (updatedTemplates.equals(originalTemplates)) {
+            result.setModMAttrTemplates(false);
+            result.getMAttrTemplates().clear();
+        } else {
+            result.setModMAttrTemplates(true);
+            result.getMAttrTemplates().addAll(updated.getMAttrTemplates());
+        }
+        updatedTemplates = new HashSet<String>(updated.getMDerAttrTemplates());
+        originalTemplates = new HashSet<String>(original.getMDerAttrTemplates());
+        if (updatedTemplates.equals(originalTemplates)) {
+            result.setModMDerAttrTemplates(false);
+            result.getMDerAttrTemplates().clear();
+        } else {
+            result.setModMDerAttrTemplates(true);
+            result.getMDerAttrTemplates().addAll(updated.getMDerAttrTemplates());
+        }
+        updatedTemplates = new HashSet<String>(updated.getMVirAttrTemplates());
+        originalTemplates = new HashSet<String>(original.getMVirAttrTemplates());
+        if (updatedTemplates.equals(originalTemplates)) {
+            result.setModMVirAttrTemplates(false);
+            result.getMVirAttrTemplates().clear();
+        } else {
+            result.setModMVirAttrTemplates(true);
+            result.getMVirAttrTemplates().addAll(updated.getMVirAttrTemplates());
+        }
+
+        // 6. owner
         result.setUserOwner(new ReferenceMod(updated.getUserOwner()));
         result.setRoleOwner(new ReferenceMod(updated.getRoleOwner()));
 
@@ -362,29 +419,29 @@ public final class AttributableOperation
             final K mod, final T result) {
 
         // 1. attributes
-        result.getAttributes().addAll(getUpdateValues(to.getAttributeMap(),
-                mod.getAttributesToBeRemoved(), mod.getAttributesToBeUpdated()));
+        result.getAttrs().addAll(getUpdateValues(to.getAttrMap(),
+                mod.getAttrsToRemove(), mod.getAttrsToUpdate()));
 
         // 2. derived attributes
-        Map<String, AttributeTO> attrs = to.getDerivedAttributeMap();
-        for (String attrName : mod.getDerivedAttributesToBeRemoved()) {
+        Map<String, AttributeTO> attrs = to.getDerAttrMap();
+        for (String attrName : mod.getDerAttrsToRemove()) {
             attrs.remove(attrName);
         }
-        for (String attrName : mod.getDerivedAttributesToBeAdded()) {
+        for (String attrName : mod.getDerAttrsToAdd()) {
             AttributeTO attrTO = new AttributeTO();
             attrTO.setSchema(attrName);
 
             attrs.put(attrName, attrTO);
         }
-        result.getDerivedAttributes().addAll(attrs.values());
+        result.getDerAttrs().addAll(attrs.values());
 
         // 3. virtual attributes
-        result.getVirtualAttributes().addAll(getUpdateValues(to.getVirtualAttributeMap(),
-                mod.getVirtualAttributesToBeRemoved(), mod.getVirtualAttributesToBeUpdated()));
+        result.getVirAttrs().addAll(getUpdateValues(to.getVirAttrMap(),
+                mod.getVirAttrsToRemove(), mod.getVirAttrsToUpdate()));
 
         // 4. resources
-        result.getResources().removeAll(mod.getResourcesToBeRemoved());
-        result.getResources().addAll(mod.getResourcesToBeAdded());
+        result.getResources().removeAll(mod.getResourcesToRemove());
+        result.getResources().addAll(mod.getResourcesToAdd());
     }
 
     public static UserTO apply(final UserTO userTO, final UserMod userMod) {
@@ -405,10 +462,10 @@ public final class AttributableOperation
         }
         // 3. memberships
         Map<Long, MembershipTO> membs = result.getMembershipMap();
-        for (Long membId : userMod.getMembershipsToBeRemoved()) {
+        for (Long membId : userMod.getMembershipsToRemove()) {
             result.getMemberships().remove(membs.get(membId));
         }
-        for (MembershipMod membMod : userMod.getMembershipsToBeAdded()) {
+        for (MembershipMod membMod : userMod.getMembershipsToAdd()) {
             MembershipTO membTO = new MembershipTO();
             membTO.setRoleId(membMod.getRole());
 

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/Constants.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/Constants.java?rev=1531003&r1=1531002&r2=1531003&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/Constants.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/Constants.java Thu Oct 10 14:37:56 2013
@@ -19,7 +19,7 @@
 package org.apache.syncope.console.commons;
 
 public final class Constants {
-    
+
     public static final String ON_CHANGE = "onchange";
 
     public static final String ON_BLUR = "onblur";
@@ -92,8 +92,6 @@ public final class Constants {
 
     public static final String PREF_POLICY_PAGINATOR_ROWS = "policy.paginator.rows";
 
-    public static final String ENUM_VALUES_SEPARATOR = ";";
-
     private Constants() {
         // private constructor for static utility class
     }

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/SortableAttributableProviderComparator.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/SortableAttributableProviderComparator.java?rev=1531003&r1=1531002&r2=1531003&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/SortableAttributableProviderComparator.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/SortableAttributableProviderComparator.java Thu Oct 10 14:37:56 2013
@@ -63,9 +63,9 @@ public class SortableAttributableProvide
         public AttrModel(final AbstractAttributableTO attributableTO) {
             super();
 
-            this.attrs = attributableTO.getAttributeMap();
-            this.derAttrs = attributableTO.getDerivedAttributeMap();
-            this.virAttrs = attributableTO.getVirtualAttributeMap();
+            this.attrs = attributableTO.getAttrMap();
+            this.derAttrs = attributableTO.getDerAttrMap();
+            this.virAttrs = attributableTO.getVirAttrMap();
         }
 
         /**

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/StatusUtils.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/StatusUtils.java?rev=1531003&r1=1531002&r2=1531003&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/StatusUtils.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/StatusUtils.java Thu Oct 10 14:37:56 2013
@@ -153,7 +153,7 @@ public class StatusUtils implements Seri
     }
 
     private Boolean isEnabled(final ConnObjectTO objectTO) {
-        final Map<String, AttributeTO> attributeTOs = objectTO.getAttributeMap();
+        final Map<String, AttributeTO> attributeTOs = objectTO.getAttrMap();
 
         final AttributeTO status = attributeTOs.get(ConnIdSpecialAttributeName.ENABLE);
 
@@ -165,7 +165,7 @@ public class StatusUtils implements Seri
     private String getAccountLink(final ConnObjectTO objectTO) {
         final Map<String, AttributeTO> attributeTOs = objectTO == null
                 ? Collections.<String, AttributeTO>emptyMap()
-                : objectTO.getAttributeMap();
+                : objectTO.getAttrMap();
 
         final AttributeTO name = attributeTOs.get(ConnIdSpecialAttributeName.NAME);
 
@@ -360,7 +360,9 @@ public class StatusUtils implements Seri
         return imagePanel;
     }
 
-    public static class ConnObjectWrapper {
+    public static class ConnObjectWrapper implements Serializable {
+
+        private static final long serialVersionUID = 9083721948999924299L;
 
         private final AbstractAttributableTO attributable;
 

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnObjectModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnObjectModalPage.java?rev=1531003&r1=1531002&r2=1531003&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnObjectModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnObjectModalPage.java Thu Oct 10 14:37:56 2013
@@ -53,7 +53,7 @@ public class ConnObjectModalPage extends
 
             @Override
             protected List<AttributeTO> load() {
-                List<AttributeTO> attrs = connObjectTO.getAttributes();
+                List<AttributeTO> attrs = connObjectTO.getAttrs();
                 Collections.sort(attrs, new Comparator<AttributeTO>() {
 
                     @Override

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java?rev=1531003&r1=1531002&r2=1531003&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java Thu Oct 10 14:37:56 2013
@@ -89,9 +89,9 @@ public class DerivedSchemaModalPage exte
 
                 try {
                     if (createFlag) {
-                        schemaRestClient.createDerivedSchema(kind, schemaTO);
+                        schemaRestClient.createDerSchema(kind, schemaTO);
                     } else {
-                        schemaRestClient.updateDerivedSchema(kind, schemaTO);
+                        schemaRestClient.updateDerSchema(kind, schemaTO);
                     }
 
                     if (pageRef.getPage() instanceof BasePage) {

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DisplayAttributesModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DisplayAttributesModalPage.java?rev=1531003&r1=1531002&r2=1531003&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DisplayAttributesModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DisplayAttributesModalPage.java Thu Oct 10 14:37:56 2013
@@ -61,7 +61,7 @@ public class DisplayAttributesModalPage 
     private static final int MAX_SELECTIONS = 9;
 
     private static final String[] ATTRIBUTES_TO_HIDE = {
-        "attributes", "derivedAttributes", "virtualAttributes", "memberships", "resources",
+        "attrs", "derAttrs", "virAttrs", "memberships", "resources",
         "serialVersionUID", "password", "propagationTOs"};
 
     public static final String[] DEFAULT_SELECTION = {"id", "username", "status"};
@@ -246,7 +246,8 @@ public class DisplayAttributesModalPage 
 
             @Override
             protected void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
-                if (selectedDetails.size() + selectedSchemas.size() + selectedVirSchemas.size() + selectedDerSchemas.size()
+                if (selectedDetails.size() + selectedSchemas.size() + selectedVirSchemas.size() + selectedDerSchemas.
+                        size()
                         > MAX_SELECTIONS) {
 
                     error(getString("tooManySelections"));

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/MembershipModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/MembershipModalPage.java?rev=1531003&r1=1531002&r2=1531003&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/MembershipModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/MembershipModalPage.java Thu Oct 10 14:37:56 2013
@@ -90,20 +90,20 @@ public class MembershipModalPage extends
         //--------------------------------
         // Attributes panel
         //--------------------------------
-        form.add(new AttributesPanel("attributes", membershipTO, form, templateMode));
+        form.add(new AttributesPanel("attrs", membershipTO, form, templateMode));
         form.add(new SysInfoPanel("systeminformation", membershipTO));
         //--------------------------------
 
         //--------------------------------
         // Derived attributes container
         //--------------------------------
-        form.add(new DerivedAttributesPanel("derivedAttributes", membershipTO));
+        form.add(new DerivedAttributesPanel("derAttrs", membershipTO));
         //--------------------------------
 
         //--------------------------------
         // Virtual attributes container
         //--------------------------------
-        form.add(new VirtualAttributesPanel("virtualAttributes", membershipTO, templateMode));
+        form.add(new VirtualAttributesPanel("virAttrs", membershipTO, templateMode));
         //--------------------------------
 
         add(form);

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java?rev=1531003&r1=1531002&r2=1531003&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java Thu Oct 10 14:37:56 2013
@@ -274,11 +274,11 @@ class NotificationModalPage extends Base
                     break;
 
                 case UserDerivedSchema:
-                    result = schemaRestClient.getDerivedSchemaNames(AttributableType.USER);
+                    result = schemaRestClient.getDerSchemaNames(AttributableType.USER);
                     break;
 
                 case UserVirtualSchema:
-                    result = schemaRestClient.getVirtualSchemaNames(AttributableType.USER);
+                    result = schemaRestClient.getVirSchemaNames(AttributableType.USER);
                     break;
 
                 case Username:

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportletConfModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportletConfModalPage.java?rev=1531003&r1=1531002&r2=1531003&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportletConfModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportletConfModalPage.java Thu Oct 10 14:37:56 2013
@@ -292,11 +292,11 @@ public class ReportletConfModalPage exte
                                 break;
 
                             case UserDerivedSchema:
-                                choices = schemaRestClient.getDerivedSchemaNames(AttributableType.USER);
+                                choices = schemaRestClient.getDerSchemaNames(AttributableType.USER);
                                 break;
 
                             case UserVirtualSchema:
-                                choices = schemaRestClient.getVirtualSchemaNames(AttributableType.USER);
+                                choices = schemaRestClient.getVirSchemaNames(AttributableType.USER);
                                 break;
 
                             case RoleSchema:
@@ -304,11 +304,11 @@ public class ReportletConfModalPage exte
                                 break;
 
                             case RoleDerivedSchema:
-                                choices = schemaRestClient.getDerivedSchemaNames(AttributableType.ROLE);
+                                choices = schemaRestClient.getDerSchemaNames(AttributableType.ROLE);
                                 break;
 
                             case RoleVirtualSchema:
-                                choices = schemaRestClient.getVirtualSchemaNames(AttributableType.ROLE);
+                                choices = schemaRestClient.getVirSchemaNames(AttributableType.ROLE);
                                 break;
 
                             case MembershipSchema:
@@ -316,11 +316,11 @@ public class ReportletConfModalPage exte
                                 break;
 
                             case MembershipDerivedSchema:
-                                choices = schemaRestClient.getDerivedSchemaNames(AttributableType.MEMBERSHIP);
+                                choices = schemaRestClient.getDerSchemaNames(AttributableType.MEMBERSHIP);
                                 break;
 
                             case MembershipVirtualSchema:
-                                choices = schemaRestClient.getVirtualSchemaNames(AttributableType.MEMBERSHIP);
+                                choices = schemaRestClient.getVirSchemaNames(AttributableType.MEMBERSHIP);
                                 break;
 
                             default:

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResultStatusModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResultStatusModalPage.java?rev=1531003&r1=1531002&r2=1531003&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResultStatusModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResultStatusModalPage.java Thu Oct 10 14:37:56 2013
@@ -208,12 +208,12 @@ public class ResultStatusModalPage exten
                         }
                     });
                     final FailureMessageModalPage executionFailureMessagePage;
-                    if (propTO.getFailureReason() != null) {
-                        executionFailureMessagePage = new FailureMessageModalPage(failureWindow.getContentId(), propTO.
-                                getFailureReason());
+                    if (propTO.getFailureReason() == null) {
+                        executionFailureMessagePage =
+                                new FailureMessageModalPage(failureWindow.getContentId(), StringUtils.EMPTY);
                     } else {
-                        executionFailureMessagePage = new FailureMessageModalPage(failureWindow.getContentId(),
-                                StringUtils.EMPTY);
+                        executionFailureMessagePage =
+                                new FailureMessageModalPage(failureWindow.getContentId(), propTO.getFailureReason());
                     }
 
                     failureWindow.setPageCreator(new ModalWindow.PageCreator() {
@@ -236,7 +236,7 @@ public class ResultStatusModalPage exten
             fragment.add(propRes);
         }
 
-        final AjaxLink close = new IndicatingAjaxLink("close") {
+        final AjaxLink<Void> close = new IndicatingAjaxLink<Void>("close") {
 
             private static final long serialVersionUID = -7978723352517770644L;
 
@@ -273,14 +273,14 @@ public class ResultStatusModalPage exten
         if (before == null) {
             beforeAttrMap = Collections.<String, AttributeTO>emptyMap();
         } else {
-            beforeAttrMap = before.getAttributeMap();
+            beforeAttrMap = before.getAttrMap();
         }
 
         final Map<String, AttributeTO> afterAttrMap;
         if (after == null) {
             afterAttrMap = Collections.<String, AttributeTO>emptyMap();
         } else {
-            afterAttrMap = after.getAttributeMap();
+            afterAttrMap = after.getAttrMap();
         }
 
         final Set<String> attributes = new HashSet<String>();
@@ -303,7 +303,7 @@ public class ResultStatusModalPage exten
             }
         }
 
-        return new ListView("attributes", profile) {
+        return new ListView("attrs", profile) {
 
             private static final long serialVersionUID = 4949588177564901031L;
 

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java?rev=1531003&r1=1531002&r2=1531003&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java Thu Oct 10 14:37:56 2013
@@ -67,14 +67,11 @@ public class RoleModalPage extends BaseM
 
     protected RoleTO originalRoleTO;
 
-    public RoleModalPage(final ModalWindow window, final RoleTO roleTO) {
-        this(null, window, roleTO, Mode.ADMIN);
-    }
-
     public RoleModalPage(final PageReference pageRef, final ModalWindow window, final RoleTO roleTO) {
         this(pageRef, window, roleTO, Mode.ADMIN);
     }
 
+    @SuppressWarnings({"unchecked", "rawtypes"})
     public RoleModalPage(final PageReference pageRef, final ModalWindow window, final RoleTO roleTO, final Mode mode) {
         super();
 

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Roles.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Roles.java?rev=1531003&r1=1531002&r2=1531003&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Roles.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Roles.java Thu Oct 10 14:37:56 2013
@@ -46,7 +46,7 @@ public class Roles extends BasePage {
 
     private static final int WIN_HEIGHT = 500;
 
-    private static final int WIN_WIDTH = 750;
+    private static final int WIN_WIDTH = 800;
 
     @SpringBean
     private RoleRestClient restClient;

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java?rev=1531003&r1=1531002&r2=1531003&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java Thu Oct 10 14:37:56 2013
@@ -271,11 +271,11 @@ public class Schema extends BasePage {
 
                         switch (schemaType) {
                             case DERIVED:
-                                restClient.deleteDerivedSchema(attributableType, schemaTO.getName());
+                                restClient.deleteDerSchema(attributableType, schemaTO.getName());
                                 break;
 
                             case VIRTUAL:
-                                restClient.deleteVirtualSchema(attributableType, schemaTO.getName());
+                                restClient.deleteVirSchema(attributableType, schemaTO.getName());
                                 break;
 
                             default:

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java?rev=1531003&r1=1531002&r2=1531003&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java Thu Oct 10 14:37:56 2013
@@ -26,6 +26,7 @@ import java.util.Iterator;
 import java.util.List;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.syncope.common.AbstractBaseBean;
+import org.apache.syncope.common.SyncopeConstants;
 import org.apache.syncope.common.to.SchemaTO;
 import org.apache.syncope.common.types.AttributableType;
 import org.apache.syncope.common.types.AttributeSchemaType;
@@ -302,7 +303,7 @@ public class SchemaModalPage extends Abs
         for (String str : enumerationValues) {
             if (StringUtils.isNotBlank(str)) {
                 if (builder.length() > 0) {
-                    builder.append(Constants.ENUM_VALUES_SEPARATOR);
+                    builder.append(SyncopeConstants.ENUM_VALUES_SEPARATOR);
                 }
 
                 builder.append(str.trim());
@@ -316,7 +317,7 @@ public class SchemaModalPage extends Abs
         final List<String> values = new ArrayList<String>();
 
         if (StringUtils.isNotBlank(enumerationValues)) {
-            for (String value : enumerationValues.split(Constants.ENUM_VALUES_SEPARATOR)) {
+            for (String value : enumerationValues.split(SyncopeConstants.ENUM_VALUES_SEPARATOR)) {
                 values.add(value.trim());
             }
         } else {

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Tasks.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Tasks.java?rev=1531003&r1=1531002&r2=1531003&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Tasks.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Tasks.java Thu Oct 10 14:37:56 2013
@@ -203,6 +203,7 @@ public class Tasks extends BasePage {
             final PageReference pageRef,
             final BaseRestClient restClient) {
 
+        @SuppressWarnings("unchecked")
         final AjaxDataTablePanel<AbstractTaskTO, String> table = new AjaxDataTablePanel<AbstractTaskTO, String>(
                 "datatable",
                 columns,



Mime
View raw message