http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupModalPanel.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupModalPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupModalPanel.html deleted file mode 100644 index bbcd878..0000000 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupModalPanel.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"/> <span wicket:id="displayName"/> - </p> - <form wicket:id="groupForm"> - <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="groupPanel"></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/047ac019/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupModalPanel.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupModalPanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupModalPanel.properties deleted file mode 100644 index 4ffa2fb..0000000 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupModalPanel.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=Group -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=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 -templates=Templates http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupModalPanel_it.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupModalPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupModalPanel_it.properties deleted file mode 100644 index 1c6efec..0000000 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupModalPanel_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=Gruppo -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 gruppo -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 gruppo http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupModalPanel_pt_BR.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupModalPanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupModalPanel_pt_BR.properties deleted file mode 100644 index 0649585..0000000 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupModalPanel_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=Grupo -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 grupos -secondResourcesList=Recursos dispon\u00edveis -firstEntitlementsList=Direitos de grupos -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/047ac019/client/console/src/main/resources/org/apache/syncope/client/console/panels/ListViewPanel.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ListViewPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ListViewPanel.html index 8cad9d0..4f24eb4 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ListViewPanel.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ListViewPanel.html @@ -17,16 +17,11 @@ 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="container"> - <wicket:container wicket:id="content" /> - </span> - - <wicket:fragment wicket:id="wizard"> - <span wicket:id="wizard"/> - </wicket:fragment> - - <wicket:fragment wicket:id="table"> + <head> + <title>List view panel</title> + </head> + <body> + <wicket:extend> <div class="col-xs-12"> <div class="box"> <div class="box-header"> @@ -53,9 +48,6 @@ under the License. </div><!-- /.box-body --> </div><!-- /.box --> </div> - <div class="modal-footer" style="text-align: right"> - <input type="submit" class="btn btn-primary" value="Add" wicket:message="value:listview.add" wicket:id="add"/> - </div> - </wicket:fragment> - </wicket:panel> + </wicket:extend> + </body> </html> http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceDetailsPanel.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceDetailsPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceDetailsPanel.html index 67bbd73..19bcd44 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceDetailsPanel.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceDetailsPanel.html @@ -40,10 +40,6 @@ under the License. </div> <div class="form-group"> - <span wicket:id="propagationPrimary">[propagationPrimary]</span> - </div> - - <div class="form-group"> <span wicket:id="propagationPriority">[propagationPriority]</span> </div> http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal.properties index bad0582..351d029 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal.properties @@ -51,7 +51,6 @@ updateTraceLevel=Update trace level deleteTraceLevel=Delete trace level syncTraceLevel=Synchronization trace level propagationPriority=Propagation priority -propagationPrimary=Propagation primary success_connection=Successful connection error_connection=Connection failure http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModalPage.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModalPage.html b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModalPage.html deleted file mode 100644 index 8cb22f0..0000000 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModalPage.html +++ /dev/null @@ -1,56 +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> - <form wicket:id="form"> - <div class="tabbable tabs-left"> - <ul class="nav nav-tabs"> - <li class="active"><a data-toggle="tab" href="#resource"><span><wicket:message key="resource"/></span></a></li> - <li><a data-toggle="tab" href="#umapping"><span><wicket:message key="umapping"/></span></a></li> - <li><a data-toggle="tab" href="#gmapping"><span><wicket:message key="gmapping"/></span></a></li> - <li><a data-toggle="tab" href="#connectorProperties"><span><wicket:message key="connectorProperties"/></span></a></li> - <li><a data-toggle="tab" href="#security"><span><wicket:message key="security"/></span></a></li> - </ul> - <div class="tab-content"> - <div id="resource" class="tab-pane active"> - <span wicket:id="details">[details]</span> - <span wicket:id="systeminformation">[System Information]</span> - </div> - <div id="umapping" class="tab-pane"> - <span wicket:id="umapping">[umapping]</span> - </div> - <div id="gmapping" class="tab-pane"> - <span wicket:id="gmapping">[gmapping]</span> - </div> - <div id="connectorProperties" class="tab-pane"> - <span wicket:id="connconf">[connconf]</span> - </div> - <div id="security" class="tab-pane"> - <span wicket:id="security">[security]</span> - </div> - </div> - </div> - - <div class="modal-footer"> - <input type="submit" class="btn btn-primary" wicket:id="apply"/> - <input type="button" class="btn btn-default" wicket:id="cancel"/> - </div> - </form> - </wicket:extend> -</html> http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModalPage.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModalPage.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModalPage.properties deleted file mode 100644 index 789919b..0000000 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModalPage.properties +++ /dev/null @@ -1,60 +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. -resource=Resource details -umapping=User mapping -connectorProperties=Connector properties -security=Security -required_alert=All form fields are required -connector=Connector -existing_resources=Existing resources -action=Action -edit_attribute=Edit resource -title=Resource -extAttrNames=External attributes -intMappingTypes=Internal mapping types -entity=Entity -groupSchema=Group Schema -connObjectKey=ConnObjectKey -mandatoryCondition=Mandatory -password=Password -purpose=Purpose -mappingUserSchema=Mapping User Schema -mappingGroupSchema=Mapping Group Schema -delete=Delete -intAttrNames=Internal attributes -enforceMandatoryCondition=Enforce mandatory condition -fieldName=Field name - -connObjectKeyValidation=There must be exactly one ConnObjectKey -propagationMode=Propagation mode -connObjectLink=ConnObjectLink -enable=Enable - -createTraceLevel=Create trace level -updateTraceLevel=Update trace level -deleteTraceLevel=Delete trace level -syncTraceLevel=Synchronization trace level -propagationPriority=Propagation priority -propagationPrimary=Propagation primary - -success_connection=Successful connection -error_connection=Connection failure -check=Check connection -actionsClasses=Actions classes -gmapping=Group mapping -new=New resource -randomPwdIfNotProvided=Generate random passwords when missing http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal_it.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal_it.properties index 02c2b81..51cf18e 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal_it.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal_it.properties @@ -50,7 +50,6 @@ updateTraceLevel=Livello di tracciamento degli aggiornamenti deleteTraceLevel=Livello di tracciamento delle cancellazioni syncTraceLevel=Livello di tracciamento delle sincronizzazioni propagationPriority=Priorit\u00e0 in propagazione -propagationPrimary=Primaria in propagazione success_connection=Connessione avvenuta con successo error_connection=Connessione non riuscita http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal_pt_BR.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal_pt_BR.properties index 9d6faa5..07e0f14 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal_pt_BR.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal_pt_BR.properties @@ -50,7 +50,6 @@ updateTraceLevel=Atualizar n\u00edvel de trace deleteTraceLevel=Excluir n\u00edvel de trace syncTraceLevel=N\u00edvel de trace de sincroniza\u00e7\u00e3o propagationPriority=Prioridade de propaga\u00e7\u00e3o -propagationPrimary=Propaga\u00e7\u00e3o prim\u00e1ria success_connection=Conex\u00e3o com sucesso error_connection=Conex\u00e3o sem sucesso http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/client/console/src/main/resources/org/apache/syncope/client/console/wizards/AjaxWizard.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/AjaxWizard.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/AjaxWizard.properties new file mode 100644 index 0000000..c0b84a1 --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/AjaxWizard.properties @@ -0,0 +1,18 @@ +# 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. +wizard.cancel.error = Wizard error on cancel +wizard.apply.error = Wizard error on apply changes http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/client/console/src/main/resources/org/apache/syncope/client/console/wizards/AjaxWizard_it.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/AjaxWizard_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/AjaxWizard_it.properties new file mode 100644 index 0000000..af40f31 --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/AjaxWizard_it.properties @@ -0,0 +1,18 @@ +# 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. +wizard.cancel.error = Errore wizard in annullamento operazione +wizard.apply.error = Errore wizard in fase di commit http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/client/console/src/main/resources/org/apache/syncope/client/console/wizards/AjaxWizard_pt_BR.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/AjaxWizard_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/AjaxWizard_pt_BR.properties new file mode 100644 index 0000000..a73e270 --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/AjaxWizard_pt_BR.properties @@ -0,0 +1,18 @@ +# 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. +wizard.cancel.error = Erro em assistente de cancelar +wizard.apply.error = Assistente de erro em aplicar as altera\u00e7\u00f5es http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/client/console/src/main/resources/org/apache/syncope/client/console/wizards/WizardMgtPanel.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/WizardMgtPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/WizardMgtPanel.html new file mode 100644 index 0000000..e849f37 --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/WizardMgtPanel.html @@ -0,0 +1,45 @@ +<!-- +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";> + <head> + <title></title> + </head> + <body> + <wicket:panel> + <span wicket:id="container"> + <wicket:container wicket:id="content" /> + </span> + + <wicket:fragment wicket:id="wizard"> + <span wicket:id="wizard"/> + </wicket:fragment> + + <wicket:fragment wicket:id="default"> + + <wicket:child /> + + <div class="modal-footer" style="text-align: right"> + <a haref="#" class="btn btn-primary" wicket:id="add">Add</a> + </div> + </wicket:fragment> + + <div wicket:id="modal" /> + </wicket:panel> + </body> +</html> http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/DerAttrs.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/DerAttrs.html b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/DerAttrs.html new file mode 100644 index 0000000..6b17a06 --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/DerAttrs.html @@ -0,0 +1,42 @@ +<!-- +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"; xmlns:message="http://xmlns.jcp.org/jsf/composite";> + <head><title></title></head> + <body> + <wicket:panel> + <span wicket:id="content">[CONTENT]</span> + + <wicket:fragment wicket:id="empty"> + <div class="attribute.empty.list"> + <wicket:message key="attribute.empty.list"/> + </div> + </wicket:fragment> + + <wicket:fragment wicket:id="attributes"> + <div wicket:id="derAttrContainer"> + <div class="form-group" wicket:id="attrs"> + <span wicket:id="panel"> + [panel for dynamic input type markup] + </span> + </div> + </div> + </wicket:fragment> + </wicket:panel> + </body> +</html> http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/DerAttrs.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/DerAttrs.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/DerAttrs.properties new file mode 100644 index 0000000..72b580f --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/DerAttrs.properties @@ -0,0 +1,18 @@ +# 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. +derived.emptyvalue.message=Value to be derived ... +attribute.empty.list=No derived attributes available http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/DerAttrs_it.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/DerAttrs_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/DerAttrs_it.properties new file mode 100644 index 0000000..d275c71 --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/DerAttrs_it.properties @@ -0,0 +1,18 @@ +# 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. +derived.emptyvalue.message=Valore da derivare ... +attribute.empty.list=Non ci sono attributi derivati disponibili http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/DerAttrs_pt_BR.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/DerAttrs_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/DerAttrs_pt_BR.properties new file mode 100644 index 0000000..b659c46 --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/DerAttrs_pt_BR.properties @@ -0,0 +1,18 @@ +# 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. +derived.emptyvalue.message=Valor a ser derivada ... +attribute.empty.list=Sem atributos derivados dispon\u00edveis http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/GroupDetails.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/GroupDetails.html b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/GroupDetails.html new file mode 100644 index 0000000..c813528 --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/GroupDetails.html @@ -0,0 +1,56 @@ +<!-- +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";> + <head><title></title></head> + <body> + <wicket:panel> + <div class="form-group"> + <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 wicket:id="ownerContainer"> + <div class="form-group"> + <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 class="form-group"> + <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> + + <span wicket:id="userOwnerSelectWin"/> + <span wicket:id="groupOwnerSelectWin"/> + </wicket:panel> + </body> +</html> http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/GroupDetails.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/GroupDetails.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/GroupDetails.properties new file mode 100644 index 0000000..13a8339 --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/GroupDetails.properties @@ -0,0 +1,16 @@ +# 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. http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/GroupDetails_it.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/GroupDetails_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/GroupDetails_it.properties new file mode 100644 index 0000000..13a8339 --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/GroupDetails_it.properties @@ -0,0 +1,16 @@ +# 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. http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/GroupDetails_pt_BR.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/GroupDetails_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/GroupDetails_pt_BR.properties new file mode 100644 index 0000000..13a8339 --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/GroupDetails_pt_BR.properties @@ -0,0 +1,16 @@ +# 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. http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/PlainAttrs.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/PlainAttrs.html b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/PlainAttrs.html new file mode 100644 index 0000000..52f6321 --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/PlainAttrs.html @@ -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. +--> +<html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> + <wicket:panel> + <div wicket:id="schemas"> + <div class="form-group"> + <span wicket:id="panel"> + [panel for dynamic input type markup] + </span> + <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> + </wicket:panel> +</html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/UserDetails.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/UserDetails.html b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/UserDetails.html new file mode 100644 index 0000000..45e550c --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/UserDetails.html @@ -0,0 +1,59 @@ +<!-- +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";> + <head><title></title></head> + <body> + <wicket:panel> + <div class="form-group"> + <span wicket:id="username"/> + <a class="tooltips" wicket:id="usernameQuestionMarkJexlHelp" href="#" alt="Click to help" title="Click to help"> + <img src="img/help.png"/> + <span wicket:id="usernameJexlHelp" 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> + + <form wicket:id="passwordInnerForm"> + <div class="form-group"> + <span wicket:id="password"/> + <a class="tooltips" wicket:id="pwdQuestionMarkJexlHelp" href="#" alt="Click to help" title="Click to help"> + <img src="img/help.png"/> + <span wicket:id="pwdJexlHelp" 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 class="form-group"> + <span wicket:id="confirmPassword"/> + </div> + </form> + </wicket:panel> + </body> +</html> http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/UserDetails.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/UserDetails.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/UserDetails.properties new file mode 100644 index 0000000..f07fe03 --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/UserDetails.properties @@ -0,0 +1,19 @@ +# 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. +username=Username +password=Password +confirmPassword=Password (confirm) http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/UserDetails_it.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/UserDetails_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/UserDetails_it.properties new file mode 100644 index 0000000..741d7dd --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/UserDetails_it.properties @@ -0,0 +1,19 @@ +# 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. +username=Username +password=Password +confirmPassword=Password (conferma) http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/UserDetails_pt_BR.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/UserDetails_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/UserDetails_pt_BR.properties new file mode 100644 index 0000000..9debd26 --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/UserDetails_pt_BR.properties @@ -0,0 +1,19 @@ +# 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. +username=Nome do Usu\u00E1rio +password=Senha +confirmPassword=Senha (confirmar) http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/VirAttrs.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/VirAttrs.html b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/VirAttrs.html new file mode 100644 index 0000000..c73710d --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/VirAttrs.html @@ -0,0 +1,42 @@ +<!-- +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"; xmlns:message="http://xmlns.jcp.org/jsf/composite";> + <head><title></title></head> + <body> + <wicket:panel> + <span wicket:id="content">[CONTENT]</span> + + <wicket:fragment wicket:id="empty"> + <div class="attribute.empty.list"> + <wicket:message key="attribute.empty.list"/> + </div> + </wicket:fragment> + + <wicket:fragment wicket:id="attributes"> + <div wicket:id="virAttrContainer"> + <div class="form-group" wicket:id="attrs"> + <span wicket:id="panel"> + [panel for dynamic input type markup] + </span> + </div> + </div> + </wicket:fragment> + </wicket:panel> + </body> +</html> http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/VirAttrs.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/VirAttrs.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/VirAttrs.properties new file mode 100644 index 0000000..0750893 --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/VirAttrs.properties @@ -0,0 +1,17 @@ +# 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. +attribute.empty.list=No virtual attributes available http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/VirAttrs_it.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/VirAttrs_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/VirAttrs_it.properties new file mode 100644 index 0000000..8c52b7b --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/VirAttrs_it.properties @@ -0,0 +1,17 @@ +# 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. +attribute.empty.list=Non ci sono attributi virtuali disponibili http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/VirAttrs_pt_BR.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/VirAttrs_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/VirAttrs_pt_BR.properties new file mode 100644 index 0000000..5ee69a0 --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/VirAttrs_pt_BR.properties @@ -0,0 +1,17 @@ +# 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. +attribute.empty.list=Sem atributos virtuais dispon\u00edveis http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/client/console/src/main/resources/org/apache/syncope/client/console/wizards/provision/ProvisionWizardBuilder$ConnObjectLink.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/provision/ProvisionWizardBuilder$ConnObjectLink.html b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/provision/ProvisionWizardBuilder$ConnObjectLink.html index cb4d27f..2f889e6 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/provision/ProvisionWizardBuilder$ConnObjectLink.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/provision/ProvisionWizardBuilder$ConnObjectLink.html @@ -16,16 +16,18 @@ 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://xmlns.jcp.org/jsf/composite";> - <wicket:panel> - <span wicket:id="connObjectLinkContainer"> - <div class="form-group"> - <span wicket:id="connObjectLinkCheckbox">[connObjectLinkCheckbox]</span> - </div> - <div class="form-group"> - <span wicket:id="connObjectLink">[connObjectLink]</span> - </div> - </span> - </wicket:panel> +<html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://xmlns.jcp.org/jsf/composite";> + <head><title></title></head> + <body> + <wicket:panel> + <span wicket:id="connObjectLinkContainer"> + <div class="form-group"> + <span wicket:id="connObjectLinkCheckbox">[connObjectLinkCheckbox]</span> + </div> + <div class="form-group"> + <span wicket:id="connObjectLink">[connObjectLink]</span> + </div> + </span> + </wicket:panel> + </body> </html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/client/console/src/main/resources/org/apache/syncope/client/console/wizards/provision/ProvisionWizardBuilder$Mapping.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/provision/ProvisionWizardBuilder$Mapping.html b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/provision/ProvisionWizardBuilder$Mapping.html index 2147713..f5eaaeb 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/provision/ProvisionWizardBuilder$Mapping.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/provision/ProvisionWizardBuilder$Mapping.html @@ -16,8 +16,11 @@ 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";> - <wicket:panel> - <span wicket:id="mapping" /> - </wicket:panel> +<html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://xmlns.jcp.org/jsf/composite";> + <head><title></title></head> + <body> + <wicket:panel> + <span wicket:id="mapping" /> + </wicket:panel> + </body> </html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/client/console/src/main/resources/org/apache/syncope/client/console/wizards/provision/ProvisionWizardBuilder$ObjectType.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/provision/ProvisionWizardBuilder$ObjectType.html b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/provision/ProvisionWizardBuilder$ObjectType.html index 8d998de..95b13a9 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/provision/ProvisionWizardBuilder$ObjectType.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/provision/ProvisionWizardBuilder$ObjectType.html @@ -16,16 +16,18 @@ 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://xmlns.jcp.org/jsf/composite";> - <wicket:panel > - <div class="form-group"> - <label>Object Type</label> - <span wicket:id="type"/> - </div> - <div class="form-group"> - <label>Object Class</label> - <input type="text" placeholder="Object Class ..." class="form-control" wicket:id="class"> - </div> - </wicket:panel> +<html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://xmlns.jcp.org/jsf/composite";> + <head><title></title></head> + <body> + <wicket:panel > + <div class="form-group"> + <label>Object Type</label> + <span wicket:id="type"/> + </div> + <div class="form-group"> + <label>Object Class</label> + <input type="text" placeholder="Object Class ..." class="form-control" wicket:id="class"> + </div> + </wicket:panel> + </body> </html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/client/enduser/pom.xml ---------------------------------------------------------------------- diff --git a/client/enduser/pom.xml b/client/enduser/pom.xml index a9dc260..372ac7a 100644 --- a/client/enduser/pom.xml +++ b/client/enduser/pom.xml @@ -66,10 +66,6 @@ under the License. </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-spring</artifactId> - </dependency> - <dependency> - <groupId>org.apache.wicket</groupId> <artifactId>wicket-auth-roles</artifactId> </dependency> @@ -191,4 +187,4 @@ under the License. </build> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SchemaService.java ---------------------------------------------------------------------- diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SchemaService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SchemaService.java index 7c1a43a..e6ec502 100644 --- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SchemaService.java +++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SchemaService.java @@ -28,6 +28,7 @@ import javax.ws.rs.PUT; import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import org.apache.syncope.common.lib.to.AbstractSchemaTO; @@ -54,15 +55,17 @@ public interface SchemaService extends JAXRSService { @NotNull @PathParam("type") SchemaType type, @NotNull @PathParam("key") String key); /** - * Returns a list of schemas with matching type. + * Returns a list of schemas with matching type, for the given anyTypeClass if provided. * * @param <T> actual SchemaTO * @param type type for schemas to be listed - * @return list of schemas with matching type + * @param anyTypeClass any type class name + * @return list of schemas with matching type, for the given anyTypeClass if provided */ @GET @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) - <T extends AbstractSchemaTO> List<T> list(@NotNull @PathParam("type") SchemaType type); + <T extends AbstractSchemaTO> List<T> list(@NotNull @PathParam("type") SchemaType type, + @QueryParam("anyType") String anyTypeClass); /** * Creates a new schema. http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/core/logic/src/main/java/org/apache/syncope/core/logic/SchemaLogic.java ---------------------------------------------------------------------- diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/SchemaLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/SchemaLogic.java index cbd5f64..f3b1b09 100644 --- a/core/logic/src/main/java/org/apache/syncope/core/logic/SchemaLogic.java +++ b/core/logic/src/main/java/org/apache/syncope/core/logic/SchemaLogic.java @@ -33,11 +33,13 @@ import org.apache.syncope.common.lib.to.VirSchemaTO; import org.apache.syncope.common.lib.types.ClientExceptionType; import org.apache.syncope.common.lib.types.Entitlement; import org.apache.syncope.common.lib.types.SchemaType; +import org.apache.syncope.core.persistence.api.dao.AnyTypeClassDAO; import org.apache.syncope.core.persistence.api.dao.DerSchemaDAO; import org.apache.syncope.core.persistence.api.dao.DuplicateException; import org.apache.syncope.core.persistence.api.dao.NotFoundException; import org.apache.syncope.core.persistence.api.dao.PlainSchemaDAO; import org.apache.syncope.core.persistence.api.dao.VirSchemaDAO; +import org.apache.syncope.core.persistence.api.entity.AnyTypeClass; import org.apache.syncope.core.persistence.api.entity.DerSchema; import org.apache.syncope.core.persistence.api.entity.PlainSchema; import org.apache.syncope.core.persistence.api.entity.VirSchema; @@ -59,6 +61,9 @@ public class SchemaLogic extends AbstractTransactionalLogic<AbstractSchemaTO> { private VirSchemaDAO virSchemaDAO; @Autowired + private AnyTypeClassDAO anyTypeClassDAO; + + @Autowired private SchemaDataBinder binder; private boolean doesSchemaExist(final SchemaType schemaType, final String name) { @@ -140,11 +145,13 @@ public class SchemaLogic extends AbstractTransactionalLogic<AbstractSchemaTO> { @PreAuthorize("isAuthenticated()") @SuppressWarnings("unchecked") - public <T extends AbstractSchemaTO> List<T> list(final SchemaType schemaType) { + public <T extends AbstractSchemaTO> List<T> list(final SchemaType schemaType, final String anyTypeClass) { + AnyTypeClass clazz = anyTypeClass == null ? null : anyTypeClassDAO.find(anyTypeClass); List<T> result; switch (schemaType) { case VIRTUAL: - result = CollectionUtils.collect(virSchemaDAO.findAll(), + result = CollectionUtils.collect( + clazz == null ? virSchemaDAO.findAll() : virSchemaDAO.findByAnyTypeClass(clazz), new Transformer<VirSchema, T>() { @Override @@ -155,7 +162,8 @@ public class SchemaLogic extends AbstractTransactionalLogic<AbstractSchemaTO> { break; case DERIVED: - result = CollectionUtils.collect(derSchemaDAO.findAll(), + result = CollectionUtils.collect( + clazz == null ? derSchemaDAO.findAll() : derSchemaDAO.findByAnyTypeClass(clazz), new Transformer<DerSchema, T>() { @Override @@ -167,7 +175,8 @@ public class SchemaLogic extends AbstractTransactionalLogic<AbstractSchemaTO> { case PLAIN: default: - result = CollectionUtils.collect(plainSchemaDAO.findAll(), + result = CollectionUtils.collect( + clazz == null ? plainSchemaDAO.findAll() : plainSchemaDAO.findByAnyTypeClass(clazz), new Transformer<PlainSchema, T>() { @Override http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/ConnectorFacadeProxy.java ---------------------------------------------------------------------- diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/ConnectorFacadeProxy.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/ConnectorFacadeProxy.java index 126c1e1..d39c9e9 100644 --- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/ConnectorFacadeProxy.java +++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/ConnectorFacadeProxy.java @@ -99,8 +99,8 @@ public class ConnectorFacadeProxy implements Connector { public ConnectorFacadeProxy(final ConnInstance connInstance) { this.connInstance = connInstance; - ConnIdBundleManager connIdBundleManager = - ApplicationContextProvider.getBeanFactory().getBean(ConnIdBundleManager.class); + ConnIdBundleManager connIdBundleManager = ApplicationContextProvider.getBeanFactory().getBean( + ConnIdBundleManager.class); ConnectorInfo info = connIdBundleManager.getConnectorInfo(connInstance); // create default configuration http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/SyncJobDelegate.java ---------------------------------------------------------------------- diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/SyncJobDelegate.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/SyncJobDelegate.java index b8e1522..c5fad73 100644 --- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/SyncJobDelegate.java +++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/SyncJobDelegate.java @@ -128,20 +128,17 @@ public class SyncJobDelegate extends AbstractProvisioningJobDelegate<SyncTask> { profile.setResAct(getSyncPolicySpec(syncTask).getConflictResolutionAction()); // Prepare handler for SyncDelta objects (any objects) - AnyObjectSyncResultHandler ahandler = - (AnyObjectSyncResultHandler) ApplicationContextProvider.getBeanFactory(). + AnyObjectSyncResultHandler ahandler = (AnyObjectSyncResultHandler) ApplicationContextProvider.getBeanFactory(). createBean(AnyObjectSyncResultHandlerImpl.class, AbstractBeanDefinition.AUTOWIRE_BY_NAME, false); ahandler.setProfile(profile); // Prepare handler for SyncDelta objects (users) - UserSyncResultHandler uhandler = - (UserSyncResultHandler) ApplicationContextProvider.getBeanFactory(). + UserSyncResultHandler uhandler = (UserSyncResultHandler) ApplicationContextProvider.getBeanFactory(). createBean(UserSyncResultHandlerImpl.class, AbstractBeanDefinition.AUTOWIRE_BY_NAME, false); uhandler.setProfile(profile); // Prepare handler for SyncDelta objects (groups) - GroupSyncResultHandler ghandler = - (GroupSyncResultHandler) ApplicationContextProvider.getBeanFactory(). + GroupSyncResultHandler ghandler = (GroupSyncResultHandler) ApplicationContextProvider.getBeanFactory(). createBean(GroupSyncResultHandlerImpl.class, AbstractBeanDefinition.AUTOWIRE_BY_NAME, false); ghandler.setProfile(profile); http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/SchemaServiceImpl.java ---------------------------------------------------------------------- diff --git a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/SchemaServiceImpl.java b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/SchemaServiceImpl.java index d5380ab..07d84fb 100644 --- a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/SchemaServiceImpl.java +++ b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/SchemaServiceImpl.java @@ -51,8 +51,8 @@ public class SchemaServiceImpl extends AbstractServiceImpl implements SchemaServ } @Override - public <T extends AbstractSchemaTO> List<T> list(final SchemaType schemaType) { - return logic.list(schemaType); + public <T extends AbstractSchemaTO> List<T> list(final SchemaType schemaType, final String anyTypeClass) { + return logic.list(schemaType, anyTypeClass); } @Override http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/DerSchemaITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/DerSchemaITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/DerSchemaITCase.java index 210b515..ac941b7 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/DerSchemaITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/DerSchemaITCase.java @@ -40,7 +40,7 @@ public class DerSchemaITCase extends AbstractITCase { @Test public void list() { - List<DerSchemaTO> derivedSchemas = schemaService.list(SchemaType.DERIVED); + List<DerSchemaTO> derivedSchemas = schemaService.list(SchemaType.DERIVED, null); assertFalse(derivedSchemas.isEmpty()); for (DerSchemaTO derivedSchemaTO : derivedSchemas) { assertNotNull(derivedSchemaTO); http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/GroupITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/GroupITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/GroupITCase.java index 3ddb2c8..d247aac 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/GroupITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/GroupITCase.java @@ -674,7 +674,7 @@ public class GroupITCase extends AbstractITCase { assertEquals(RESOURCE_NAME_LDAP, result.getPropagationStatuses().get(0).getResource()); assertEquals(PropagationTaskExecStatus.SUCCESS, result.getPropagationStatuses().get(0).getStatus()); group = result.getAny(); - + // 3. set capability override with only search allowed, but not enable ldap.getCapabilitiesOverride().add(ConnectorCapability.SEARCH); resourceService.update(ldap); @@ -867,5 +867,5 @@ public class GroupITCase extends AbstractITCase { assertNotNull(groupTO); assertEquals("11.23", groupTO.getPlainAttrMap().get(doubleSchemaName).getValues().get(0)); } - + } http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/MultitenancyITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/MultitenancyITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/MultitenancyITCase.java index 64f0008..2a9dffe 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/MultitenancyITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/MultitenancyITCase.java @@ -100,7 +100,7 @@ public class MultitenancyITCase extends AbstractITCase { @Test public void readPlainSchemas() { - assertEquals(17, adminClient.getService(SchemaService.class).list(SchemaType.PLAIN).size()); + assertEquals(17, adminClient.getService(SchemaService.class).list(SchemaType.PLAIN, null).size()); } @Test http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PlainSchemaITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PlainSchemaITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PlainSchemaITCase.java index d275712..2a75805 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PlainSchemaITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PlainSchemaITCase.java @@ -29,6 +29,8 @@ import java.security.AccessControlException; import java.util.List; import javax.ws.rs.core.GenericType; import javax.ws.rs.core.Response; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.Predicate; import org.apache.commons.lang3.SerializationUtils; import org.apache.syncope.common.lib.SyncopeClientException; import org.apache.syncope.common.lib.to.AnyTypeClassTO; @@ -36,6 +38,7 @@ import org.apache.syncope.common.lib.to.MembershipTO; import org.apache.syncope.common.lib.to.PlainSchemaTO; import org.apache.syncope.common.lib.to.ProvisioningResult; import org.apache.syncope.common.lib.to.UserTO; +import org.apache.syncope.common.lib.types.AnyTypeKind; import org.apache.syncope.common.lib.types.AttrSchemaType; import org.apache.syncope.common.lib.types.CipherAlgorithm; import org.apache.syncope.common.lib.types.ClientExceptionType; @@ -83,7 +86,6 @@ public class PlainSchemaITCase extends AbstractITCase { fail("This should not be reacheable"); } catch (SyncopeClientException e) { assertEquals(ClientExceptionType.InvalidPlainSchema, e.getType()); - assertTrue(e.getElements().iterator().next().contains(EntityViolationType.InvalidName.name())); } } @@ -99,9 +101,7 @@ public class PlainSchemaITCase extends AbstractITCase { fail("This should not be reacheable"); } catch (SyncopeClientException e) { assertEquals(ClientExceptionType.InvalidPlainSchema, e.getType()); - - assertTrue(e.getElements().iterator().next().toString(). - contains(EntityViolationType.InvalidSchemaEnum.name())); + assertTrue(e.getElements().iterator().next().contains(EntityViolationType.InvalidSchemaEnum.name())); } } @@ -116,7 +116,6 @@ public class PlainSchemaITCase extends AbstractITCase { fail("This should not be reacheable"); } catch (SyncopeClientException e) { assertEquals(ClientExceptionType.InvalidPlainSchema, e.getType()); - assertTrue(e.getElements().iterator().next().contains(EntityViolationType.InvalidSchemaEnum.name())); } } @@ -160,23 +159,38 @@ public class PlainSchemaITCase extends AbstractITCase { @Test public void list() { - List<PlainSchemaTO> userSchemas = schemaService.list(SchemaType.PLAIN); - assertFalse(userSchemas.isEmpty()); - for (PlainSchemaTO schemaTO : userSchemas) { - assertNotNull(schemaTO); - } - - List<PlainSchemaTO> groupSchemas = schemaService.list(SchemaType.PLAIN); - assertFalse(groupSchemas.isEmpty()); - for (PlainSchemaTO schemaTO : groupSchemas) { + List<PlainSchemaTO> schemas = schemaService.list(SchemaType.PLAIN, null); + assertFalse(schemas.isEmpty()); + for (PlainSchemaTO schemaTO : schemas) { assertNotNull(schemaTO); } + } - List<PlainSchemaTO> membershipSchemas = schemaService.list(SchemaType.PLAIN); - assertFalse(membershipSchemas.isEmpty()); - for (PlainSchemaTO schemaTO : membershipSchemas) { - assertNotNull(schemaTO); - } + @Test + public void listByAnyTypeClass() { + final String clazz = anyTypeService.read(AnyTypeKind.USER.name()).getClasses().get(0); + + List<PlainSchemaTO> userSchemas = schemaService.list(SchemaType.PLAIN, clazz); + + assertTrue(CollectionUtils.exists(userSchemas, new Predicate<PlainSchemaTO>() { + + @Override + public boolean evaluate(final PlainSchemaTO object) { + return "fullname".equals(object.getKey()); + } + })); + + assertFalse(CollectionUtils.exists(userSchemas, new Predicate<PlainSchemaTO>() { + + @Override + public boolean evaluate(final PlainSchemaTO object) { + return "password.cipher.algorithm".equals(object.getKey()) + || "rderived_dx".equals(object.getKey()) + || "icon".equals(object.getKey()) + || "mderived_sx".equals(object.getKey()) + || "self.membership.layout".equals(object.getKey()); + } + })); } @Test @@ -323,13 +337,13 @@ public class PlainSchemaITCase extends AbstractITCase { public void anonymous() { SchemaService unauthenticated = clientFactory.create().getService(SchemaService.class); try { - unauthenticated.list(SchemaType.VIRTUAL); + unauthenticated.list(SchemaType.VIRTUAL, null); fail(); } catch (AccessControlException e) { assertNotNull(e); } SchemaService anonymous = clientFactory.create(ANONYMOUS_UNAME, ANONYMOUS_KEY).getService(SchemaService.class); - assertFalse(anonymous.list(SchemaType.VIRTUAL).isEmpty()); + assertFalse(anonymous.list(SchemaType.VIRTUAL, null).isEmpty()); } } http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/VirSchemaITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/VirSchemaITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/VirSchemaITCase.java index c4e4ea0..45b4762 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/VirSchemaITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/VirSchemaITCase.java @@ -41,7 +41,7 @@ public class VirSchemaITCase extends AbstractITCase { @Test public void list() { - List<VirSchemaTO> vSchemas = schemaService.list(SchemaType.VIRTUAL); + List<VirSchemaTO> vSchemas = schemaService.list(SchemaType.VIRTUAL, null); assertFalse(vSchemas.isEmpty()); for (VirSchemaTO vSchemaTO : vSchemas) { assertNotNull(vSchemaTO); http://git-wip-us.apache.org/repos/asf/syncope/blob/047ac019/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 893ada1..effa158 100644 --- a/pom.xml +++ b/pom.xml @@ -376,6 +376,7 @@ under the License. <jquery-ui.version>1.11.4</jquery-ui.version> <jquery-cookie.version>1.4.1-1</jquery-cookie.version> <bootstrap.version>3.3.5</bootstrap.version> + <bootstrap-select.version>1.7.3</bootstrap-select.version> <wicket-bootstrap.version>0.10.4-SNAPSHOT</wicket-bootstrap.version> <bootbox.version>4.4.0</bootbox.version> @@ -968,6 +969,11 @@ under the License. </dependency> <dependency> <groupId>org.webjars</groupId> + <artifactId>bootstrap-select</artifactId> + <version>${bootstrap-select.version}</version> + </dependency> + <dependency> + <groupId>org.webjars</groupId> <artifactId>font-awesome</artifactId> <version>${font-awesome.version}</version> </dependency>
