http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/SyncopeConsoleApplication_ru.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/SyncopeConsoleApplication_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/SyncopeConsoleApplication_ru.properties index e77a0d4..0e0ecbf 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/SyncopeConsoleApplication_ru.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/SyncopeConsoleApplication_ru.properties @@ -52,7 +52,6 @@ realms=\u041e\u0431\u043b\u0430\u0441\u0442\u0438 topology=\u0422\u043e\u043f\u043e\u043b\u043e\u0433\u0438\u044f roles=\u0420\u043e\u043b\u0438 policies=\u041f\u043e\u043b\u0438\u0442\u0438\u043a\u0438 -securityQuestions=\u041a\u043e\u043d\u0442\u0440\u043e\u043b\u044c\u043d\u044b\u0435 \u0432\u043e\u043f\u0440\u043e\u0441\u044b workflow=\u041f\u0440\u043e\u0446\u0435\u0441\u0441 \u0441\u043e\u0433\u043b\u0430\u0441\u043e\u0432\u0430\u043d\u0438\u044f logs=\u041b\u043e\u0433\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 layouts=\u0420\u0430\u0437\u043c\u0435\u0442\u043a\u0430 @@ -69,7 +68,7 @@ audit=\u0410\u0443\u0434\u0438\u0442 connectors.confirm.reload=\u0412\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u0435 \u044d\u0442\u043e\u0433\u043e \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u044f \u043f\u043e\u0442\u0435\u043d\u0446\u0438\u0430\u043b\u044c\u043d\u043e \u043e\u043f\u0430\u0441\u043d\u043e \u0434\u043b\u044f \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u043c\u044b\u0445 \u043e\u043f\u0435\u0440\u0430\u0446\u0438\u0439. \u041f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u044c? intAttrNameInfo.help=\u041f\u043e\u043c\u0438\u043c\u043e \u0430\u0432\u0442\u043e\u0437\u0430\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f \u0430\u0442\u0440\u0438\u0431\u0443\u0442\u043e\u0432, \u0432\u044b \u0442\u0430\u043a\u0436\u0435 \u043c\u043e\u0436\u0435\u0442\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u0433\u0440\u0443\u043f\u043f\u044b, \u0440\u0430\u0437\u043b\u0438\u0447\u043d\u044b\u0435 \u043e\u0431\u044a\u0435\u043a\u0442\u044b \u0438 \u0447\u043b\u0435\u043d\u0441\u0442\u0432\u043e (\u043f\u0440\u0438 \u043d\u0430\u043b\u0438\u0447\u0438\u0438), \u043d\u0430\u043f\u0440\u0438\u043c\u0435\u0440: confirmGlobalLogout=Do you really want to perform global logout? -administration=Administration implementations=\u0420\u0435\u0430\u043b\u0438\u0437\u0430\u0446\u0438\u0438 timeout=Operation is taking to long: it will be executed in background. Please check later for the result (errors won't be triggered). +security=Security
http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/pages/Administration.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Administration.html b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Administration.html deleted file mode 100644 index 0c79945..0000000 --- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Administration.html +++ /dev/null @@ -1,36 +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> - <section class="content-header"> - <h1> </h1> - <ol class="breadcrumb"> - <li><a wicket:id="dashboardBr"><i class="fa fa-dashboard"></i> <wicket:message key="dashboard"/></a></li> - <li class="active"><wicket:message key="configuration"/></li> - <li class="active"><wicket:message key="administration"/></li> - </ol> - </section> - - <section class="content" wicket:id="content"> - <div class="box"> - <div class="box-body" wicket:id="tabbedPanel"/> - </div> - </section> - </wicket:extend> -</html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/pages/Administration.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Administration.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Administration.properties deleted file mode 100644 index 8788d48..0000000 --- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Administration.properties +++ /dev/null @@ -1,18 +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. -add=Create new Role -dynRealms=Dynamic Realms http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/pages/Administration_it.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Administration_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Administration_it.properties deleted file mode 100644 index becfb71..0000000 --- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Administration_it.properties +++ /dev/null @@ -1,18 +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. -add=Crea un nuovo Ruolo -dynRealms=Realm dinamici http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/pages/Administration_ja.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Administration_ja.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Administration_ja.properties deleted file mode 100644 index f9ee467..0000000 --- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Administration_ja.properties +++ /dev/null @@ -1,18 +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. -add=\u65b0\u3057\u3044\u30ed\u30fc\u30eb\u3092\u8ffd\u52a0 -dynRealms=\u52d5\u7684\u30ec\u30eb\u30e0 http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/pages/Administration_pt_BR.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Administration_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Administration_pt_BR.properties deleted file mode 100644 index e6d08f9..0000000 --- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Administration_pt_BR.properties +++ /dev/null @@ -1,18 +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. -add=Cria um novo fun\u00e7\u00e3o -dynRealms=Realm din\u00e2micos http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/pages/Administration_ru.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Administration_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Administration_ru.properties deleted file mode 100644 index e933b31..0000000 --- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Administration_ru.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. -# -# add=\u00d0\u00a1\u00d0\u00be\u00d0\u00b7\u00d0\u00b4\u00d0\u00b0\u00d1\u0082\u00d1\u008c \u00d1\u0080\u00d0\u00be\u00d0\u00bb\u00d1\u008c -add=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u0440\u043e\u043b\u044c -dynRealms=Dynamic Realms http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html b/client/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html index 76e4c43..c23ace8 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html @@ -108,14 +108,13 @@ under the License. <li wicket:id="configurationLI" class="treeview"> <a href="#"><i class="fa fa-edit"></i><span><wicket:message key="configuration"/></span> <span class="pull-right-container"><i class="fa fa-angle-left pull-right"></i></span></a> <ul wicket:id="configurationUL" class="treeview-menu"> - <li wicket:id="administrationLI"><a href="#" wicket:id="administration"><i class="fa fa-lock"></i><wicket:message key="administration"/></a></li> <li wicket:id="auditLI"><a href="#" wicket:id="audit"><i class="fa fa-check-square-o"></i><wicket:message key="audit"/></a></li> <li wicket:id="implementationsLI"><a href="#" wicket:id="implementations"><i class="fa fa-file-code-o"></i><wicket:message key="implementations"/></a></li> <li wicket:id="logsLI"><a href="#" wicket:id="logs"><i class="fa fa-file-text-o"></i><wicket:message key="logs"/></a></li> <li wicket:id="notificationsLI"><a href="#" wicket:id="notifications"><i class="fa fa-envelope-o"></i><wicket:message key="notifications"/></a></li> <li wicket:id="parametersLI"><a href="#" wicket:id="parameters"><i class="fa fa-cog"></i><wicket:message key="parameters"/></a></li> <li wicket:id="policiesLI"><a href="#" wicket:id="policies"><i class="fa fa-list"></i><wicket:message key="policies"/></a></li> - <li wicket:id="securityquestionsLI"><a href="#" wicket:id="securityquestions"><i class="fa fa-question"></i><wicket:message key="securityQuestions"/></a></li> + <li wicket:id="securityLI"><a href="#" wicket:id="security"><i class="fa fa-lock"></i><wicket:message key="security"/></a></li> <li wicket:id="typesLI"><a href="#" wicket:id="types"><i class="fa fa-wrench"></i><wicket:message key="types"/></a></li> <li wicket:id="workflowLI"><a href="#" wicket:id="workflow"><i class="fa fa-briefcase"></i><wicket:message key="workflow"/></a></li> </ul> http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/pages/Security.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Security.html b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Security.html new file mode 100644 index 0000000..3ca4002 --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Security.html @@ -0,0 +1,36 @@ +<!-- +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> + <section class="content-header"> + <h1> </h1> + <ol class="breadcrumb"> + <li><a wicket:id="dashboardBr"><i class="fa fa-dashboard"></i> <wicket:message key="dashboard"/></a></li> + <li class="active"><wicket:message key="configuration"/></li> + <li class="active"><wicket:message key="security"/></li> + </ol> + </section> + + <section class="content" wicket:id="content"> + <div class="box"> + <div class="box-body" wicket:id="tabbedPanel"/> + </div> + </section> + </wicket:extend> +</html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/pages/Security.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Security.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Security.properties new file mode 100644 index 0000000..3bba56c --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Security.properties @@ -0,0 +1,21 @@ +# 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. +add=Create new Role +dynRealms=Dynamic Realms +privileges=Privileges +applications=Applications +securityQuestions=Security Questions http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions.html b/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions.html deleted file mode 100644 index 14e360d..0000000 --- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions.html +++ /dev/null @@ -1,36 +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> - <section class="content-header"> - <h1> </h1> - <ol class="breadcrumb"> - <li><a wicket:id="dashboardBr"><i class="fa fa-dashboard"></i> <wicket:message key="dashboard"/></a></li> - <li class="active"><wicket:message key="configuration"/></li> - <li class="active"><wicket:message key="securityQuestions"/></li> - </ol> - </section> - - <section class="content" wicket:id="content"> - <div class="box"> - <div class="box-body" wicket:id="securityQuestionPanel"/> - </div> - </section> - </wicket:extend> -</html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions.properties deleted file mode 100644 index 8e55776..0000000 --- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions.properties +++ /dev/null @@ -1,18 +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. -createSecurityQuestion=Create new Secutiry Questions -content=Content http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions_it.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions_it.properties deleted file mode 100644 index 57f0f99..0000000 --- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions_it.properties +++ /dev/null @@ -1,18 +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. -createSecurityQuestion=Crea una nuova domanda di sicurezza -content=Contenuto http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions_ja.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions_ja.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions_ja.properties deleted file mode 100644 index fcb0d38..0000000 --- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions_ja.properties +++ /dev/null @@ -1,18 +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. -createSecurityQuestion=\u65b0\u3057\u3044\u79d8\u5bc6\u306e\u8cea\u554f\u3092\u4f5c\u6210 -content=\u5185\u5bb9 http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions_pt_BR.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions_pt_BR.properties deleted file mode 100644 index ddf033a..0000000 --- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions_pt_BR.properties +++ /dev/null @@ -1,18 +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. -createSecurityQuestion=Cria um novo Security Question -content=Conte\u00fado http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions_ru.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions_ru.properties deleted file mode 100644 index 2c020fc..0000000 --- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions_ru.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. -# createSecurityQuestion=СоздаÑÑ Ð²Ð¾Ð¿ÑÐ¾Ñ -createSecurityQuestion=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u0432\u043e\u043f\u0440\u043e\u0441 -# content=СодеÑжимое -content=\u0421\u043e\u0434\u0435\u0440\u0436\u0438\u043c\u043e\u0435 http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/pages/Security_it.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Security_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Security_it.properties new file mode 100644 index 0000000..a8e66ca --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Security_it.properties @@ -0,0 +1,21 @@ +# 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. +add=Crea un nuovo Ruolo +dynRealms=Realm dinamici +privileges=Privilegi +applications=Applicazioni +securityQuestions=Domande di sicurezza http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/pages/Security_ja.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Security_ja.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Security_ja.properties new file mode 100644 index 0000000..bbf3747 --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Security_ja.properties @@ -0,0 +1,21 @@ +# 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. +add=\u65b0\u3057\u3044\u30ed\u30fc\u30eb\u3092\u8ffd\u52a0 +dynRealms=\u52d5\u7684\u30ec\u30eb\u30e0 +privileges=Privileges +applications=Applications +securityQuestions=\u79d8\u5bc6\u306e\u8cea\u554f http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/pages/Security_pt_BR.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Security_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Security_pt_BR.properties new file mode 100644 index 0000000..f6e211a --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Security_pt_BR.properties @@ -0,0 +1,21 @@ +# 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. +add=Cria um novo fun\u00e7\u00e3o +dynRealms=Realm din\u00e2micos +privileges=Privileges +applications=Applications +securityQuestions=Perguntas de seguran\u00e7a http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/pages/Security_ru.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Security_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Security_ru.properties new file mode 100644 index 0000000..6a5c308 --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Security_ru.properties @@ -0,0 +1,22 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +add=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u0440\u043e\u043b\u044c +dynRealms=Dynamic Realms +privileges=Privileges +applications=Applications +securityQuestions=\u041a\u043e\u043d\u0442\u0440\u043e\u043b\u044c\u043d\u044b\u0435 \u0432\u043e\u043f\u0440\u043e\u0441\u044b http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/panels/ApplicationDirectoryPanel.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ApplicationDirectoryPanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ApplicationDirectoryPanel.properties new file mode 100644 index 0000000..5913502 --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ApplicationDirectoryPanel.properties @@ -0,0 +1,21 @@ +# 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. +any.edit=Edit ${key} +any.new=New Application +description=Description +compose.title=privileges +application.privileges=Privileges for ${key} http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/panels/ApplicationDirectoryPanel_it.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ApplicationDirectoryPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ApplicationDirectoryPanel_it.properties new file mode 100644 index 0000000..e0d1544 --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ApplicationDirectoryPanel_it.properties @@ -0,0 +1,21 @@ +# 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. +any.edit=Modifica ${key} +any.new=Nuova Applicazione +description=Descrizione +compose.title=privilegi +application.privileges=Privilegi di ${key} http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/panels/ApplicationDirectoryPanel_ja.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ApplicationDirectoryPanel_ja.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ApplicationDirectoryPanel_ja.properties new file mode 100644 index 0000000..5d4a923 --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ApplicationDirectoryPanel_ja.properties @@ -0,0 +1,21 @@ +# 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. +any.edit=${key} \u3092\u7de8\u96c6 +any.new=New Application +description=Description +compose.title=privileges +application.privileges=Privileges for ${key} http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/panels/ApplicationDirectoryPanel_pt_BR.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ApplicationDirectoryPanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ApplicationDirectoryPanel_pt_BR.properties new file mode 100644 index 0000000..a4d60d5 --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ApplicationDirectoryPanel_pt_BR.properties @@ -0,0 +1,21 @@ +# 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. +any.edit=Alterar ${key} +any.new=New Application +description=Description +compose.title=privileges +application.privileges=Privileges for ${key} http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/panels/ApplicationDirectoryPanel_ru.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ApplicationDirectoryPanel_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ApplicationDirectoryPanel_ru.properties new file mode 100644 index 0000000..7417e49 --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ApplicationDirectoryPanel_ru.properties @@ -0,0 +1,22 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +any.edit=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c ${key} +any.new=New Application +description=Description +compose.title=privileges +application.privileges=Privileges for ${key} http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/panels/ApplicationModalPanel.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ApplicationModalPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ApplicationModalPanel.html new file mode 100644 index 0000000..713cb85 --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ApplicationModalPanel.html @@ -0,0 +1,26 @@ +<!-- +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 class="form-group"> + <span wicket:id="key"/> + <span wicket:id="description"/> + </div> + </wicket:extend> +</html> http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/panels/PrivilegeDirectoryPanel.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/PrivilegeDirectoryPanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/PrivilegeDirectoryPanel.properties new file mode 100644 index 0000000..6b9e86c --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/PrivilegeDirectoryPanel.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. +privilege.new=New Privilege +privilege.edit=Edit ${key} http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/panels/PrivilegeDirectoryPanel_it.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/PrivilegeDirectoryPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/PrivilegeDirectoryPanel_it.properties new file mode 100644 index 0000000..fbcc06a --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/PrivilegeDirectoryPanel_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. +privilege.new=Nuovo Privilege +privilege.edit=Modifica ${key} http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/panels/PrivilegeDirectoryPanel_ja.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/PrivilegeDirectoryPanel_ja.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/PrivilegeDirectoryPanel_ja.properties new file mode 100644 index 0000000..6b9e86c --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/PrivilegeDirectoryPanel_ja.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. +privilege.new=New Privilege +privilege.edit=Edit ${key} http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/panels/PrivilegeDirectoryPanel_pt_BR.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/PrivilegeDirectoryPanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/PrivilegeDirectoryPanel_pt_BR.properties new file mode 100644 index 0000000..6b9e86c --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/PrivilegeDirectoryPanel_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. +privilege.new=New Privilege +privilege.edit=Edit ${key} http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/panels/PrivilegeDirectoryPanel_ru.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/PrivilegeDirectoryPanel_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/PrivilegeDirectoryPanel_ru.properties new file mode 100644 index 0000000..6b9e86c --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/PrivilegeDirectoryPanel_ru.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. +privilege.new=New Privilege +privilege.edit=Edit ${key} http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/panels/PrivilegeWizardBuilder$Profile.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/PrivilegeWizardBuilder$Profile.html b/client/console/src/main/resources/org/apache/syncope/client/console/panels/PrivilegeWizardBuilder$Profile.html new file mode 100644 index 0000000..10945cc --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/PrivilegeWizardBuilder$Profile.html @@ -0,0 +1,26 @@ +<!-- +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="form-group"> + <span wicket:id="key"/> + <span wicket:id="description"/> + </div> + </wicket:panel> +</html> http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/panels/PrivilegeWizardBuilder$Spec.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/PrivilegeWizardBuilder$Spec.html b/client/console/src/main/resources/org/apache/syncope/client/console/panels/PrivilegeWizardBuilder$Spec.html new file mode 100644 index 0000000..ee1b97d --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/PrivilegeWizardBuilder$Spec.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="form-group"> + <span wicket:id="content"/> + </div> + </wicket:panel> +</html> http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/panels/SecurityQuestionsPanel.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/SecurityQuestionsPanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/SecurityQuestionsPanel.properties index 7323e05..9eba18d 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/SecurityQuestionsPanel.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/SecurityQuestionsPanel.properties @@ -16,3 +16,4 @@ # under the License. any.edit=Edit Security Question ${key} any.new=New Security Question +content=Content http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/panels/SecurityQuestionsPanel_it.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/SecurityQuestionsPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/SecurityQuestionsPanel_it.properties index 6d55323..0ef0c4d 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/SecurityQuestionsPanel_it.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/SecurityQuestionsPanel_it.properties @@ -16,3 +16,4 @@ # under the License. any.edit=Modifica Domanda Segreta ${key} any.new=Nuova Domanda Segreta +content=Contenuto http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/panels/SecurityQuestionsPanel_ja.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/SecurityQuestionsPanel_ja.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/SecurityQuestionsPanel_ja.properties index ad51d3c..d883e06 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/SecurityQuestionsPanel_ja.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/SecurityQuestionsPanel_ja.properties @@ -16,3 +16,4 @@ # under the License. any.edit=\u79d8\u5bc6\u306e\u8cea\u554f ${key} \u3092\u7de8\u96c6 any.new=\u65b0\u3057\u3044\u79d8\u5bc6\u306e\u8cea\u554f +content=\u5185\u5bb9 http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/panels/SecurityQuestionsPanel_pt_BR.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/SecurityQuestionsPanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/SecurityQuestionsPanel_pt_BR.properties index 930c3c2..1cb2b42 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/SecurityQuestionsPanel_pt_BR.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/SecurityQuestionsPanel_pt_BR.properties @@ -16,3 +16,4 @@ # under the License. any.edit=Alterar Pergunta de Seguran\u00e7a ${key} any.new=Novo Pergunta de Seguran\u00e7a +content=Conte\u00fado http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/panels/SecurityQuestionsPanel_ru.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/SecurityQuestionsPanel_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/SecurityQuestionsPanel_ru.properties index 16793b4..aefb0e0 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/SecurityQuestionsPanel_ru.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/SecurityQuestionsPanel_ru.properties @@ -15,7 +15,6 @@ # specific language governing permissions and limitations # under the License. # -# any.edit=ÐзмениÑÑ Ð²Ð¾Ð¿ÑÐ¾Ñ ${key} any.edit=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0432\u043e\u043f\u0440\u043e\u0441 ${key} -# any.new=СоздаÑÑ Ð²Ð¾Ð¿ÑÐ¾Ñ any.new=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u0432\u043e\u043f\u0440\u043e\u0441 +content=\u0421\u043e\u0434\u0435\u0440\u0436\u0438\u043c\u043e\u0435 http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$Details.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$Details.html b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$Details.html index 80ebc0c..b3ca11a 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$Details.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$Details.html @@ -17,13 +17,10 @@ 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="key">[NAME]</span> - </div> - <div wicket:id="dynMembershipCond" /> - </wicket:panel> - </body> + <wicket:panel> + <div class="form-group"> + <span wicket:id="key">[NAME]</span> + </div> + <div wicket:id="dynMembershipCond"/> + </wicket:panel> </html> http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$DynRealms.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$DynRealms.html b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$DynRealms.html index c55493c..d043a5a 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$DynRealms.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$DynRealms.html @@ -17,12 +17,9 @@ 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="dynRealms">[DYNAMIC REALMS]</span> - </div> - </wicket:panel> - </body> + <wicket:panel> + <div class="form-group"> + <span wicket:id="dynRealms">[DYNAMIC REALMS]</span> + </div> + </wicket:panel> </html> http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$Entitlements.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$Entitlements.html b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$Entitlements.html index f14d054..ffbd5aa 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$Entitlements.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$Entitlements.html @@ -17,12 +17,9 @@ 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="entitlements">[ENTITLEMENTS]</span> - </div> - </wicket:panel> - </body> + <wicket:panel> + <div class="form-group"> + <span wicket:id="entitlements">[ENTITLEMENTS]</span> + </div> + </wicket:panel> </html> http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$Privileges.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$Privileges.html b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$Privileges.html new file mode 100644 index 0000000..e65e30a --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$Privileges.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="form-group"> + <span wicket:id="privileges">[PRIVILEGES]</span> + </div> + </wicket:panel> +</html> http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$Realms.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$Realms.html b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$Realms.html index 7c3d20e..b4031e2 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$Realms.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$Realms.html @@ -17,12 +17,9 @@ 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="realms">[REALMS]</span> - </div> - </wicket:panel> - </body> + <wicket:panel> + <div class="form-group"> + <span wicket:id="realms">[REALMS]</span> + </div> + </wicket:panel> </html> http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/common/lib/src/main/java/org/apache/syncope/common/lib/to/PrivilegeTO.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/PrivilegeTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/PrivilegeTO.java index 5c9ed89..47cc07a 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/PrivilegeTO.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/PrivilegeTO.java @@ -34,8 +34,6 @@ public class PrivilegeTO extends AbstractBaseBean implements EntityTO { private String application; - private String specMimeType; - private String spec; @Override @@ -64,14 +62,6 @@ public class PrivilegeTO extends AbstractBaseBean implements EntityTO { this.application = application; } - public String getSpecMimeType() { - return specMimeType; - } - - public void setSpecMimeType(final String specMimeType) { - this.specMimeType = specMimeType; - } - public String getSpec() { return spec; } http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/Privilege.java ---------------------------------------------------------------------- diff --git a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/Privilege.java b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/Privilege.java index 44744e6..4a39252 100644 --- a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/Privilege.java +++ b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/Privilege.java @@ -28,11 +28,7 @@ public interface Privilege extends ProvidedKeyEntity { void setDescription(String description); - String getSpecMimeType(); + String getSpec(); - void setSpecMimeType(String specMimeType); - - byte[] getSpec(); - - void setSpec(byte[] spec); + void setSpec(String spec); } http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPAPrivilege.java ---------------------------------------------------------------------- diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPAPrivilege.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPAPrivilege.java index a01bb5f..0e1a3b5 100644 --- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPAPrivilege.java +++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPAPrivilege.java @@ -22,8 +22,6 @@ import javax.persistence.Entity; import javax.persistence.Lob; import javax.persistence.ManyToOne; import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import org.apache.commons.lang3.ArrayUtils; import org.apache.syncope.core.persistence.api.entity.Application; import org.apache.syncope.core.persistence.api.entity.Privilege; @@ -40,11 +38,8 @@ public class JPAPrivilege extends AbstractProvidedKeyEntity implements Privilege private String description; - @NotNull - private String specMimeType; - @Lob - private byte[] spec; + private String spec; @Override public Application getApplication() { @@ -68,23 +63,13 @@ public class JPAPrivilege extends AbstractProvidedKeyEntity implements Privilege } @Override - public String getSpecMimeType() { - return specMimeType; - } - - @Override - public void setSpecMimeType(final String specMimeType) { - this.specMimeType = specMimeType; - } - - @Override - public byte[] getSpec() { + public String getSpec() { return spec; } @Override - public void setSpec(final byte[] spec) { - this.spec = ArrayUtils.clone(spec); + public void setSpec(final String spec) { + this.spec = spec; } } http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/ApplicationTest.java ---------------------------------------------------------------------- diff --git a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/ApplicationTest.java b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/ApplicationTest.java index ab5da92..057b2e7 100644 --- a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/ApplicationTest.java +++ b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/ApplicationTest.java @@ -67,22 +67,19 @@ public class ApplicationTest extends AbstractTest { String privilege1Key = UUID.randomUUID().toString(); Privilege privilege = entityFactory.newEntity(Privilege.class); privilege.setKey(privilege1Key); - privilege.setSpecMimeType("application/xml"); - privilege.setSpec("<one/>".getBytes()); + privilege.setSpec("{ \"one\": true }"); application.add(privilege); String privilege2Key = UUID.randomUUID().toString(); privilege = entityFactory.newEntity(Privilege.class); privilege.setKey(privilege2Key); - privilege.setSpecMimeType("application/xml"); - privilege.setSpec("<one><two/></one>".getBytes()); + privilege.setSpec("{ \"two\": true }"); application.add(privilege); String privilege3Key = UUID.randomUUID().toString(); privilege = entityFactory.newEntity(Privilege.class); privilege.setKey(privilege3Key); - privilege.setSpecMimeType("application/xml"); - privilege.setSpec("<one><two><three/></two></one>".getBytes()); + privilege.setSpec("{ \"three\": true }"); application.add(privilege); application = applicationDAO.save(application); http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/core/persistence-jpa/src/test/resources/domains/MasterContent.xml ---------------------------------------------------------------------- diff --git a/core/persistence-jpa/src/test/resources/domains/MasterContent.xml b/core/persistence-jpa/src/test/resources/domains/MasterContent.xml index f68e9aa..855894f 100644 --- a/core/persistence-jpa/src/test/resources/domains/MasterContent.xml +++ b/core/persistence-jpa/src/test/resources/domains/MasterContent.xml @@ -237,12 +237,10 @@ under the License. <Application id="mightyApp" description="A cool application"/> <Privilege id="postMighty" description="Ability to POST" - spec="7B20226D6574686F64223A2022504F5354222C202275726C223A20222F612F622F6322207D" - specmimetype="application/json" + spec="{ "method": "POST", "url": "/a/b/c" }" application_id="mightyApp"/> <Privilege id="getMighty" description="Ability to GET" - spec="7B20226D6574686F64223A2022474554222C202275726C223A20222F612F622F6322207D" - specmimetype="application/json" + spec="{ "method": "GET", "url": "/a/b/c" }" application_id="mightyApp"/> <SyncopeRole id="User reviewer"/> http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ApplicationDataBinderImpl.java ---------------------------------------------------------------------- diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ApplicationDataBinderImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ApplicationDataBinderImpl.java index 635ba57..0fcb38c 100644 --- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ApplicationDataBinderImpl.java +++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ApplicationDataBinderImpl.java @@ -18,7 +18,6 @@ */ package org.apache.syncope.core.provisioning.java.data; -import java.util.Base64; import java.util.Iterator; import java.util.stream.Collectors; import org.apache.syncope.common.lib.SyncopeClientException; @@ -78,8 +77,7 @@ public class ApplicationDataBinderImpl implements ApplicationDataBinder { } privilege.setDescription(privilegeTO.getDescription()); - privilege.setSpecMimeType(privilegeTO.getSpecMimeType()); - privilege.setSpec(Base64.getDecoder().decode(privilegeTO.getSpec())); + privilege.setSpec(privilegeTO.getSpec()); } }); @@ -103,8 +101,7 @@ public class ApplicationDataBinderImpl implements ApplicationDataBinder { privilegeTO.setKey(privilege.getKey()); privilegeTO.setDescription(privilege.getDescription()); privilegeTO.setApplication(privilege.getApplication().getKey()); - privilegeTO.setSpecMimeType(privilege.getSpecMimeType()); - privilegeTO.setSpec(Base64.getEncoder().encodeToString(privilege.getSpec())); + privilegeTO.setSpec(privilege.getSpec()); return privilegeTO; } http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/fit/console-reference/src/main/resources/console.properties ---------------------------------------------------------------------- diff --git a/fit/console-reference/src/main/resources/console.properties b/fit/console-reference/src/main/resources/console.properties index bce070a..18c424f 100644 --- a/fit/console-reference/src/main/resources/console.properties +++ b/fit/console-reference/src/main/resources/console.properties @@ -37,15 +37,15 @@ flowableModelerDirectory=${flowable-modeler.directory} reconciliationReportKey=c3520ad9-179f-49e7-b315-d684d216dd97 -page.administration=org.apache.syncope.client.console.pages.Administration page.dashboard=org.apache.syncope.client.console.pages.Dashboard page.realms=org.apache.syncope.client.console.pages.Realms page.topology=org.apache.syncope.client.console.topology.Topology page.reports=org.apache.syncope.client.console.pages.Reports page.workflow=org.apache.syncope.client.console.pages.Workflow page.audit=org.apache.syncope.client.console.pages.Audit +page.implementations=org.apache.syncope.client.console.pages.Implementations page.logs=org.apache.syncope.client.console.pages.Logs -page.securityquestions=org.apache.syncope.client.console.pages.SecurityQuestions +page.security=org.apache.syncope.client.console.pages.Security page.types=org.apache.syncope.client.console.pages.Types page.policies=org.apache.syncope.client.console.pages.Policies page.notifications=org.apache.syncope.client.console.pages.Notifications http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AjaxBrowseITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AjaxBrowseITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AjaxBrowseITCase.java index 31d05aa..bcc2c6d 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AjaxBrowseITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AjaxBrowseITCase.java @@ -25,8 +25,7 @@ import org.apache.syncope.client.console.pages.Notifications; import org.apache.syncope.client.console.pages.Policies; import org.apache.syncope.client.console.pages.Realms; import org.apache.syncope.client.console.pages.Reports; -import org.apache.syncope.client.console.pages.Administration; -import org.apache.syncope.client.console.pages.SecurityQuestions; +import org.apache.syncope.client.console.pages.Security; import org.apache.syncope.client.console.pages.Types; import org.apache.syncope.client.console.pages.Workflow; import org.apache.syncope.client.console.topology.Topology; @@ -78,14 +77,11 @@ public class AjaxBrowseITCase extends AbstractConsoleITCase { TESTER.clickLink("body:configurationLI:configurationUL:logsLI:logs"); TESTER.assertRenderedPage(Logs.class); - TESTER.clickLink("body:configurationLI:configurationUL:securityquestionsLI:securityquestions"); - TESTER.assertRenderedPage(SecurityQuestions.class); - TESTER.clickLink("body:configurationLI:configurationUL:typesLI:types"); TESTER.assertRenderedPage(Types.class); - TESTER.clickLink("body:configurationLI:configurationUL:administrationLI:administration"); - TESTER.assertRenderedPage(Administration.class); + TESTER.clickLink("body:configurationLI:configurationUL:securityLI:security"); + TESTER.assertRenderedPage(Security.class); TESTER.clickLink("body:configurationLI:configurationUL:policiesLI:policies"); TESTER.assertRenderedPage(Policies.class); http://git-wip-us.apache.org/repos/asf/syncope/blob/72c5885d/fit/core-reference/src/test/java/org/apache/syncope/fit/console/RolesITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/RolesITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/RolesITCase.java index 1f0ec42..25eb447 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/RolesITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/RolesITCase.java @@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal; import org.apache.syncope.client.console.commons.Constants; -import org.apache.syncope.client.console.pages.Administration; +import org.apache.syncope.client.console.pages.Security; import org.apache.wicket.Component; import org.apache.wicket.util.tester.FormTester; import org.junit.jupiter.api.BeforeEach; @@ -34,8 +34,8 @@ public class RolesITCase extends AbstractConsoleITCase { @BeforeEach public void login() { doLogin(ADMIN_UNAME, ADMIN_PWD); - TESTER.clickLink("body:configurationLI:configurationUL:administrationLI:administration"); - TESTER.assertRenderedPage(Administration.class); + TESTER.clickLink("body:configurationLI:configurationUL:securityLI:security"); + TESTER.assertRenderedPage(Security.class); } private void createRole(final String name) { @@ -57,12 +57,15 @@ public class RolesITCase extends AbstractConsoleITCase { formTester.submit("content:form:buttons:next"); formTester = TESTER.newFormTester("body:content:tabbedPanel:panel:outerObjectsRepeater:0:outer:form"); + formTester.submit("content:form:buttons:next"); + + formTester = TESTER.newFormTester("body:content:tabbedPanel:panel:outerObjectsRepeater:0:outer:form"); formTester.submit("content:form:buttons:finish"); TESTER.assertInfoMessages("Operation executed successfully"); TESTER.cleanupFeedbackMessages(); - TESTER.clickLink("body:configurationLI:configurationUL:administrationLI:administration"); + TESTER.clickLink("body:configurationLI:configurationUL:securityLI:security"); } @Test
