Return-Path: 
 <commits-return-4790-apmail-syncope-commits-archive=syncope.apache.org@syncope.apache.org>
X-Original-To: apmail-syncope-commits-archive@www.apache.org
Delivered-To: apmail-syncope-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id F20F5174C4
	for <apmail-syncope-commits-archive@www.apache.org>;
 Mon,  6 Apr 2015 16:13:58 +0000 (UTC)
Received: (qmail 57488 invoked by uid 500); 6 Apr 2015 16:13:58 -0000
Delivered-To: apmail-syncope-commits-archive@syncope.apache.org
Received: (qmail 57428 invoked by uid 500); 6 Apr 2015 16:13:58 -0000
Mailing-List: contact commits-help@syncope.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@syncope.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@syncope.apache.org>
List-Post: <mailto:commits@syncope.apache.org>
List-Id: <commits.syncope.apache.org>
Reply-To: dev@syncope.apache.org
Delivered-To: mailing list commits@syncope.apache.org
Received: (qmail 56670 invoked by uid 99); 6 Apr 2015 16:13:58 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Apr 2015 16:13:58 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id D32EDE180F; Mon,  6 Apr 2015 16:13:57 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: ilgrosso@apache.org
To: commits@syncope.apache.org
Date: Mon, 06 Apr 2015 16:14:18 -0000
Message-Id: <9f564d5f8114490e9aa6322cc2d95b07@git.apache.org>
In-Reply-To: <2d0734067fb649b0904d828fd3388040@git.apache.org>
References: <2d0734067fb649b0904d828fd3388040@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [22/27] syncope git commit: [SYNCOPE-119] Renaming Role to Group

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/pages/PushTaskModalPage_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/PushTaskModalPage_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/PushTaskModalPage_pt_BR.properties
index 8e00512..69c09fa 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/PushTaskModalPage_pt_BR.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/PushTaskModalPage_pt_BR.properties
@@ -42,4 +42,4 @@ actionsClasses=Classes de a\u00e7\u00f5es
 matchingRule=Regra de correspond\u00eancia
 unmatchingRule=Regra de non correspond\u00eancia
 checkUserFilter=Filtro Usu\u00e1rio
-checkRoleFilter=Filtro Papel
+checkGroupFilter=Filtro Grupo

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/pages/ResourceModalPage.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/ResourceModalPage.html b/client/console/src/main/resources/org/apache/syncope/client/console/pages/ResourceModalPage.html
index 2316adc..8f2cdab 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/ResourceModalPage.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/ResourceModalPage.html
@@ -28,7 +28,7 @@ under the License.
           <ul>
             <li class="tabs-selected"><a href="#resource"><span><wicket:message key="resource"/></span></a></li>
             <li><a href="#umapping"><span><wicket:message key="umapping"/></span></a></li>
-            <li><a href="#rmapping"><span><wicket:message key="rmapping"/></span></a></li>
+            <li><a href="#gmapping"><span><wicket:message key="gmapping"/></span></a></li>
             <li><a href="#connectorProperties"><span><wicket:message key="connectorProperties"/></span></a></li>
             <li><a href="#security"><span><wicket:message key="security"/></span></a></li>
           </ul>
@@ -39,8 +39,8 @@ under the License.
           <div id="umapping">
             <span wicket:id="umapping">[umapping]</span>
           </div>
-          <div id="rmapping">
-            <span wicket:id="rmapping">[rmapping]</span>
+          <div id="gmapping">
+            <span wicket:id="gmapping">[gmapping]</span>
           </div>
           <div id="connectorProperties">
             <span wicket:id="connconf">[connconf]</span>

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/pages/ResourceModalPage.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/ResourceModalPage.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/ResourceModalPage.properties
index 561fe2e..69e6e0a 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/ResourceModalPage.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/ResourceModalPage.properties
@@ -27,13 +27,13 @@ title=Resource
 extAttrNames=External attributes
 intMappingTypes=Internal mapping types
 entity=Entity
-roleSchema=Role Schema
+groupSchema=Group Schema
 accountId=AccountId
 mandatoryCondition=Mandatory
 password=Password
 purpose=Purpose
 mappingUserSchema=Mapping User Schema
-mappingRoleSchema=Mapping Role Schema
+mappingGroupSchema=Mapping Group Schema
 delete=Delete
 intAttrNames=Internal attributes
 enforceMandatoryCondition=Enforce mandatory condition
@@ -55,6 +55,6 @@ success_connection=Successful connection
 error_connection=Connection failure
 check=Check connection
 actionsClasses=Actions classes
-rmapping=Role mapping
+gmapping=Group mapping
 new=New
 randomPwdIfNotProvided=Generate random passwords when missing

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/pages/ResourceModalPage_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/ResourceModalPage_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/ResourceModalPage_it.properties
index 2223b99..a7b33b8 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/ResourceModalPage_it.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/ResourceModalPage_it.properties
@@ -27,13 +27,13 @@ title=Risorsa
 extAttrNames=Attributi esterni
 intMappingTypes=Tipo mapping interno
 entity=Entit&agrave;
-roleSchema=Schema Ruolo
+groupSchema=Schema Gruppo
 accountId=AccountId
 mandatoryCondition=Obbligatorio
 password=Password
 purpose=Scopo
 mappingUserSchema=Mapping User Schema
-mappingRoleSchema=Mapping Role Schema
+mappingGroupSchema=Mapping Group Schema
 delete=Rimuovi
 intAttrNames=Attributi interni
 enforceMandatoryCondition=Abilita mandatory condition
@@ -55,6 +55,6 @@ success_connection=Connessione avvenuta con successo
 error_connection=Connessione non riuscita
 check=Verifica connessione
 actionsClasses=Classi azioni
-rmapping=Mapping ruoli
+gmapping=Mapping gruppi
 new=Nuova
 randomPwdIfNotProvided=Genera password casuali se mancanti

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/pages/ResourceModalPage_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/ResourceModalPage_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/ResourceModalPage_pt_BR.properties
index a681eb0..be08c73 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/ResourceModalPage_pt_BR.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/ResourceModalPage_pt_BR.properties
@@ -27,13 +27,13 @@ title=Recurso
 extAttrNames=Atributos Externos
 intMappingTypes=Tipos internos de mapeamentos
 entity=Entidade
-roleSchema=Esquema de Fun\u00e7\u00e3o
+groupSchema=Esquema de Grupo
 accountId=Identificador da Conta
 mandatoryCondition=Obrigat\u00f3rio
 password=Senha
 purpose=Prop\u00f3sito
 mappingUserSchema=Esquema de mapeamento de usu\u00e1rio
-mappingRoleSchema=Esquema de mapeamento de fun\u00e7\u00e3o
+mappingGroupSchema=Esquema de mapeamento de grupo
 delete=Excluir
 intAttrNames=Atributos internos
 enforceMandatoryCondition=Aplicar condi\u00e7\u00e3o obrigat\u00f3ria
@@ -55,6 +55,6 @@ success_connection=Conex\u00e3o com sucesso
 error_connection=Conex\u00e3o sem sucesso
 check=Verificar a conex\u00e3o
 actionsClasses=Classes de a\u00e7\u00f5es
-rmapping=Regra de Mapeamento
+gmapping=Mapeamento de grupos
 new=Novo
 randomPwdIfNotProvided=Gerar senhas aleat\u00f3rias quando n\u00e3o houver

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleModalPage.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleModalPage.html b/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleModalPage.html
deleted file mode 100644
index 6406807..0000000
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleModalPage.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
-  <wicket:extend>
-    <div style="margin: 5px;">
-      <p class="ui-widget ui-corner-all ui-widget-header">
-        <wicket:message key="title"/>&nbsp;<span wicket:id="displayName"/>
-      </p>
-      <form wicket:id="roleForm">
-        <div id="tabs">
-          <div style="display: block; clear: both">
-            <ul>
-              <li><a href="#details"><span><wicket:message key="details"/></span></a></li>
-              <li><a href="#templates"><span><wicket:message key="templates"/></span></a></li>
-              <li><a href="#plainAttrs"><span><wicket:message key="plainAttrs"/></span></a></li>
-              <li><a href="#derAttrs"><span><wicket:message key="derAttrs"/></span></a></li>
-              <li><a href="#virAttrs"><span><wicket:message key="virAttrs"/></span></a></li>
-              <li><a href="#resources"><span><wicket:message key="resources"/></span></a></li>
-              <li><a href="#entitlements"><span><wicket:message key="entitlements"/></span></a></li>
-              <li><a href="#security"><span><wicket:message key="security"/></span></a></li>
-            </ul>
-          </div>
-          <div wicket:id="rolePanel"></div>
-        </div>
-        <div style="bottom:0;margin:10px">
-          <input type="submit"
-                 class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
-                 wicket:id="submit"/>
-          <input type="button"
-                 class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
-                 wicket:id="cancel"/>
-        </div>
-      </form>
-    </div>
-  </wicket:extend>
-</html>

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleModalPage.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleModalPage.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleModalPage.properties
deleted file mode 100644
index a24551c..0000000
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleModalPage.properties
+++ /dev/null
@@ -1,48 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-required_alert=All form fields are required.
-title=Role
-details=Details
-plainAttrs=Plain attributes
-tab3=Derived attributes
-tab4=Virtual attributes
-resources=Resources
-entitlements=Entitlements
-security=Security
-add=+
-drop=-
-error=Generic error occurred during the operation
-firstResourcesList=Role's resources
-secondResourcesList=Available resources
-firstEntitlementsList=Role's entitlements
-secondEntitlementsList=Available entitlements
-derAttrs=Derived Attributes
-derAttrToRemove=Delete
-derAttrName=Name
-derAttrValue=Derived value
-
-virAttrs=Virtual Attributes
-virAttrToRemove=Delete
-virAttrName=Name
-virAttrValue=Virtual value
-
-addAttributeBtn=Add
-
-inheritPlainAttrs=Inherit plain attributes
-inheritDerAttrs=Inherit derived attributes
-inheritVirAttrs=Inherit virtual attributes
-templates=Templates

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleModalPage_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleModalPage_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleModalPage_it.properties
deleted file mode 100644
index c97fe6f..0000000
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleModalPage_it.properties
+++ /dev/null
@@ -1,50 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-required_alert=All form fields are required.
-title=Ruolo
-details=Dettagli
-plainAttrs=Attributi normali
-tab3=Attributi derivati
-tab4=Attributi virtuali
-resources=Risorse
-entitlements=Entitlement
-security=Sicurezza
-add=+
-drop=-
-error=Errore generico durante l'operazione
-firstResourcesList=Risorse ruolo
-secondResourcesList=Risorse disponibili
-firstResourcesList=Risorse ruolo
-secondResourcesList=Risorse disponibili
-derAttrs=Attributi derivati
-derAttrToRemove=Elimina
-derAttrName=Nome
-derAttrValue=Valore derivato
-
-virAttrs=Attributi virtuali
-virAttrToRemove=Elimina
-virAttrName=Nome
-virAttrValue=Valore virtuale
-
-addAttributeBtn=Aggiungi
-
-inheritPlainAttrs=Eredita attributi normali
-inheritDerAttrs=Eredita attributi derivati
-inheritVirAttrs=Eredita attributi virtuali
-templates=Modelo
-secondEntitlementsList=Entitlement disponibili
-firstEntitlementsList=Entitlement ruolo

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleModalPage_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleModalPage_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleModalPage_pt_BR.properties
deleted file mode 100644
index 5bff4ed..0000000
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleModalPage_pt_BR.properties
+++ /dev/null
@@ -1,48 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-required_alert=Todos os campos s\u00e3o obrigat\u00f3rios
-title=Fun\u00e7\u00e3o
-details=Detalhes
-plainAttrs=Atributos Normal
-tab3=Atributos Derivados
-tab4=Atributos Virtuais
-resources=Recursos
-entitlements=Direitos
-security=Seguran\u00e7a
-add=+
-drop=-
-error=Um erro gen\u00e9rico ocorreu durante a opera\u00e7\u00e3o
-firstResourcesList=Recursos de fun\u00e7\u00f5es
-secondResourcesList=Recursos dispon\u00edveis
-firstEntitlementsList=Direitos de fun\u00e7\u00f5es
-secondEntitlementsList=Direitos dispon\u00edveis
-derAttrs=Atributos derivados
-derAttrToRemove=Exluir
-derAttrName=Nome
-derAttrValue=Valor Derivado
-
-virAttrs=Atributos Virtuais
-virAttrToRemove=Excluir
-virAttrName=Nome
-virAttrValue=Valor Virtual
-
-addAttributeBtn=Adicionar
-
-inheritPlainAttrs=Atributos Herdados Normal
-inheritDerAttrs=Atributos Derivados Herdados
-inheritVirAttrs=Atributos Virtuais Herdados
-templates=Modelli

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleSelectModalPage.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleSelectModalPage.html b/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleSelectModalPage.html
deleted file mode 100644
index 9e9ef59..0000000
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/RoleSelectModalPage.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<wicket:extend>
-  <div wicket:id="treeTable"
-       style="width: 100%;display:block;margin:auto;" class="roleTable role-tree"/>
-</wicket:extend>

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles.html b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles.html
deleted file mode 100644
index f8981a9..0000000
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
-  <wicket:head>
-    <style>
-      div.role-tree div.wicket-tree-table a {
-        color:black;
-      }
-    </style>
-    <script type="text/javascript">
-      $(document).ready(function() {
-        $("#roletabs").tabs();
-      });
-    </script>
-  </wicket:head>
-  <wicket:extend>
-    <div id="roletabs">
-      <ul>
-        <li class="tabs-selected">
-          <a href="#tabs-tree">
-            <span><wicket:message key="tabs-tree"/>
-            </span>
-          </a>
-        </li>
-        <li>
-          <a href="#tabs-search">
-            <span><wicket:message key="tabs-search"/>
-            </span>
-          </a>
-        </li>
-      </ul>
-
-      <div id="tabs-tree" >
-        <div wicket:id="roleTabsContainer">
-          <span wicket:id="treePanel"></span>
-          <span wicket:id="summaryPanel"></span>
-        </div>
-        <div wicket:id="editRoleWin">[Show modal window for create/editing role]</div>
-      </div>
-
-      <div id="tabs-search">
-        <div>
-          <form wicket:id="searchForm">
-            <span wicket:id="searchPanel">searchPanel</span>
-
-            <br/>
-            <a wicket:id="search"
-               class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only">
-              <img src="img/search.png" alt="search"/>
-              <wicket:message key="search"/>
-            </a>
-          </form>
-        </div>
-
-        <div id="users-contain" class="ui-widget" style="width:auto">
-          <span wicket:id="searchResult">[search result]</span>
-        </div>
-      </div>
-
-    </div>
-
-    <wicket:child/>
-  </wicket:extend>
-</html>

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles.properties
deleted file mode 100644
index bfe9385..0000000
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-tabs-tree=Tree
-tabs-search=Search
-search=Search
-create_user=Create new user
-search_results_title=Search results
-search_noResults=No matches found.
-reset=Reset
-showingFrom=Showing
-showingTo=to
-showingOf=of

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles_it.properties
deleted file mode 100644
index 76e69f7..0000000
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles_it.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-tabs-tree=Albero
-tabs-search=Ricerca
-search=Cerca
-create_user=Crea nuovo utente
-search_results_title=Risultati ricerca:
-search_noResults=Nessuna corrispondenza trovata.
-reset=Reset
-showingFrom=Risultati da
-showingTo=a
-showingOf=di

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles_pt_BR.properties
deleted file mode 100644
index 8d80401..0000000
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles_pt_BR.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-tabs-tree=\u00C1rvore
-tabs-search=Buscar
-search=Buscar
-create_user=Criar novo usu\u00E1rio
-search_results_title=Resultados da busca
-search_noResults=N\u00E3o foram encontrados resultados
-reset=Resetar
-showingFrom=Mostrando
-showingTo=para
-showingOf=de

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/pages/Schema.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Schema.html b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Schema.html
index de6d1e2..af0b83f 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Schema.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Schema.html
@@ -38,7 +38,7 @@ under the License.
         <li class="tabs-selected"><a href="#cschema"><wicket:message key="configuration"/></a></li>
         <li><a href="#uschema"><wicket:message key="user"/></a></li>
         <li><a href="#mschema"><wicket:message key="membership"/></a></li>
-        <li><a href="#rschema"><wicket:message key="role"/></a></li>
+        <li><a href="#gschema"><wicket:message key="group"/></a></li>
       </ul>
 
       <div id="cschema">
@@ -50,8 +50,8 @@ under the License.
       <div id="mschema">
         <div wicket:id="membershipTabs"/>
       </div>
-      <div id="rschema">
-        <div wicket:id="roleTabs"/>
+      <div id="gschema">
+        <div wicket:id="groupTabs"/>
       </div>    
     </div>
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/pages/Schema.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Schema.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Schema.properties
index e103028..920d29c 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Schema.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Schema.properties
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 user=User
-role=Role
+group=Group
 membership=Membership
 required_alert=All fields are required
 mandatory=Mandatory

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/pages/Schema_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Schema_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Schema_it.properties
index b95da78..186b540 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Schema_it.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Schema_it.properties
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 user=Utente
-role=Ruolo
+group=Gruppo
 membership=Membership
 required_alert=Tutti i campi sono richiesti.
 mandatory=Obbligatorio

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/pages/Schema_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Schema_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Schema_pt_BR.properties
index 994d485..8c41db6 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Schema_pt_BR.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Schema_pt_BR.properties
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 user=Usu\u00e1rio
-role=Fun\u00e7\u00e3o
+group=Grupo
 membership=Membro
 required_alert=Todos os campos s\u00e3o requeridos
 mandatory=Obrigat\u00f3rio

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/pages/UserModalPage.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/UserModalPage.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/UserModalPage.properties
index 7667bc5..9cb9c55 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/UserModalPage.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/UserModalPage.properties
@@ -23,14 +23,14 @@ tab2=Plain attributes
 tab3=Derived attributes
 tab4=Virtual attributes
 tab5=Resources
-tab6=Roles
+tab6=Groups
 add=+
 drop=-
 resources=Resources transfer
 firstResourcesList=User's resources
 secondResourcesList=Available resources
 updating_error=Generic error occurred during updating
-column1=Roles
+column1=Groups
 column2=Action
 
 edit=Edit

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/pages/UserModalPage_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/UserModalPage_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/UserModalPage_it.properties
index ec550c3..454a171 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/UserModalPage_it.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/UserModalPage_it.properties
@@ -23,14 +23,14 @@ tab2=Attributi normali
 tab3=Attributi derivati
 tab4=Attributi virtuali
 tab5=Risorse
-tab6=Ruoli
+tab6=Gruppi
 add=+
 drop=-
 resources=Associazione risorse
 firstResourcesList=Risorse utente
 secondResourcesList=Risorse disponibili
 updating_error=Errore generico durante l'aggiornamento
-column1=Ruoli
+column1=Gruppi
 column2=Azioni
 edit=Modifica
 delete=Rimuovi

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/pages/UserModalPage_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/UserModalPage_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/UserModalPage_pt_BR.properties
index d5d26a9..8486112 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/UserModalPage_pt_BR.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/UserModalPage_pt_BR.properties
@@ -23,14 +23,14 @@ tab2=Atributos Normal
 tab3=Atriutos Derivados
 tab4=Atributos Virtuais
 tab5=Recursos
-tab6=Fun\u00e7\u00f5es
+tab6=Grupos
 add=+
 drop=-
 resources=Transfer\u00eancia de Recursos
 firstResourcesList=Recursos de usu\u00e1rio
 secondResourcesList=Recursos Dispon\u00edveis
 updating_error=Um erro gern\u00e9rico ocorreu durante a atualiza\u00e7\u00e3o
-column1=Fun\u00e7\u00f5es
+column1=Grupos
 column2=A\u00e7\u00e3o
 
 edit=Alterar

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/pages/WelcomePage.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/WelcomePage.html b/client/console/src/main/resources/org/apache/syncope/client/console/pages/WelcomePage.html
index 4e0e5a0..938ecc4 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/WelcomePage.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/WelcomePage.html
@@ -57,7 +57,7 @@ under the License.
         <li><a href="#" wicket:id="todo" class="todo"><img wicket:id="todoIcon" alt="TODO" width="80" height="80" /><br /><wicket:message key="todo"/></a></li>
         <li><a href="#" wicket:id="schema" class="schema"><img wicket:id="schemaIcon" alt="Schema" width="80" height="80" /><br /><wicket:message key="schema"/></a></li>
         <li><a href="#" wicket:id="users" class="users"><img wicket:id="usersIcon" alt="Users" width="80" height="80" /><br /><wicket:message key="users"/></a></li>
-        <li><a href="#" wicket:id="roles" class="roles"><img wicket:id="rolesIcon" alt="Roles" width="80" height="80" /><br /><wicket:message key="roles"/></a></li>
+        <li><a href="#" wicket:id="groups" class="groups"><img wicket:id="groupsIcon" alt="Groups" width="80" height="80" /><br /><wicket:message key="groups"/></a></li>
         <li><a href="#" wicket:id="resources" class="resources"><img wicket:id="resourcesIcon" alt="Resources" width="80" height="80" /><br /><wicket:message key="resources"/></a></li>
         <li><a href="#" wicket:id="tasks" class="tasks"><img wicket:id="tasksIcon" alt="Tasks" width="80" height="80" /><br /><wicket:message key="tasks"/></a></li>
         <li><a href="#" wicket:id="reports" class="reports"><img wicket:id="reportsIcon" alt="Reports" width="80" height="80" /><br /><wicket:message key="reports"/></a></li>

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/panels/AttrTemplatesPanel.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/AttrTemplatesPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/panels/AttrTemplatesPanel.html
index 9049435..2b7ef52 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/AttrTemplatesPanel.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/AttrTemplatesPanel.html
@@ -36,13 +36,13 @@ under the License.
       </ul>
 
       <div id="rplainattr">
-        <div wicket:id="rPlainAttrTemplates"/>
+        <div wicket:id="gPlainAttrTemplates"/>
       </div>
       <div id="rderattr">
-        <div wicket:id="rDerAttrTemplates"/>
+        <div wicket:id="gDerAttrTemplates"/>
       </div>
       <div id="rvirattr">
-        <div wicket:id="rVirAttrTemplates"/>
+        <div wicket:id="gVirAttrTemplates"/>
       </div>    
       <div id="mplainattr">
         <div wicket:id="mPlainAttrTemplates"/>

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupDetailsPanel.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupDetailsPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupDetailsPanel.html
new file mode 100644
index 0000000..42bf48f
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupDetailsPanel.html
@@ -0,0 +1,107 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+  <wicket:panel>
+    <div id="formtable">
+      <span wicket:id="parent">[parent]</span>
+
+      <div class="tablerow">
+        <div class="tablecolumn_label short_dynamicsize">
+          <wicket:message key="name"/>
+        </div>
+        <div class="tablecolumn_field medium_dynamicsize">
+          <span wicket:id="name"/>
+          <a class="tooltips" wicket:id="questionMarkJexlHelp" href="#" alt="Click to help" title="Click to help">
+            <img src="img/help.png"/>
+            <span wicket:id="jexlHelp" class="tooltips">
+              <wicket:message key="jexl_info"/>
+              <ul>
+                <li><wicket:message key="jexl_ex1"/></li>
+                <li><wicket:message key="jexl_ex2"/></li>
+              </ul>
+              <a href="#" wicket:id="jexlLink" target="_blank"><wicket:message key="jexl_syntax_url"/></a>
+            </span>
+          </a>
+        </div>
+      </div>
+
+      <div class="tablerow alt">
+        <div class="tablecolumn_label short_dynamicsize">
+          <wicket:message key="inheritOwner"/>
+        </div>
+        <div class="tablecolumn_field medium_dynamicsize">
+          <span wicket:id="inheritOwner"/>
+        </div>
+      </div>
+
+      <div class="tablerow">
+        <div class="tablecolumn_label short_dynamicsize">
+          <wicket:message key="inheritTemplates"/>
+        </div>
+        <div class="tablecolumn_field medium_dynamicsize">
+          <span wicket:id="inheritTemplates"/>
+        </div>
+      </div>
+
+      <div wicket:id="ownerContainer">
+        <div class="tablerow alt">
+          <div class="tablecolumn_label short_dynamicsize">
+            <wicket:message key="userOwner"/>
+          </div>
+          <div class="tablecolumn_field medium_dynamicsize">
+            <span wicket:id="userOwner"/>
+            <a href="#" wicket:id="userOwnerSelect"><img src="img/actions/search.png" alt="select user owner" title="Search"/></a>
+            <a href="#" wicket:id="userOwnerReset"><img src="img/actions/delete.png" alt="reset user owner" title="Delete"/></a>
+          </div>
+        </div>
+
+        <div class="tablerow">
+          <div class="tablecolumn_label short_dynamicsize">
+            <wicket:message key="groupOwner"/>
+          </div>
+          <div class="tablecolumn_field medium_dynamicsize">
+            <span wicket:id="groupOwner"/>
+            <a href="#" wicket:id="groupOwnerSelect"><img src="img/actions/search.png" alt="select group owner" title="Search"/></a>
+            <a href="#" wicket:id="groupOwnerReset"><img src="img/actions/delete.png" alt="reset group owner" title="Delete"/></a>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <span wicket:id="parentSelectWin"/>
+    <span wicket:id="userOwnerSelectWin"/>
+    <span wicket:id="groupOwnerSelectWin"/>
+
+    <wicket:fragment wicket:id="parentFragment">
+      <div class="tablerow">
+        <div class="tablecolumn_label short_dynamicsize">
+          <wicket:message key="parent"/>
+        </div>
+        <div class="tablecolumn_field medium_dynamicsize">
+          <span wicket:id="parent"/>
+          <a href="#" wicket:id="parentSelect"><img src="img/actions/search.png" alt="select group parent" title="Search"/></a>
+          <a href="#" wicket:id="parentReset"><img src="img/actions/delete.png" alt="reset group parent" title="Delete"/></a>
+        </div>
+      </div>
+    </wicket:fragment>
+
+    <wicket:fragment wicket:id="emptyFragment">
+    </wicket:fragment>
+  </wicket:panel>
+</html>

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupDetailsPanel.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupDetailsPanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupDetailsPanel.properties
new file mode 100644
index 0000000..52581e5
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupDetailsPanel.properties
@@ -0,0 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+name=Name
+userOwner=Owner (user)
+groupOwner=Owner (group)
+inheritOwner=Inherit owner
+parent=Parent
+inheritTemplates=Inherit templates

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupDetailsPanel_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupDetailsPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupDetailsPanel_it.properties
new file mode 100644
index 0000000..f7fbc02
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupDetailsPanel_it.properties
@@ -0,0 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+name=Nome
+userOwner=Proprietario (utente)
+groupOwner=Proprietario (gruppo)
+inheritOwner=Eredita proprietario
+parent=Padre
+inheritTemplates=Eredita modelli

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupDetailsPanel_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupDetailsPanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupDetailsPanel_pt_BR.properties
new file mode 100644
index 0000000..772fc4e
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupDetailsPanel_pt_BR.properties
@@ -0,0 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+name=Nome
+userOwner=Dono (usu\u00e1rio)
+groupOwner=Dono (grupo)
+inheritOwner=Dono herdado
+parent=Parente
+inheritTemplates=Modelo herdado

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupPanel.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupPanel.html
new file mode 100644
index 0000000..5783350
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupPanel.html
@@ -0,0 +1,88 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+  <wicket:panel>
+
+    <div id="details">
+      <span wicket:id="details">[group details]</span>
+      <span wicket:id="statuspanel">[Status Panel]</span>
+      <span wicket:id="systeminformation">[System Information]</span>
+    </div>
+
+    <div id="templates">
+      <span wicket:id="templates">[templates]</span>
+    </div>
+
+    <div id="plainAttrs">
+      <div id="formtable">
+        <div class="tablerow">
+          <div class="tablecolumn_label short_dynamicsize">
+            <wicket:message key="inheritPlainAttrs"/>
+          </div>
+          <div class="tablecolumn_field medium_dynamicsize">
+            <span wicket:id="inheritPlainAttrs" />
+          </div>
+        </div>
+
+        <span wicket:id="plainAttrs">[group attributes]</span>
+      </div>
+    </div>
+
+    <div id="derAttrs">
+      <div id="formtable">
+        <div class="tablerow alt">
+          <div class="tablecolumn_label short_dynamicsize">
+            <wicket:message key="inheritDerAttrs"/>
+          </div>
+          <div class="tablecolumn_field medium_dynamicsize">
+            <span wicket:id="inheritDerAttrs" />
+          </div>
+        </div>
+
+        <span wicket:id="derAttrs">[group derived attributes]</span>
+      </div>
+    </div>
+
+    <div id="virAttrs">
+      <div id="formtable">
+        <div class="tablerow alt">
+          <div class="tablecolumn_label short_dynamicsize">
+            <wicket:message key="inheritVirAttrs"/>
+          </div>
+          <div class="tablecolumn_field medium_dynamicsize">
+            <span wicket:id="inheritVirAttrs" />
+          </div>
+        </div>
+
+        <span wicket:id="virAttrs">[group virtual attributes]</span>
+      </div>
+    </div>
+
+    <div id="resources">
+      <span wicket:id="resources">[resources]</span>
+    </div>
+    <div id="entitlements">
+      <span wicket:id="entitlements">[entitlements]</span>
+    </div>
+    <div id="security">
+      <span wicket:id="security">[security]</span>
+    </div>
+
+  </wicket:panel>
+</html>

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupPanel.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupPanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupPanel.properties
new file mode 100644
index 0000000..195f8ed
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupPanel.properties
@@ -0,0 +1,51 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+required_alert=All form fields are required.
+add=+
+drop=-
+error=Generic error occurred during the operation
+name=Name
+firstResourcesList=Group's resources
+secondResourcesList=Available resources
+firstEntitlementsList=Group's entitlements
+secondEntitlementsList=Available entitlements
+
+addAttributeBtn=Add
+required_alert=All form fields are required.
+add=+
+drop=-
+error=Generic error occurred during the operation
+name=Name
+firstResourcesList=Group's resources
+secondResourcesList=Available resources
+firstEntitlementsList=Group's entitlements
+secondEntitlementsList=Available entitlements
+derAttrs=Derived Attributes
+derAttrToRemove=Delete
+derAttrName=Name
+derAttrValue=Derived value
+
+virAttrs=Virtual Attributes
+virAttrToRemove=Delete
+virAttrName=Name
+virAttrValue=Virtual value
+
+addAttributeBtn=Add
+
+inheritPlainAttrs=Inherit plain attributes
+inheritDerAttrs=Inherit derived attributes
+inheritVirAttrs=Inherit virtual attributes

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupPanel_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupPanel_it.properties
new file mode 100644
index 0000000..7dda4fb
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupPanel_it.properties
@@ -0,0 +1,53 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+required_alert=All form fields are required.
+add=+
+drop=-
+name=Nome
+error=Errore generico durante l'operazione
+firstResourcesList=Risorse ruolo
+secondResourcesList=Risorse disponibili
+firstResourcesList=Entitlement ruolo
+secondResourcesList=Entitlement disponibili
+
+addAttributeBtn=Aggiungi
+required_alert=Tutti i valori sono richiesti.
+add=+
+drop=-
+name=Nome
+error=Errore generico durante l'operazione
+firstResourcesList=Risorse ruolo
+secondResourcesList=Risorse disponibili
+firstResourcesList=Risorse gruppo
+secondResourcesList=Risorse disponibili
+derAttrs=Attributi derivati
+derAttrToRemove=Rimuovi
+derAttrName=Nome
+derAttrValue=Valore derivato
+
+virAttrs=Attributi virtuali
+virAttrToRemove=Rimuovi
+virAttrName=Nome
+virAttrValue=Valore virtuale
+
+addAttributeBtn=Aggiungi
+
+inheritPlainAttrs=Eredita attributi normali
+inheritDerAttrs=Eredita attributi derivati
+inheritVirAttrs=Eredita attributi virtuali
+firstEntitlementsList=Entitlement grupo
+secondEntitlementsList=Entitlement disponibili

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupPanel_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupPanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupPanel_pt_BR.properties
new file mode 100644
index 0000000..e74968a
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupPanel_pt_BR.properties
@@ -0,0 +1,40 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+required_alert=Todos os campos s\u00e3o obrigat\u00f3rios
+add=+
+drop=-
+error=Um erro gen\u00e9rico ocorreu durante a opera\u00e7\u00e3o
+name=Nome
+firstResourcesList=Recursos de Grupo
+secondResourcesList=Recursos Dipon\u00edveis
+firstEntitlementsList=Direitos de Grupo
+secondEntitlementsList=Direitos Dispon\u00edveis
+derAttrs=Atributos Derivados
+derAttrToRemove=Remover
+derAttrName=Nome
+derAttrValue=Valor Derivado
+
+virAttrs=Atributos Virtuais
+virAttrToRemove=Remover
+virAttrName=Nome
+virAttrValue=Valor Virtual
+
+addAttributeBtn=Adicionar
+
+inheritPlainAttrs=Atributos Herdados Normal
+inheritDerAttrs=Atributos Herdados Derivados
+inheritVirAttrs=Atributos Virtuais Herdados

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupSecurityPanel.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupSecurityPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupSecurityPanel.html
new file mode 100644
index 0000000..61b609e
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupSecurityPanel.html
@@ -0,0 +1,66 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+  <wicket:panel>
+    <div id="formtable" wicket:id="security">
+      <div class="tablerow">
+        <div class="tablecolumn_label short_dynamicsize">
+          <label for="inheritPasswordPolicy"><wicket:message key="inheritPasswordPolicy"/></label>
+        </div>
+        <div class="tablecolumn_field medium_dynamicsize">
+          <span wicket:id="inheritPasswordPolicy">
+            [panel for dynamic input type markup]
+          </span>
+        </div>
+      </div>
+      <div class="tablerow">
+        <div class="tablecolumn_label short_dynamicsize">
+          <label for="passwordPolicy"><wicket:message key="passwordPolicy"/></label>
+        </div>
+        <div class="tablecolumn_field medium_dynamicsize">
+          <span wicket:id="passwordPolicy">
+            [panel for dynamic input type markup]
+          </span>
+        </div>
+      </div>
+
+      <div class="tablerow">
+        <div class="tablecolumn_label short_dynamicsize">
+          <label for="inheritAccountPolicy"><wicket:message key="inheritAccountPolicy"/></label>
+        </div>
+        <div class="tablecolumn_field medium_dynamicsize">
+          <span wicket:id="inheritAccountPolicy">
+            [panel for dynamic input type markup]
+          </span>
+        </div>
+      </div>
+
+      <div class="tablerow">
+        <div class="tablecolumn_label short_dynamicsize">
+          <label for="accountPolicy"><wicket:message key="accountPolicy"/></label>
+        </div>
+        <div class="tablecolumn_field medium_dynamicsize">
+          <span wicket:id="accountPolicy">
+            [panel for dynamic input type markup]
+          </span>
+        </div>
+      </div>
+    </div>
+  </wicket:panel>
+</html>

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupSecurityPanel.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupSecurityPanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupSecurityPanel.properties
new file mode 100644
index 0000000..167673d
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupSecurityPanel.properties
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+inheritPasswordPolicy = Inherit password policy
+inheritAccountPolicy = Inherit account policy
+passwordPolicy = Password Policy
+accountPolicy = Account Policy
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupSecurityPanel_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupSecurityPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupSecurityPanel_it.properties
new file mode 100644
index 0000000..6e7c6ed
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupSecurityPanel_it.properties
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+inheritPasswordPolicy = Eredita password policy
+inheritAccountPolicy = Eredita account policy
+passwordPolicy = Password Policy
+accountPolicy = Account Policy

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupSecurityPanel_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupSecurityPanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupSecurityPanel_pt_BR.properties
new file mode 100644
index 0000000..5c77adc
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupSecurityPanel_pt_BR.properties
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+inheritPasswordPolicy = Pol\u00EDtica de Senha Herdada
+inheritAccountPolicy = Pol\u00EDtica de Conta Herdada
+passwordPolicy = Pol\u00EDtica de Senha
+accountPolicy = Pol\u00EDtica de Conta
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupSummaryPanel.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupSummaryPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupSummaryPanel.html
new file mode 100644
index 0000000..39eead2
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupSummaryPanel.html
@@ -0,0 +1,39 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+  <wicket:panel>
+
+    <span wicket:id="groupSummaryPanel">[Group panel]</span>
+
+    <wicket:fragment wicket:id="groupViewPanel">
+      <span wicket:id="nodeViewPanel"></span>
+    </wicket:fragment>
+
+    <wicket:fragment wicket:id="rootPanel">
+      <div style="float:left; width:70%;">
+        <p style="height:15px; margin-top: 0px;" class="ui-widget ui-corner-all ui-widget-header">
+          <span style="float:right;" wicket:id="actionLinks"/>
+        </p>
+      </div>
+    </wicket:fragment>
+
+    <wicket:fragment wicket:id="fakerootFrag">
+    </wicket:fragment>
+  </wicket:panel>
+</html>

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupTabPanel.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupTabPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupTabPanel.html
new file mode 100644
index 0000000..a05da39
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupTabPanel.html
@@ -0,0 +1,64 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+  <wicket:panel>
+    <div style="float:left; width:70%;">
+      <script type="text/javascript">
+        $(document).ready(function () {
+          $("div form #tabs").tabs();
+        });
+        $(document).ready(function () {
+          $("div form #tabs #templates").tabs();
+        });
+      </script>
+      <p style="height:15px; margin-top: 0px;" class="ui-widget ui-corner-all ui-widget-header">
+        <wicket:message key="title"/>
+        <span wicket:id="displayName"/>
+        <span style="float:right;" wicket:id="actionLinks"/>
+      </p>
+
+      <form wicket:id="groupForm">
+        <div id="tabs" style="margin: 0px;">
+          <ul>
+            <li><a href="#details"><span><wicket:message key="details"/></span></a></li>
+            <li><a href="#templates"><span><wicket:message key="templates"/></span></a></li>
+            <li><a href="#plainAttrs"><span><wicket:message key="plainAttrs"/></span></a></li>
+            <li><a href="#derAttrs"><span><wicket:message key="derAttrs"/></span></a></li>
+            <li><a href="#virAttrs"><span><wicket:message key="virAttrs"/></span></a></li>
+            <li><a href="#resources"><span><wicket:message key="resources"/></span></a></li>
+            <li><a href="#entitlements"><span><wicket:message key="entitlements"/></span></a></li>
+            <li><a href="#security"><span><wicket:message key="security"/></span></a></li>
+            <li><a href="#users"><span><wicket:message key="users"/></span></a></li>
+          </ul>
+          <div wicket:id="groupPanel">
+          </div>
+          <div id="users">
+            <div wicket:id="userListContainer">
+              <input type="button" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
+                     wicket:id="search"/>
+              <div id="users-contain" class="ui-widget" style="width:auto">
+                <span wicket:id="userList"> [userList] </span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </form>
+    </div>
+  </wicket:panel>
+</html>

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupTabPanel.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupTabPanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupTabPanel.properties
new file mode 100644
index 0000000..4ee3e36
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupTabPanel.properties
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+title=Group
+details=Details
+plainAttrs=Plain attributes
+derAttrs=Derived attributes
+virAttrs=Virtual attributes
+resources=Resources
+entitlements=Entitlements
+security=Security
+users=Users
+search=Get Users
+templates=Templates

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupTabPanel_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupTabPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupTabPanel_it.properties
new file mode 100644
index 0000000..61e0772
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupTabPanel_it.properties
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+title=Gruppo
+details=Dettagli
+plainAttrs=Attributi normali
+derAttrs=Attributi derivati
+virAttrs=Attributi virtuali
+resources=Risorse
+entitlements=Entitlement
+security=Sicurezza
+users=Utenti
+search=Lista Utenti
+templates=Modelli

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupTabPanel_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupTabPanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupTabPanel_pt_BR.properties
new file mode 100644
index 0000000..7e751b2
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupTabPanel_pt_BR.properties
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+title=Grupo
+details=Detalhes
+plainAttrs=Atributos Normal
+derAttrs=Atributos Derivados
+virAttrs=Atributos Virtuais
+resources=Recursos
+entitlements=Direitos
+security=Seguran\u00e7a
+users=Usu\u00e1rios
+search=Obter Usu\u00e1rios
+templates=Modelo

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/panels/MembershipsPanel.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/MembershipsPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/panels/MembershipsPanel.html
index 684225b..cac787d 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/MembershipsPanel.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/MembershipsPanel.html
@@ -22,7 +22,7 @@ under the License.
       <wicket:message key="membership_availability"/>
     </p>
 
-    <div wicket:id="treeTable" style="float: left; width: 100%; margin:auto;" class="role-tree roleTable"/>
+    <div wicket:id="treeTable" style="float: left; width: 100%; margin:auto;" class="group-tree groupTable"/>
 
     <div style="float: left; width: 100%;">
       <p class="ui-widget ui-corner-all ui-widget-header"><wicket:message key="membership_text"/></p>
@@ -41,10 +41,10 @@ under the License.
         <tbody>
           <tr wicket:id="memberships">
             <td>
-              <span wicket:id="roleId"/>
+              <span wicket:id="groupId"/>
             </td>
             <td>
-              <span wicket:id="roleName"/>
+              <span wicket:id="groupName"/>
             </td>
             <td>
               <a href="#" wicket:id="editLink">

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/panels/MembershipsPanel.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/MembershipsPanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/MembershipsPanel.properties
index 11b0de6..16b7c36 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/MembershipsPanel.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/MembershipsPanel.properties
@@ -14,10 +14,10 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-id=Role Id
-name=Role Name
+id=Group Id
+name=Group Name
 edit=Edit
 delete=Delete
 
-membership_availability=Available roles
-membership_text=Selected roles
+membership_availability=Available groups
+membership_text=Selected groups

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/panels/MembershipsPanel_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/MembershipsPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/MembershipsPanel_it.properties
index e5751ae..86864a1 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/MembershipsPanel_it.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/MembershipsPanel_it.properties
@@ -14,11 +14,11 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-id=Id Ruolo
+id=Id Gruppo
 edit=Modifica
 delete=Rimuovi
-name=Nome Ruolo
+name=Nome Gruppo
 
-membership_availability=Ruoli disponibili
-membership_text=Ruoli selezionati
+membership_availability=Gruppi disponibili
+membership_text=Gruppi selezionati
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/panels/MembershipsPanel_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/MembershipsPanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/MembershipsPanel_pt_BR.properties
index b9ed029..5a41e98 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/MembershipsPanel_pt_BR.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/MembershipsPanel_pt_BR.properties
@@ -14,10 +14,10 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-id=Identificador da Fun\u00E7\u00E3o
-name=Nome da Fun\u00E7\u00E3o
+id=Identificador da Grupo
+name=Nome da Grupo
 edit=Alterar
 delete=Excluir
 
-membership_availability=Fun\u00E7\u00F5es dispon\u00EDveis
-membership_text=Fun\u00E7\u00F5es selecionadas
+membership_availability=Grupos dispon\u00edveis
+membership_text=Grupos selecionadas

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleDetailsPanel.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleDetailsPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleDetailsPanel.html
deleted file mode 100644
index bd04c97..0000000
--- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleDetailsPanel.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
-  <wicket:panel>
-    <div id="formtable">
-      <span wicket:id="parent">[parent]</span>
-
-      <div class="tablerow">
-        <div class="tablecolumn_label short_dynamicsize">
-          <wicket:message key="name"/>
-        </div>
-        <div class="tablecolumn_field medium_dynamicsize">
-          <span wicket:id="name"/>
-          <a class="tooltips" wicket:id="questionMarkJexlHelp" href="#" alt="Click to help" title="Click to help">
-            <img src="img/help.png"/>
-            <span wicket:id="jexlHelp" class="tooltips">
-              <wicket:message key="jexl_info"/>
-              <ul>
-                <li><wicket:message key="jexl_ex1"/></li>
-                <li><wicket:message key="jexl_ex2"/></li>
-              </ul>
-              <a href="#" wicket:id="jexlLink" target="_blank"><wicket:message key="jexl_syntax_url"/></a>
-            </span>
-          </a>
-        </div>
-      </div>
-
-      <div class="tablerow alt">
-        <div class="tablecolumn_label short_dynamicsize">
-          <wicket:message key="inheritOwner"/>
-        </div>
-        <div class="tablecolumn_field medium_dynamicsize">
-          <span wicket:id="inheritOwner"/>
-        </div>
-      </div>
-
-      <div class="tablerow">
-        <div class="tablecolumn_label short_dynamicsize">
-          <wicket:message key="inheritTemplates"/>
-        </div>
-        <div class="tablecolumn_field medium_dynamicsize">
-          <span wicket:id="inheritTemplates"/>
-        </div>
-      </div>
-
-      <div wicket:id="ownerContainer">
-        <div class="tablerow alt">
-          <div class="tablecolumn_label short_dynamicsize">
-            <wicket:message key="userOwner"/>
-          </div>
-          <div class="tablecolumn_field medium_dynamicsize">
-            <span wicket:id="userOwner"/>
-            <a href="#" wicket:id="userOwnerSelect"><img src="img/actions/search.png" alt="select user owner" title="Search"/></a>
-            <a href="#" wicket:id="userOwnerReset"><img src="img/actions/delete.png" alt="reset user owner" title="Delete"/></a>
-          </div>
-        </div>
-
-        <div class="tablerow">
-          <div class="tablecolumn_label short_dynamicsize">
-            <wicket:message key="roleOwner"/>
-          </div>
-          <div class="tablecolumn_field medium_dynamicsize">
-            <span wicket:id="roleOwner"/>
-            <a href="#" wicket:id="roleOwnerSelect"><img src="img/actions/search.png" alt="select role owner" title="Search"/></a>
-            <a href="#" wicket:id="roleOwnerReset"><img src="img/actions/delete.png" alt="reset role owner" title="Delete"/></a>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <span wicket:id="parentSelectWin"/>
-    <span wicket:id="userOwnerSelectWin"/>
-    <span wicket:id="roleOwnerSelectWin"/>
-
-    <wicket:fragment wicket:id="parentFragment">
-      <div class="tablerow">
-        <div class="tablecolumn_label short_dynamicsize">
-          <wicket:message key="parent"/>
-        </div>
-        <div class="tablecolumn_field medium_dynamicsize">
-          <span wicket:id="parent"/>
-          <a href="#" wicket:id="parentSelect"><img src="img/actions/search.png" alt="select role parent" title="Search"/></a>
-          <a href="#" wicket:id="parentReset"><img src="img/actions/delete.png" alt="reset role parent" title="Delete"/></a>
-        </div>
-      </div>
-    </wicket:fragment>
-
-    <wicket:fragment wicket:id="emptyFragment">
-    </wicket:fragment>
-  </wicket:panel>
-</html>

http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleDetailsPanel.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleDetailsPanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleDetailsPanel.properties
deleted file mode 100644
index b729c65..0000000
--- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleDetailsPanel.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-name=Name
-userOwner=Owner (user)
-roleOwner=Owner (role)
-inheritOwner=Inherit owner
-parent=Parent
-inheritTemplates=Inherit templates