You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2015/04/21 11:33:50 UTC
[21/57] 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/panels/RoleDetailsPanel_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleDetailsPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleDetailsPanel_it.properties
deleted file mode 100644
index 7938bae..0000000
--- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleDetailsPanel_it.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=Nome
-userOwner=Proprietario (utente)
-roleOwner=Proprietario (ruolo)
-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/RoleDetailsPanel_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleDetailsPanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleDetailsPanel_pt_BR.properties
deleted file mode 100644
index eadc335..0000000
--- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleDetailsPanel_pt_BR.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=Nome
-userOwner=Dono (usu\u00e1rio)
-roleOwner=Dono (fun\u00e7\u00e3o)
-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/RolePanel.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RolePanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/panels/RolePanel.html
deleted file mode 100644
index b1729c1..0000000
--- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RolePanel.html
+++ /dev/null
@@ -1,88 +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="details">
- <span wicket:id="details">[role 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">[role 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">[role 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">[role 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/RolePanel.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RolePanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/RolePanel.properties
deleted file mode 100644
index 86aace6..0000000
--- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RolePanel.properties
+++ /dev/null
@@ -1,51 +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.
-add=+
-drop=-
-error=Generic error occurred during the operation
-name=Name
-firstResourcesList=Role's resources
-secondResourcesList=Available resources
-firstEntitlementsList=Role'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=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
http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/panels/RolePanel_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RolePanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/RolePanel_it.properties
deleted file mode 100644
index 068abdc..0000000
--- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RolePanel_it.properties
+++ /dev/null
@@ -1,53 +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.
-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 ruolo
-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 ruolo
-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/RolePanel_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RolePanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/RolePanel_pt_BR.properties
deleted file mode 100644
index e480811..0000000
--- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RolePanel_pt_BR.properties
+++ /dev/null
@@ -1,40 +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
-add=+
-drop=-
-error=Um erro gen\u00e9rico ocorreu durante a opera\u00e7\u00e3o
-name=Nome
-firstResourcesList=Recursos de Fun\u00e7\u00f5es
-secondResourcesList=Recursos Dipon\u00edveis
-firstEntitlementsList=Direitos de Fun\u00e7\u00f5es
-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/RoleSecurityPanel.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleSecurityPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleSecurityPanel.html
deleted file mode 100644
index 61b609e..0000000
--- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleSecurityPanel.html
+++ /dev/null
@@ -1,66 +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" 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/RoleSecurityPanel.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleSecurityPanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleSecurityPanel.properties
deleted file mode 100644
index 167673d..0000000
--- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleSecurityPanel.properties
+++ /dev/null
@@ -1,20 +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.
-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/RoleSecurityPanel_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleSecurityPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleSecurityPanel_it.properties
deleted file mode 100644
index 6e7c6ed..0000000
--- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleSecurityPanel_it.properties
+++ /dev/null
@@ -1,20 +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.
-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/RoleSecurityPanel_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleSecurityPanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleSecurityPanel_pt_BR.properties
deleted file mode 100644
index 5c77adc..0000000
--- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleSecurityPanel_pt_BR.properties
+++ /dev/null
@@ -1,20 +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.
-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/RoleSummaryPanel.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleSummaryPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleSummaryPanel.html
deleted file mode 100644
index 3d5e7b9..0000000
--- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleSummaryPanel.html
+++ /dev/null
@@ -1,39 +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>
-
- <span wicket:id="roleSummaryPanel">[Role panel]</span>
-
- <wicket:fragment wicket:id="roleViewPanel">
- <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/RoleTabPanel.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleTabPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleTabPanel.html
deleted file mode 100644
index 226c172..0000000
--- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleTabPanel.html
+++ /dev/null
@@ -1,64 +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 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="roleForm">
- <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="rolePanel">
- </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/RoleTabPanel.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleTabPanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleTabPanel.properties
deleted file mode 100644
index b49cf51..0000000
--- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleTabPanel.properties
+++ /dev/null
@@ -1,27 +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.
-title=Role
-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/RoleTabPanel_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleTabPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleTabPanel_it.properties
deleted file mode 100644
index 727fe69..0000000
--- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleTabPanel_it.properties
+++ /dev/null
@@ -1,27 +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.
-title=Ruolo
-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/RoleTabPanel_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleTabPanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleTabPanel_pt_BR.properties
deleted file mode 100644
index f01ecac..0000000
--- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleTabPanel_pt_BR.properties
+++ /dev/null
@@ -1,27 +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.
-title=Fun\u00e7\u00e3o
-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/wicket/markup/html/form/ActionLinksPanel.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionLinksPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionLinksPanel.html
index 7630854..a09d453 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionLinksPanel.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionLinksPanel.html
@@ -29,14 +29,14 @@ under the License.
<span wicket:id="panelClaim">[plus]</span>
<span wicket:id="panelManageResources">[plus]</span>
<span wicket:id="panelManageUsers">[plus]</span>
- <span wicket:id="panelManageRoles">[plus]</span>
+ <span wicket:id="panelManageGroups">[plus]</span>
<span wicket:id="panelDryRun">[plus]</span>
<span wicket:id="panelExecute">[plus]</span>
<span wicket:id="panelEnable">[plus]</span>
<span wicket:id="panelSearch">[plus]</span>
<span wicket:id="panelCreate">[plus]</span>
<span wicket:id="panelUserTemplate">[plus]</span>
- <span wicket:id="panelRoleTemplate">[plus]</span>
+ <span wicket:id="panelGroupTemplate">[plus]</span>
<span wicket:id="panelReset">[plus]</span>
<span wicket:id="panelEdit">[plus]</span>
<span wicket:id="panelExport">[plus]</span>
@@ -65,8 +65,8 @@ under the License.
<a href="#" wicket:id="manageUsersLink"><img id="actionLink" src="img/actions/users-icon.png" alt="manage users icon" title="Manage users"/></a>
</wicket:fragment>
- <wicket:fragment wicket:id="fragmentManageRoles">
- <a href="#" wicket:id="manageRolesLink"><img id="actionLink" src="img/actions/roles-icon.png" alt="manage roles icon" title="Manage roles"/></a>
+ <wicket:fragment wicket:id="fragmentManageGroups">
+ <a href="#" wicket:id="manageGroupsLink"><img id="actionLink" src="img/actions/groups-icon.png" alt="manage groups icon" title="Manage groups"/></a>
</wicket:fragment>
<wicket:fragment wicket:id="fragmentCreate">
@@ -93,8 +93,8 @@ under the License.
<a href="#" wicket:id="userTemplateLink"><img id="actionLink" src="img/actions/user_template.png" alt="user template icon" title="Specify user template"/></a>
</wicket:fragment>
- <wicket:fragment wicket:id="fragmentRoleTemplate">
- <a href="#" wicket:id="roleTemplateLink"><img id="actionLink" src="img/actions/roles-icon.png" alt="role template icon" title="Specify role template"/></a>
+ <wicket:fragment wicket:id="fragmentGroupTemplate">
+ <a href="#" wicket:id="groupTemplateLink"><img id="actionLink" src="img/actions/groups-icon.png" alt="group template icon" title="Specify group template"/></a>
</wicket:fragment>
<wicket:fragment wicket:id="fragmentDelete">
http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/tree/TreeGroupPanel.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/tree/TreeGroupPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/tree/TreeGroupPanel.html
new file mode 100644
index 0000000..0f202e9
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/tree/TreeGroupPanel.html
@@ -0,0 +1,25 @@
+<!--
+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 class="groupTable" wicket:id="treeContainer">
+ <div wicket:id="treeTable" class="group-tree"/>
+ </div>
+ </wicket:panel>
+</html>
\ 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/wicket/markup/html/tree/TreeRolePanel.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/tree/TreeRolePanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/tree/TreeRolePanel.html
deleted file mode 100644
index 8294ed0..0000000
--- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/tree/TreeRolePanel.html
+++ /dev/null
@@ -1,23 +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:panel>
- <div class="roleTable" wicket:id="treeContainer">
- <div wicket:id="treeTable" class="role-tree"/>
- </div>
-</wicket:panel>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/client/lib/src/main/java/org/apache/syncope/client/lib/SyncopeClient.java
----------------------------------------------------------------------
diff --git a/client/lib/src/main/java/org/apache/syncope/client/lib/SyncopeClient.java b/client/lib/src/main/java/org/apache/syncope/client/lib/SyncopeClient.java
index 2034ce6..2a3d146 100644
--- a/client/lib/src/main/java/org/apache/syncope/client/lib/SyncopeClient.java
+++ b/client/lib/src/main/java/org/apache/syncope/client/lib/SyncopeClient.java
@@ -22,7 +22,7 @@ import javax.ws.rs.core.EntityTag;
import javax.ws.rs.core.MediaType;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.syncope.common.lib.search.OrderByClauseBuilder;
-import org.apache.syncope.common.lib.search.RoleFiqlSearchConditionBuilder;
+import org.apache.syncope.common.lib.search.GroupFiqlSearchConditionBuilder;
import org.apache.syncope.common.lib.search.UserFiqlSearchConditionBuilder;
import org.apache.syncope.common.rest.api.Preference;
import org.apache.syncope.common.rest.api.RESTHeaders;
@@ -60,12 +60,12 @@ public class SyncopeClient {
}
/**
- * Returns a new instance of <tt>RoleFiqlSearchConditionBuilder</tt>, for assisted building of FIQL queries.
+ * Returns a new instance of <tt>GroupFiqlSearchConditionBuilder</tt>, for assisted building of FIQL queries.
*
- * @return default instance of <tt>RoleFiqlSearchConditionBuilder</tt>
+ * @return default instance of <tt>GroupFiqlSearchConditionBuilder</tt>
*/
- public static RoleFiqlSearchConditionBuilder getRoleSearchConditionBuilder() {
- return new RoleFiqlSearchConditionBuilder();
+ public static GroupFiqlSearchConditionBuilder getGroupSearchConditionBuilder() {
+ return new GroupFiqlSearchConditionBuilder();
}
/**
http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/common/lib/src/main/java/org/apache/syncope/common/lib/AbstractBaseBean.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/AbstractBaseBean.java b/common/lib/src/main/java/org/apache/syncope/common/lib/AbstractBaseBean.java
index 8a6d9c4..bd8b06e 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/AbstractBaseBean.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/AbstractBaseBean.java
@@ -27,12 +27,12 @@ import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import org.apache.syncope.common.lib.to.AbstractTaskTO;
import org.apache.syncope.common.lib.to.ReportTO;
-import org.apache.syncope.common.lib.to.RoleTO;
+import org.apache.syncope.common.lib.to.GroupTO;
import org.apache.syncope.common.lib.to.UserTO;
@XmlType
// Reporting here only classes used via PagedResult
-@XmlSeeAlso({ AbstractTaskTO.class, ReportTO.class, RoleTO.class, UserTO.class })
+@XmlSeeAlso({ AbstractTaskTO.class, ReportTO.class, GroupTO.class, UserTO.class })
public abstract class AbstractBaseBean implements Serializable {
private static final long serialVersionUID = 3119542005279892164L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/common/lib/src/main/java/org/apache/syncope/common/lib/AttributableOperations.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/AttributableOperations.java b/common/lib/src/main/java/org/apache/syncope/common/lib/AttributableOperations.java
index 1c53db6..082f47f 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/AttributableOperations.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/AttributableOperations.java
@@ -32,13 +32,13 @@ import org.apache.syncope.common.lib.mod.AbstractSubjectMod;
import org.apache.syncope.common.lib.mod.AttrMod;
import org.apache.syncope.common.lib.mod.MembershipMod;
import org.apache.syncope.common.lib.mod.ReferenceMod;
-import org.apache.syncope.common.lib.mod.RoleMod;
+import org.apache.syncope.common.lib.mod.GroupMod;
import org.apache.syncope.common.lib.mod.UserMod;
import org.apache.syncope.common.lib.to.AbstractAttributableTO;
import org.apache.syncope.common.lib.to.AbstractSubjectTO;
import org.apache.syncope.common.lib.to.AttrTO;
import org.apache.syncope.common.lib.to.MembershipTO;
-import org.apache.syncope.common.lib.to.RoleTO;
+import org.apache.syncope.common.lib.to.GroupTO;
import org.apache.syncope.common.lib.to.UserTO;
/**
@@ -67,16 +67,16 @@ public final class AttributableOperations {
AttrMod mod = new AttrMod();
mod.setSchema(entry.getKey());
- Set<String> updatedValues = new HashSet<String>(entry.getValue().getValues());
+ Set<String> updatedValues = new HashSet<>(entry.getValue().getValues());
Set<String> originalValues = originalAttrs.containsKey(entry.getKey())
- ? new HashSet<String>(originalAttrs.get(entry.getKey()).getValues())
+ ? new HashSet<>(originalAttrs.get(entry.getKey()).getValues())
: Collections.<String>emptySet();
if (!originalAttrs.containsKey(entry.getKey())) {
// SYNCOPE-459: take care of user virtual attributes without any value
updatedValues.remove("");
- mod.getValuesToBeAdded().addAll(new ArrayList<String>(updatedValues));
+ mod.getValuesToBeAdded().addAll(new ArrayList<>(updatedValues));
if (virtuals) {
result.getVirAttrsToUpdate().add(mod);
@@ -253,12 +253,12 @@ public final class AttributableOperations {
for (Map.Entry<Long, MembershipTO> entry : updatedMembs.entrySet()) {
MembershipMod membMod = new MembershipMod();
- membMod.setRole(entry.getValue().getRoleId());
+ membMod.setGroup(entry.getValue().getGroupId());
if (originalMembs.containsKey(entry.getKey())) {
// if memberships are actually same, just make the isEmpty() call below succeed
if (entry.getValue().equals(originalMembs.get(entry.getKey()))) {
- membMod.setRole(0);
+ membMod.setGroup(0);
} else {
diff(entry.getValue(), originalMembs.get(entry.getKey()), membMod, false);
}
@@ -294,10 +294,10 @@ public final class AttributableOperations {
}
if (!incremental) {
- Set<Long> originalRoles = new HashSet<>(originalMembs.keySet());
- originalRoles.removeAll(updatedMembs.keySet());
- for (Long roleId : originalRoles) {
- result.getMembershipsToRemove().add(originalMembs.get(roleId).getKey());
+ Set<Long> originalGroups = new HashSet<>(originalMembs.keySet());
+ originalGroups.removeAll(updatedMembs.keySet());
+ for (Long groupId : originalGroups) {
+ result.getMembershipsToRemove().add(originalMembs.get(groupId).getKey());
}
}
@@ -307,24 +307,24 @@ public final class AttributableOperations {
/**
* Calculate modifications needed by first in order to be equal to second.
*
- * @param updated updated RoleTO
- * @param original original RoleTO
- * @return RoleMod containing differences
+ * @param updated updated GroupTO
+ * @param original original GroupTO
+ * @return GroupMod containing differences
*/
- public static RoleMod diff(final RoleTO updated, final RoleTO original) {
+ public static GroupMod diff(final GroupTO updated, final GroupTO original) {
return diff(updated, original, false);
}
/**
* Calculate modifications needed by first in order to be equal to second.
*
- * @param updated updated RoleTO
- * @param original original RoleTO
+ * @param updated updated GroupTO
+ * @param original original GroupTO
* @param incremental perform incremental diff (without removing existing info)
- * @return RoleMod containing differences
+ * @return GroupMod containing differences
*/
- public static RoleMod diff(final RoleTO updated, final RoleTO original, final boolean incremental) {
- RoleMod result = new RoleMod();
+ public static GroupMod diff(final GroupTO updated, final GroupTO original, final boolean incremental) {
+ GroupMod result = new GroupMod();
diff(updated, original, result, incremental);
@@ -358,32 +358,32 @@ public final class AttributableOperations {
}
// 5. templates
- Set<String> updatedTemplates = new HashSet<>(updated.getRPlainAttrTemplates());
- Set<String> originalTemplates = new HashSet<>(original.getRPlainAttrTemplates());
+ Set<String> updatedTemplates = new HashSet<>(updated.getGPlainAttrTemplates());
+ Set<String> originalTemplates = new HashSet<>(original.getGPlainAttrTemplates());
if (updatedTemplates.equals(originalTemplates)) {
result.setModRAttrTemplates(false);
result.getRPlainAttrTemplates().clear();
} else {
result.setModRAttrTemplates(true);
- result.getRPlainAttrTemplates().addAll(updated.getRPlainAttrTemplates());
+ result.getRPlainAttrTemplates().addAll(updated.getGPlainAttrTemplates());
}
- updatedTemplates = new HashSet<>(updated.getRDerAttrTemplates());
- originalTemplates = new HashSet<>(original.getRDerAttrTemplates());
+ updatedTemplates = new HashSet<>(updated.getGDerAttrTemplates());
+ originalTemplates = new HashSet<>(original.getGDerAttrTemplates());
if (updatedTemplates.equals(originalTemplates)) {
result.setModRDerAttrTemplates(false);
result.getRDerAttrTemplates().clear();
} else {
result.setModRDerAttrTemplates(true);
- result.getRDerAttrTemplates().addAll(updated.getRDerAttrTemplates());
+ result.getRDerAttrTemplates().addAll(updated.getGDerAttrTemplates());
}
- updatedTemplates = new HashSet<>(updated.getRVirAttrTemplates());
- originalTemplates = new HashSet<>(original.getRVirAttrTemplates());
+ updatedTemplates = new HashSet<>(updated.getGVirAttrTemplates());
+ originalTemplates = new HashSet<>(original.getGVirAttrTemplates());
if (updatedTemplates.equals(originalTemplates)) {
result.setModRVirAttrTemplates(false);
result.getRVirAttrTemplates().clear();
} else {
result.setModRVirAttrTemplates(true);
- result.getRVirAttrTemplates().addAll(updated.getRVirAttrTemplates());
+ result.getRVirAttrTemplates().addAll(updated.getGVirAttrTemplates());
}
updatedTemplates = new HashSet<>(updated.getMPlainAttrTemplates());
originalTemplates = new HashSet<>(original.getMPlainAttrTemplates());
@@ -415,7 +415,7 @@ public final class AttributableOperations {
// 6. owner
result.setUserOwner(new ReferenceMod(updated.getUserOwner()));
- result.setRoleOwner(new ReferenceMod(updated.getRoleOwner()));
+ result.setGroupOwner(new ReferenceMod(updated.getGroupOwner()));
return result;
}
@@ -498,7 +498,7 @@ public final class AttributableOperations {
}
for (MembershipMod membMod : userMod.getMembershipsToAdd()) {
MembershipTO membTO = new MembershipTO();
- membTO.setRoleId(membMod.getRole());
+ membTO.setGroupId(membMod.getGroup());
apply(membTO, membMod, membTO);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/common/lib/src/main/java/org/apache/syncope/common/lib/SyncopeClientCompositeException.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/SyncopeClientCompositeException.java b/common/lib/src/main/java/org/apache/syncope/common/lib/SyncopeClientCompositeException.java
index 7322cc8..d139bda 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/SyncopeClientCompositeException.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/SyncopeClientCompositeException.java
@@ -73,18 +73,18 @@ public class SyncopeClientCompositeException extends SyncopeClientException {
public String getMessage() {
StringBuilder message = new StringBuilder();
- message.append("{");
+ message.append('{');
Iterator<SyncopeClientException> iter = getExceptions().iterator();
while (iter.hasNext()) {
SyncopeClientException e = iter.next();
- message.append("[");
- message.append(e.getMessage());
- message.append("]");
+ message.append('[').
+ append(e.getMessage()).
+ append(']');
if (iter.hasNext()) {
message.append(", ");
}
}
- message.append("}");
+ message.append('}');
return message.toString();
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/common/lib/src/main/java/org/apache/syncope/common/lib/SyncopeClientException.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/SyncopeClientException.java b/common/lib/src/main/java/org/apache/syncope/common/lib/SyncopeClientException.java
index 2243835..8d015f2 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/SyncopeClientException.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/SyncopeClientException.java
@@ -80,13 +80,11 @@ public class SyncopeClientException extends RuntimeException {
@Override
public String getMessage() {
- StringBuilder message = new StringBuilder();
-
- message.append(getType());
- message.append(" ");
- message.append(getElements());
-
- return message.toString();
+ return new StringBuilder().
+ append(getType()).
+ append(' ').
+ append(getElements()).
+ toString();
}
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/common/lib/src/main/java/org/apache/syncope/common/lib/SyncopeConstants.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/SyncopeConstants.java b/common/lib/src/main/java/org/apache/syncope/common/lib/SyncopeConstants.java
index 817b00d..b1ab0d4 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/SyncopeConstants.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/SyncopeConstants.java
@@ -18,9 +18,10 @@
*/
package org.apache.syncope.common.lib;
+import java.nio.charset.Charset;
import java.util.regex.Pattern;
-public class SyncopeConstants {
+public final class SyncopeConstants {
public static final String NAMESPACE = "http://syncope.apache.org/2.0";
@@ -42,6 +43,8 @@ public class SyncopeConstants {
public static final String DEFAULT_ENCODING = "UTF-8";
+ public static final Charset DEFAULT_CHARSET = Charset.forName(DEFAULT_ENCODING);
+
public static final String ROOT_LOGGER = "ROOT";
public static final Pattern EMAIL_PATTERN = Pattern.compile(
@@ -49,4 +52,7 @@ public class SyncopeConstants {
+ "@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$",
Pattern.CASE_INSENSITIVE);
+ private SyncopeConstants() {
+ // private constructor for utility class
+ }
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/common/lib/src/main/java/org/apache/syncope/common/lib/annotation/FormAttributeField.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/annotation/FormAttributeField.java b/common/lib/src/main/java/org/apache/syncope/common/lib/annotation/FormAttributeField.java
index 2c1c980..5d2603f 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/annotation/FormAttributeField.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/annotation/FormAttributeField.java
@@ -30,7 +30,7 @@ public @interface FormAttributeField {
boolean userSearch() default false;
- boolean roleSearch() default false;
+ boolean groupSearch() default false;
IntMappingType schema() default IntMappingType.UserPlainSchema;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/common/lib/src/main/java/org/apache/syncope/common/lib/mod/AttrMod.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/mod/AttrMod.java b/common/lib/src/main/java/org/apache/syncope/common/lib/mod/AttrMod.java
index b0cee5b..07fe784 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/mod/AttrMod.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/mod/AttrMod.java
@@ -36,16 +36,9 @@ public class AttrMod extends AbstractBaseBean {
private String schema;
- private List<String> valuesToBeAdded;
+ private final List<String> valuesToBeAdded = new ArrayList<>();
- private List<String> valuesToBeRemoved;
-
- public AttrMod() {
- super();
-
- valuesToBeAdded = new ArrayList<>();
- valuesToBeRemoved = new ArrayList<>();
- }
+ private final List<String> valuesToBeRemoved = new ArrayList<>();
public String getSchema() {
return schema;
http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/common/lib/src/main/java/org/apache/syncope/common/lib/mod/GroupMod.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/mod/GroupMod.java b/common/lib/src/main/java/org/apache/syncope/common/lib/mod/GroupMod.java
new file mode 100644
index 0000000..3dbae2e
--- /dev/null
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/mod/GroupMod.java
@@ -0,0 +1,300 @@
+/*
+ * 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.
+ */
+package org.apache.syncope.common.lib.mod;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(name = "groupMod")
+@XmlType
+public class GroupMod extends AbstractSubjectMod {
+
+ private static final long serialVersionUID = 7455805264680210747L;
+
+ private String name;
+
+ private ReferenceMod userOwner;
+
+ private ReferenceMod groupOwner;
+
+ private Boolean inheritOwner;
+
+ private Boolean inheritTemplates;
+
+ private Boolean inheritPlainAttrs;
+
+ private Boolean inheritDerAttrs;
+
+ private Boolean inheritVirAttrs;
+
+ private Boolean inheritAccountPolicy;
+
+ private Boolean inheritPasswordPolicy;
+
+ private boolean modEntitlements;
+
+ private final List<String> entitlements = new ArrayList<>();
+
+ private boolean modRAttrTemplates;
+
+ private final List<String> rPlainAttrTemplates = new ArrayList<>();
+
+ private boolean modRDerAttrTemplates;
+
+ private final List<String> rDerAttrTemplates = new ArrayList<>();
+
+ private boolean modRVirAttrTemplates;
+
+ private final List<String> rVirAttrTemplates = new ArrayList<>();
+
+ private boolean modMAttrTemplates;
+
+ private final List<String> mPlainAttrTemplates = new ArrayList<>();
+
+ private boolean modMDerAttrTemplates;
+
+ private final List<String> mDerAttrTemplates = new ArrayList<>();
+
+ private boolean modMVirAttrTemplates;
+
+ private final List<String> mVirAttrTemplates = new ArrayList<>();
+
+ private ReferenceMod passwordPolicy;
+
+ private ReferenceMod accountPolicy;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(final String name) {
+ this.name = name;
+ }
+
+ public ReferenceMod getUserOwner() {
+ return userOwner;
+ }
+
+ public void setUserOwner(final ReferenceMod userOwner) {
+ this.userOwner = userOwner;
+ }
+
+ public ReferenceMod getGroupOwner() {
+ return groupOwner;
+ }
+
+ public void setGroupOwner(final ReferenceMod groupOwner) {
+ this.groupOwner = groupOwner;
+ }
+
+ public Boolean getInheritOwner() {
+ return inheritOwner;
+ }
+
+ public void setInheritOwner(final Boolean inheritOwner) {
+ this.inheritOwner = inheritOwner;
+ }
+
+ public Boolean getInheritTemplates() {
+ return inheritTemplates;
+ }
+
+ public void setInheritTemplates(final Boolean inheritTemplates) {
+ this.inheritTemplates = inheritTemplates;
+ }
+
+ public Boolean getInheritPlainAttrs() {
+ return inheritPlainAttrs;
+ }
+
+ public void setInheritPlainAttrs(final Boolean inheritAttrs) {
+ this.inheritPlainAttrs = inheritAttrs;
+ }
+
+ public Boolean getInheritDerAttrs() {
+ return inheritDerAttrs;
+ }
+
+ 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() {
+ return modEntitlements;
+ }
+
+ public void setModEntitlements(final boolean modEntitlements) {
+ this.modEntitlements = modEntitlements;
+ }
+
+ @XmlElementWrapper(name = "entitlements")
+ @XmlElement(name = "entitlement")
+ @JsonProperty("entitlements")
+ public List<String> getEntitlements() {
+ return entitlements;
+ }
+
+ public boolean isModRAttrTemplates() {
+ return modRAttrTemplates;
+ }
+
+ public void setModRAttrTemplates(final boolean modRAttrTemplates) {
+ this.modRAttrTemplates = modRAttrTemplates;
+ }
+
+ @XmlElementWrapper(name = "rPlainAttrTemplates")
+ @XmlElement(name = "rAttrTemplate")
+ @JsonProperty("rPlainAttrTemplates")
+ public List<String> getRPlainAttrTemplates() {
+ return rPlainAttrTemplates;
+ }
+
+ 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 = "mPlainAttrTemplates")
+ @XmlElement(name = "mAttrTemplate")
+ @JsonProperty("mPlainAttrTemplates")
+ public List<String> getMPlainAttrTemplates() {
+ return mPlainAttrTemplates;
+ }
+
+ 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;
+ }
+
+ public void setPasswordPolicy(final ReferenceMod passwordPolicy) {
+ this.passwordPolicy = passwordPolicy;
+ }
+
+ public Boolean getInheritPasswordPolicy() {
+ return inheritPasswordPolicy;
+ }
+
+ public void setInheritPasswordPolicy(final Boolean inheritPasswordPolicy) {
+ this.inheritPasswordPolicy = inheritPasswordPolicy;
+ }
+
+ public ReferenceMod getAccountPolicy() {
+ return accountPolicy;
+ }
+
+ public void setAccountPolicy(final ReferenceMod accountPolicy) {
+ this.accountPolicy = accountPolicy;
+ }
+
+ public Boolean getInheritAccountPolicy() {
+ return inheritAccountPolicy;
+ }
+
+ public void setInheritAccountPolicy(final Boolean inheritAccountPolicy) {
+ this.inheritAccountPolicy = inheritAccountPolicy;
+ }
+
+ @JsonIgnore
+ @Override
+ public boolean isEmpty() {
+ return super.isEmpty() && name == null && userOwner == null && groupOwner == null
+ && inheritTemplates == null && inheritOwner == null
+ && inheritAccountPolicy == null && inheritPasswordPolicy == null
+ && inheritPlainAttrs == null && inheritDerAttrs == null && inheritVirAttrs == null
+ && accountPolicy == null && passwordPolicy == null && entitlements.isEmpty()
+ && rPlainAttrTemplates.isEmpty() && rDerAttrTemplates.isEmpty() && rVirAttrTemplates.isEmpty()
+ && mPlainAttrTemplates.isEmpty() && mDerAttrTemplates.isEmpty() && mVirAttrTemplates.isEmpty();
+ }
+}
http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/common/lib/src/main/java/org/apache/syncope/common/lib/mod/MembershipMod.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/mod/MembershipMod.java b/common/lib/src/main/java/org/apache/syncope/common/lib/mod/MembershipMod.java
index bdcfcbf..d414011 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/mod/MembershipMod.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/mod/MembershipMod.java
@@ -28,19 +28,19 @@ public class MembershipMod extends AbstractAttributableMod {
private static final long serialVersionUID = 2511869129977331525L;
- private long role;
+ private long group;
- public long getRole() {
- return role;
+ public long getGroup() {
+ return group;
}
- public void setRole(final long role) {
- this.role = role;
+ public void setGroup(final long group) {
+ this.group = group;
}
@JsonIgnore
@Override
public boolean isEmpty() {
- return super.isEmpty() && role == 0;
+ return super.isEmpty() && group == 0;
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/common/lib/src/main/java/org/apache/syncope/common/lib/mod/ReferenceMod.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/mod/ReferenceMod.java b/common/lib/src/main/java/org/apache/syncope/common/lib/mod/ReferenceMod.java
index e8356c2..25fd02d 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/mod/ReferenceMod.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/mod/ReferenceMod.java
@@ -33,13 +33,14 @@ public class ReferenceMod extends AbstractBaseBean {
private static final long serialVersionUID = -4188817853738067677L;
- private Long key;
+ private Long key = null;
public ReferenceMod() {
- this.key = null;
+ this(null);
}
public ReferenceMod(final Long key) {
+ super();
this.key = key;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/common/lib/src/main/java/org/apache/syncope/common/lib/mod/ResourceAssociationMod.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/mod/ResourceAssociationMod.java b/common/lib/src/main/java/org/apache/syncope/common/lib/mod/ResourceAssociationMod.java
index 6312349..f381104 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/mod/ResourceAssociationMod.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/mod/ResourceAssociationMod.java
@@ -66,7 +66,7 @@ public class ResourceAssociationMod extends AbstractBaseBean {
return changePwd;
}
- public void setChangePwd(boolean changePwd) {
+ public void setChangePwd(final boolean changePwd) {
this.changePwd = changePwd;
}
@@ -74,7 +74,7 @@ public class ResourceAssociationMod extends AbstractBaseBean {
return password;
}
- public void setPassword(String password) {
+ public void setPassword(final String password) {
this.password = password;
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/common/lib/src/main/java/org/apache/syncope/common/lib/mod/RoleMod.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/mod/RoleMod.java b/common/lib/src/main/java/org/apache/syncope/common/lib/mod/RoleMod.java
deleted file mode 100644
index b1b8f4f..0000000
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/mod/RoleMod.java
+++ /dev/null
@@ -1,300 +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.
- */
-package org.apache.syncope.common.lib.mod;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-@XmlRootElement(name = "roleMod")
-@XmlType
-public class RoleMod extends AbstractSubjectMod {
-
- private static final long serialVersionUID = 7455805264680210747L;
-
- private String name;
-
- private ReferenceMod userOwner;
-
- private ReferenceMod roleOwner;
-
- private Boolean inheritOwner;
-
- private Boolean inheritTemplates;
-
- private Boolean inheritPlainAttrs;
-
- private Boolean inheritDerAttrs;
-
- private Boolean inheritVirAttrs;
-
- private Boolean inheritAccountPolicy;
-
- private Boolean inheritPasswordPolicy;
-
- private boolean modEntitlements;
-
- private final List<String> entitlements = new ArrayList<>();
-
- private boolean modRAttrTemplates;
-
- private final List<String> rPlainAttrTemplates = new ArrayList<>();
-
- private boolean modRDerAttrTemplates;
-
- private final List<String> rDerAttrTemplates = new ArrayList<>();
-
- private boolean modRVirAttrTemplates;
-
- private final List<String> rVirAttrTemplates = new ArrayList<>();
-
- private boolean modMAttrTemplates;
-
- private final List<String> mPlainAttrTemplates = new ArrayList<>();
-
- private boolean modMDerAttrTemplates;
-
- private final List<String> mDerAttrTemplates = new ArrayList<>();
-
- private boolean modMVirAttrTemplates;
-
- private final List<String> mVirAttrTemplates = new ArrayList<>();
-
- private ReferenceMod passwordPolicy;
-
- private ReferenceMod accountPolicy;
-
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- public ReferenceMod getUserOwner() {
- return userOwner;
- }
-
- public void setUserOwner(final ReferenceMod userOwner) {
- this.userOwner = userOwner;
- }
-
- public ReferenceMod getRoleOwner() {
- return roleOwner;
- }
-
- public void setRoleOwner(final ReferenceMod roleOwner) {
- this.roleOwner = roleOwner;
- }
-
- public Boolean getInheritOwner() {
- return inheritOwner;
- }
-
- public void setInheritOwner(final Boolean inheritOwner) {
- this.inheritOwner = inheritOwner;
- }
-
- public Boolean getInheritTemplates() {
- return inheritTemplates;
- }
-
- public void setInheritTemplates(final Boolean inheritTemplates) {
- this.inheritTemplates = inheritTemplates;
- }
-
- public Boolean getInheritPlainAttrs() {
- return inheritPlainAttrs;
- }
-
- public void setInheritPlainAttrs(final Boolean inheritAttrs) {
- this.inheritPlainAttrs = inheritAttrs;
- }
-
- public Boolean getInheritDerAttrs() {
- return inheritDerAttrs;
- }
-
- 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() {
- return modEntitlements;
- }
-
- public void setModEntitlements(final boolean modEntitlements) {
- this.modEntitlements = modEntitlements;
- }
-
- @XmlElementWrapper(name = "entitlements")
- @XmlElement(name = "entitlement")
- @JsonProperty("entitlements")
- public List<String> getEntitlements() {
- return entitlements;
- }
-
- public boolean isModRAttrTemplates() {
- return modRAttrTemplates;
- }
-
- public void setModRAttrTemplates(final boolean modRAttrTemplates) {
- this.modRAttrTemplates = modRAttrTemplates;
- }
-
- @XmlElementWrapper(name = "rPlainAttrTemplates")
- @XmlElement(name = "rAttrTemplate")
- @JsonProperty("rPlainAttrTemplates")
- public List<String> getRPlainAttrTemplates() {
- return rPlainAttrTemplates;
- }
-
- 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 = "mPlainAttrTemplates")
- @XmlElement(name = "mAttrTemplate")
- @JsonProperty("mPlainAttrTemplates")
- public List<String> getMPlainAttrTemplates() {
- return mPlainAttrTemplates;
- }
-
- 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;
- }
-
- public void setPasswordPolicy(final ReferenceMod passwordPolicy) {
- this.passwordPolicy = passwordPolicy;
- }
-
- public Boolean getInheritPasswordPolicy() {
- return inheritPasswordPolicy;
- }
-
- public void setInheritPasswordPolicy(final Boolean inheritPasswordPolicy) {
- this.inheritPasswordPolicy = inheritPasswordPolicy;
- }
-
- public ReferenceMod getAccountPolicy() {
- return accountPolicy;
- }
-
- public void setAccountPolicy(final ReferenceMod accountPolicy) {
- this.accountPolicy = accountPolicy;
- }
-
- public Boolean getInheritAccountPolicy() {
- return inheritAccountPolicy;
- }
-
- public void setInheritAccountPolicy(final Boolean inheritAccountPolicy) {
- this.inheritAccountPolicy = inheritAccountPolicy;
- }
-
- @JsonIgnore
- @Override
- public boolean isEmpty() {
- return super.isEmpty() && name == null && userOwner == null && roleOwner == null
- && inheritTemplates == null && inheritOwner == null
- && inheritAccountPolicy == null && inheritPasswordPolicy == null
- && inheritPlainAttrs == null && inheritDerAttrs == null && inheritVirAttrs == null
- && accountPolicy == null && passwordPolicy == null && entitlements.isEmpty()
- && rPlainAttrTemplates.isEmpty() && rDerAttrTemplates.isEmpty() && rVirAttrTemplates.isEmpty()
- && mPlainAttrTemplates.isEmpty() && mDerAttrTemplates.isEmpty() && mVirAttrTemplates.isEmpty();
- }
-}
http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/common/lib/src/main/java/org/apache/syncope/common/lib/mod/StatusMod.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/mod/StatusMod.java b/common/lib/src/main/java/org/apache/syncope/common/lib/mod/StatusMod.java
index 57ea366..082b6f8 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/mod/StatusMod.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/mod/StatusMod.java
@@ -70,7 +70,7 @@ public class StatusMod extends AbstractBaseBean {
return key;
}
- public void setKey(long key) {
+ public void setKey(final long key) {
this.key = key;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/common/lib/src/main/java/org/apache/syncope/common/lib/report/AbstractReportletConf.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/report/AbstractReportletConf.java b/common/lib/src/main/java/org/apache/syncope/common/lib/report/AbstractReportletConf.java
index 0082591..8fe5e24 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/report/AbstractReportletConf.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/report/AbstractReportletConf.java
@@ -24,7 +24,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.lib.AbstractBaseBean;
@XmlType
-@XmlSeeAlso({ StaticReportletConf.class, UserReportletConf.class, RoleReportletConf.class })
+@XmlSeeAlso({ StaticReportletConf.class, UserReportletConf.class, GroupReportletConf.class })
public abstract class AbstractReportletConf extends AbstractBaseBean implements ReportletConf {
private static final long serialVersionUID = -6130008602014516608L;
@@ -37,6 +37,7 @@ public abstract class AbstractReportletConf extends AbstractBaseBean implements
}
public AbstractReportletConf(final String name) {
+ super();
this.name = name;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/common/lib/src/main/java/org/apache/syncope/common/lib/report/AbstractSubjectReportletConf.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/report/AbstractSubjectReportletConf.java b/common/lib/src/main/java/org/apache/syncope/common/lib/report/AbstractSubjectReportletConf.java
new file mode 100644
index 0000000..28b4cba
--- /dev/null
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/report/AbstractSubjectReportletConf.java
@@ -0,0 +1,84 @@
+/*
+ * 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.
+ */
+package org.apache.syncope.common.lib.report;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlType;
+import org.apache.syncope.common.lib.annotation.FormAttributeField;
+import org.apache.syncope.common.lib.types.IntMappingType;
+
+@XmlType
+public abstract class AbstractSubjectReportletConf extends AbstractReportletConf {
+
+ private static final long serialVersionUID = -5388597116592877789L;
+
+ @FormAttributeField(userSearch = true)
+ protected String matchingCond;
+
+ @FormAttributeField(schema = IntMappingType.UserPlainSchema)
+ protected final List<String> plainAttrs = new ArrayList<>();
+
+ @FormAttributeField(schema = IntMappingType.UserDerivedSchema)
+ protected final List<String> derAttrs = new ArrayList<>();
+
+ @FormAttributeField(schema = IntMappingType.UserVirtualSchema)
+ protected final List<String> virAttrs = new ArrayList<>();
+
+ public AbstractSubjectReportletConf() {
+ super();
+ }
+
+ public AbstractSubjectReportletConf(final String name) {
+ super(name);
+ }
+
+ public String getMatchingCond() {
+ return matchingCond;
+ }
+
+ public void setMatchingCond(final String matchingCond) {
+ this.matchingCond = matchingCond;
+ }
+
+ @XmlElementWrapper(name = "plainAttributes")
+ @XmlElement(name = "plainAttribute")
+ @JsonProperty("plainAttributes")
+ public List<String> getPlainAttrs() {
+ return plainAttrs;
+ }
+
+ @XmlElementWrapper(name = "derivedAttributes")
+ @XmlElement(name = "attribute")
+ @JsonProperty("derivedAttributes")
+ public List<String> getDerAttrs() {
+ return derAttrs;
+ }
+
+ @XmlElementWrapper(name = "virtualAttributes")
+ @XmlElement(name = "attribute")
+ @JsonProperty("virtualAttributes")
+ public List<String> getVirAttrs() {
+ return virAttrs;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/syncope/blob/4095f1e8/common/lib/src/main/java/org/apache/syncope/common/lib/report/GroupReportletConf.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/report/GroupReportletConf.java b/common/lib/src/main/java/org/apache/syncope/common/lib/report/GroupReportletConf.java
new file mode 100644
index 0000000..dee3ff4
--- /dev/null
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/report/GroupReportletConf.java
@@ -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.
+ */
+package org.apache.syncope.common.lib.report;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(name = "groupReportletConf")
+@XmlType
+public class GroupReportletConf extends AbstractSubjectReportletConf {
+
+ private static final long serialVersionUID = -8488503068032439699L;
+
+ @XmlEnum
+ @XmlType(name = "groupReportletConfFeature")
+ public enum Feature {
+
+ key,
+ name,
+ groupOwner,
+ userOwner,
+ entitlements,
+ users,
+ resources
+
+ }
+
+ private final List<Feature> features = new ArrayList<>();
+
+ public GroupReportletConf() {
+ super();
+ }
+
+ public GroupReportletConf(final String name) {
+ super(name);
+ }
+
+ @XmlElementWrapper(name = "features")
+ @XmlElement(name = "feature")
+ @JsonProperty("features")
+ public List<Feature> getFeatures() {
+ return features;
+ }
+}