From 98f0e9fc9256a511582bb7dfa7b6b2422fbb927c Mon Sep 17 00:00:00 2001 From: lvotypko Date: Tue, 31 Jul 2012 11:55:13 +0200 Subject: [PATCH 001/203] Show in view scheduled jobs --- .../hudson/views/BuildButtonColumn/column.jelly | 11 ++++++++++- war/src/main/webapp/images/24x24/clock_anime.gif | Bin 0 -> 5238 bytes war/src/main/webapp/images/32x32/clock_anime.gif | Bin 0 -> 7658 bytes 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 war/src/main/webapp/images/24x24/clock_anime.gif create mode 100644 war/src/main/webapp/images/32x32/clock_anime.gif diff --git a/core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly b/core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly index 9296682ca1..b4d4dd05d4 100644 --- a/core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly +++ b/core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly @@ -27,9 +27,18 @@ THE SOFTWARE. - + + ${%Schedule a build} + + + ${%Schedule a build} + + diff --git a/war/src/main/webapp/images/24x24/clock_anime.gif b/war/src/main/webapp/images/24x24/clock_anime.gif new file mode 100644 index 0000000000000000000000000000000000000000..f38764e1eebfefa36cf87b86eec031369b1db593 GIT binary patch literal 5238 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 literal 0 HcmV?d00001 diff --git a/war/src/main/webapp/images/32x32/clock_anime.gif b/war/src/main/webapp/images/32x32/clock_anime.gif new file mode 100644 index 0000000000000000000000000000000000000000..ac739551b56600950c649afa691c8d64bcc95b7f GIT binary patch literal 7658 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 literal 0 HcmV?d00001 From ff612d29c0189bc7a4ba78d86d36a8e6f8d1b4fd Mon Sep 17 00:00:00 2001 From: lvotypko Date: Tue, 31 Jul 2012 16:39:59 +0200 Subject: [PATCH 002/203] Add clock_anime.git into folder 16x16 too --- war/src/main/webapp/images/16x16/clock_anime.gif | Bin 0 -> 3232 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 war/src/main/webapp/images/16x16/clock_anime.gif diff --git a/war/src/main/webapp/images/16x16/clock_anime.gif b/war/src/main/webapp/images/16x16/clock_anime.gif new file mode 100644 index 0000000000000000000000000000000000000000..e5b9d626d0560a3f9998928fb05afc15bc2ea306 GIT binary patch literal 3232 zcmeI!`9Bkk9{})?Z=r)sDT=jZ9m3TTFp@`(#gD1zA9FK>DvZ0*0#@sn( zt_YiZi`m*3+Z;Pxv$?j(T;<`>_hGR9y{rX&YEX@s#+~fiB0NxJ33+(9! zj`IH<66hBd9FX*9aAHVkbYxVxb)MwwmkH39sdo#dp)olzZ;Bugc>ddKiAjn1$>wQ^ zCFx07?-TQ5Gec9~!Lw7soNMHB(%|0J+Ue<)Pa37NGLgC2a9CD_R~sN3)(nHyN7Y&+ zRD|ajN=s2G9|H>N z5)l=x?bYtpRW)r$Zv?U`grHiBXv=GktwuJ-^{X}2!pa(Rpx6hE$kvA1u7;28O%0fq zhW0lkJm5XlaN1?G5eQ)vxtvk?N zZS8%nT}|B`4X6$xrVWSePe)@A;}{oACmGw_+l}dh(Jj%q3Ups%`EW$ZxY_XMHyA7l zj~S?@`J=ylXdxAL;~OZrR00lN!g9g&5BC%LswOO0U!sZlfnLIR6U(NV;X2q)Z5_?% zpnhl`PbQK^$)sW8;1@J26i4Zv9FC@vF}TYTJM@feJFAd9#Nbf!@uMx& z;gJTO|1g!zqE(=IK7(W3%#m6Ol|4cu_DrRc#``dn@G%;lHcF+9Oc0qEJiDWvAI~1c zj?nR+=bq#E5gZ1J&nTubhlsq`&kG?;I-AZMn`V8YGq|MLswH;806&{Lg_&SYaoGeG zhcUq!S(reQd94)QN9t@Rn=?1Y?PX4l^$Xu~CfU5H?qLCxGd(;#!KHJD$L8xOqBM%I zj5EvN&k_V&0&iw+VvamBJ1ye1&d-i6aA){D_B?NqCB*UOxGVu>c>yyi91zXZ_=^mt zxPEa?FePBjE%0ZTre+rf!lj{!)vgsGQ7jk}E-f#LI4etwLLqlaxH!K&yCR(6iKz=> zhWIOOMYJmXDp>lu`c=IAP0ZO4bJtcE*Tfs*^_B1I{LKyF`sUi|_rJC_w>P&owzqb+ zcD`@#hMk?$I|m=!wtINf%=-4_i+cMc006-0?V~q?yxd-Rd8&u`yzo}PV|m{iaC%cp zLKd(C0PQC1PL4bPAiWLvOGa@62R(S=meOHozEw_=yoz&VAh{^cAU^mOQAtB)0OVw= zq(7!#4~HrhFXs4q4zN)7k1O+m{1R-rbfCgf-#`56Dv}qa{6&)ktT(5g4Wp(FNRMO> zY(F#X4m$F*>1n}>C(srs+O(ZRTy#KX}}&jGOz zIZoE8?0J+4ZYf#%rC+(XqkWxkg2LUw8v0qYylkKi0U3L(=2lS+ubeg4J(wf|1R*11 z5X^P z3_!*9PBOW-%`{&aUiRGg9~ncw>B?{YDW{EJICwt3(G#a=Oqc33I#*v{;FN!+3bsFh z)BS2Mkmdh_AdhL7!<%+N>QppL!?(9&fZ!w7;|be(B_TSwMqy2w$)_rSj+R2mjC zm(}MBz%Lpp1-wT&+I(G9IRn3i3`(Muo7hyQ3WffCf)l zTA?T2;nboF$rf421O=TiUTa9PU${&e<&C}$klTs(03J53Tho{ z?5aL~u6%eSe%fhnD(fPvJ%XZi$yPJf^@8IHrWXha;B!Ju4HeBXc=C3HJ!Ud&fluf%_&=bAZ&|H8NAK1&yJBiR}=PtaWbM!JRuAI z^t8ywV?m374R};w8XL5H600MyHQyd)lj3}Ss*8Z)YbDV4hRSdmfrs-PpqCaTR_8%Ju?-lzA^53hX+Qef~ic$tM3ZBJ$O=r zQl3D$C0Mkkb4YqG1NILCi-3FsziIxifv#(lH$h#N@&TlFGeV9<%Gm8~BNw!y?97S# zjE?ZNnWZO=Ryp-C@(ZUkPUx};nPMj&VC8e>uihLCiwV)CfAPUY%D!Iv!nz+h?X$J+hp%9**GC&$;nLn>Q Date: Tue, 13 Nov 2012 07:42:27 +0100 Subject: [PATCH 003/203] Add expand all funkcionality for artifact tree view --- core/src/main/resources/lib/hudson/artifactList.jelly | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/src/main/resources/lib/hudson/artifactList.jelly b/core/src/main/resources/lib/hudson/artifactList.jelly index c38dd581a2..d18f44739b 100644 --- a/core/src/main/resources/lib/hudson/artifactList.jelly +++ b/core/src/main/resources/lib/hudson/artifactList.jelly @@ -74,7 +74,13 @@ THE SOFTWARE. +
+ Expand all - - diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_da.properties b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_da.properties deleted file mode 100644 index 78c79a33cb..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_da.properties +++ /dev/null @@ -1,27 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. Kohsuke Kawaguchi. Knud Poulsen. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Anonymous=Anonym -User/group\ to\ add=Brugergruppe der skal tilf\u00f8jes -Add=Tilf\u00f8j -Remove\ user/group=Fjern user/gruppe -User/group=Bruger/gruppe diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_de.properties b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_de.properties deleted file mode 100644 index 09e5858300..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_de.properties +++ /dev/null @@ -1,28 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Simon Wiest -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Remove\ user/group=Nutzer/Gruppe entfernen -Toggle\ all=Alles ausw\u00E4hlen -User/group=Benutzer/Gruppe -Anonymous=Anonym -User/group\ to\ add=Weitere Benutzer/Gruppe -Add=Hinzufügen diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_es.properties b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_es.properties deleted file mode 100644 index 3ef3712be8..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_es.properties +++ /dev/null @@ -1,28 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -User/group=Usuario/Grupo -Anonymous=Anónimo -User/group\ to\ add=Usuario/Grupo para añadir -Add=Añadir -Remove\ user/group=Borrar usuario/grupo -Toggle\ all=Cambiar todo diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_fi.properties b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_fi.properties deleted file mode 100644 index f293ef2a6e..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_fi.properties +++ /dev/null @@ -1,23 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Remove\ user/group=Poista k\u00E4ytt\u00E4j\u00E4/ryhm\u00E4 diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_fr.properties b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_fr.properties deleted file mode 100644 index fbb1cc44e2..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_fr.properties +++ /dev/null @@ -1,27 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Eric Lefevre-Ardant -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Remove\ user/group=Supprimer utilisateur/groupe -User/group=Utilisateur/groupe -Anonymous=Anonyme -User/group\ to\ add=Utilisateur/groupe à ajouter -Add=Ajouter diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_ja.properties b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_ja.properties deleted file mode 100644 index e5c4ae2142..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_ja.properties +++ /dev/null @@ -1,29 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2012, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Add=\u8ffd\u52a0 -Anonymous=\u533f\u540d\u30e6\u30fc\u30b6\u30fc -User/group=\u30e6\u30fc\u30b6\u30fc/\u30b0\u30eb\u30fc\u30d7 -User/group\ to\ add=\u8ffd\u52a0\u3059\u308b\u30e6\u30fc\u30b6\u30fc/\u30b0\u30eb\u30fc\u30d7 - -Toggle\ all=\u3059\u3079\u3066\u53cd\u8ee2 -Remove\ user/group=\u30e6\u30fc\u30b6/\u30b0\u30eb\u30fc\u30d7\u3092\u524a\u9664 diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_nb_NO.properties b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_nb_NO.properties deleted file mode 100644 index 06f66ca6f9..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_nb_NO.properties +++ /dev/null @@ -1,26 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Add=Legg til -Anonymous=Anonym -User/group=Bruker/gruppe -User/group\ to\ add=Bruker/gruppe \u00E5 legge til diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_nl.properties b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_nl.properties deleted file mode 100644 index c9769d698a..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_nl.properties +++ /dev/null @@ -1,27 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, id:sorokh -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Remove\ user/group=Verwijder gebruiker/groep -User/group=Gebruiker/groep -Anonymous=Anoniem -User/group\ to\ add=Toe te voegen gebruiker/groep -Add=Voeg toe diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_pt_BR.properties b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_pt_BR.properties deleted file mode 100644 index d68585ad00..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_pt_BR.properties +++ /dev/null @@ -1,26 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -User/group=Usu\u00E1rios/Grupo -Anonymous=An\u00f4nimo -User/group\ to\ add=Usu\u00e1rio/grupo para adicionar -Add=Adicionar diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_ru.properties b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_ru.properties deleted file mode 100644 index acd0573b2d..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_ru.properties +++ /dev/null @@ -1,28 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Mike Salnikov -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Remove\ user/group=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F/\u0433\u0440\u0443\u043F\u043F\u0443 -Toggle\ all=\u041F\u0435\u0440\u0435\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0432\u0441\u0451 -User/group=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c/\u0433\u0440\u0443\u043f\u043f\u0430 -Anonymous=\u0410\u043d\u043e\u043d\u0438\u043c -User/group\ to\ add=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f/\u0433\u0440\u0443\u043f\u043f\u0443 -Add=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_sv_SE.properties b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_sv_SE.properties deleted file mode 100644 index 80304b1fa3..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_sv_SE.properties +++ /dev/null @@ -1,28 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Add=L\u00E4gg till -Anonymous=Anonym -Remove\ user/group=Ta bort anv\u00E4ndare/grupp -Toggle\ all=V\u00E4xla alla -User/group=Anv\u00E4ndare/grupp -User/group\ to\ add=Anv\u00E4ndare/grupp att l\u00E4gga till diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_tr.properties b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_tr.properties deleted file mode 100644 index 2339130169..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_tr.properties +++ /dev/null @@ -1,26 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Oguz Dag -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -User/group=Kullan\u0131c\u0131/grup -Anonymous=Bilinmeyen -User/group\ to\ add=Eklenecek grup -Add=Ekle diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_zh_CN.properties b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_zh_CN.properties deleted file mode 100644 index 76b6f20d54..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_zh_CN.properties +++ /dev/null @@ -1,28 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Remove\ user/group=\u79FB\u9664\u7528\u6237/\u7EC4 -Toggle\ all=\u5C55\u5F00\u5168\u90E8 -User/group=\u7528\u6237/\u7ec4 -Anonymous=\u533f\u540d\u7528\u6237 -User/group\ to\ add=\u6dfb\u52a0\u7528\u6237/\u7ec4 -Add=\u6dfb\u52a0 diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_zh_TW.properties b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_zh_TW.properties deleted file mode 100644 index a39c6fc98f..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_zh_TW.properties +++ /dev/null @@ -1,30 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2013, Sun Microsystems, Inc., Chunghwa Telecom Co., Ltd., -# and Pei-Tang Huang -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Toggle\ all=\u53cd\u5411\u9078\u53d6 -Remove\ user/group=\u79fb\u9664\u4f7f\u7528\u8005\u6216\u7fa4\u7d44 - -User/group=\u4f7f\u7528\u8005\u6216\u7fa4\u7d44 -Anonymous=\u533f\u540d\u4f7f\u7528\u8005 -User/group\ to\ add=\u8981\u65b0\u589e\u7684\u4f7f\u7528\u8005\u6216\u7fa4\u7d44 -Add=\u65b0\u589e diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help-user-group.jelly b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help-user-group.jelly deleted file mode 100644 index 194301ba46..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help-user-group.jelly +++ /dev/null @@ -1,13 +0,0 @@ - - -
- Different security realm has different conventions about group names. - The best way to go about it is to login and see what group names you belong to, - by going to this diagnostics page. - -

- A special group "authenticated" is also available, which represents all - authenticated (logged in) users. -

-
-
diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help-user-group_ja.jelly b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help-user-group_ja.jelly deleted file mode 100644 index 39bd6e2abc..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help-user-group_ja.jelly +++ /dev/null @@ -1,11 +0,0 @@ - - -
- ユーザー情報の取得先によってグループ名は異なる記法が使われることがあります。 - 最善の方法は、一度ユーザーでログインして、この診断ページに行って実際にJenkinsが使っているグループ名を見ることです。 -

- 接頭辞である"ROLE_"と大文字であるか小文字であるかを変更するには、Jenkinsのアーカイブに含まれるWEB-INF/security/LDAPBindSecurityRealm.groovyを編集して、 - 再起動します。 -

-
-
diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help-user-group_zh_TW.jelly b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help-user-group_zh_TW.jelly deleted file mode 100644 index 59d4bbdbc2..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help-user-group_zh_TW.jelly +++ /dev/null @@ -1,11 +0,0 @@ - - -
- 不同的安全性領域對群組名稱有不一樣的慣例。 - 最好的方法就是登入後,到診斷頁看您所屬的群組名稱。 - -

- 另外,還可以使用特別群組 "authenticated" 來代表所有驗證通過 (已登入) 的使用者。 -

-
-
diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help.html b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help.html deleted file mode 100644 index c34beb46b3..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help.html +++ /dev/null @@ -1,19 +0,0 @@ -
- In this scheme, you can configure who can do what by using a big table. - -

- Each column represents a permission. Hover the mouse over the permission names to get - more information about what they represent. - -

- Each row represents a user or a group (often called 'role', depending on the security realm.) - This includes a special user 'anonymous', which represents unauthenticated users, as well - as 'authenticated', which represents all authenticated users (IOW, everyone except anonymous users.) - Use the text box below the table to add new users/groups/roles to the table, and click the - [x] icon to remove it from the table. - -

- Permissions are additive. That is, if an user X is in group A, B, and C, then - the permissions that this user actually has are the union of all permissions given to - X, A, B, C, and anonymous. -

diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_de.html b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_de.html deleted file mode 100644 index a651b716a8..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_de.html +++ /dev/null @@ -1,20 +0,0 @@ -
- In dieser Tabelle können Sie angeben, wer zu welchen Aktionen berechtigt ist. -

- Jede Spalte entspricht einer Berechtigung. Fahren Sie mit der Maus über die - Namen der Berechtigungen, um mehr Informationen darüber zu erhalten, was sie - bedeuten. -

- Jede Zeile entspricht einem Benutzer oder einer Benutzergruppe (je nach - Benutzerverzeichnis oft auch als "Rolle" bezeichnet). Die Zeilen beinhalten - auch die besonderen Benutzer 'anonymous' bzw. 'authenticated', welche - nichtangemeldete bzw. angemeldete Benutzer repräsentieren, - - Verwenden Sie das untenstehende Textfeld, um neue Benutzer/Gruppen/Rollen zur Tabelle - hinzuzufügen und klicken Sie auf das [x]-Symbol, um sie wieder von der - Tabelle zu entfernen. -

- Berechtigungen sind additiv. Dies bedeutet, dass ein Benutzer X, der Mitglied - in den Gruppen A, B und C ist, die Vereinigungsmenge aller Berechtigungen - besitzt, die X, A, B, C und dem Benutzer 'anonymous' erteilt wurden. -

\ No newline at end of file diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_fr.html b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_fr.html deleted file mode 100644 index 2467997657..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_fr.html +++ /dev/null @@ -1,26 +0,0 @@ -
- - Cette option vous permet de configurer qui fait quoi dans un grand tableau. - -

- Chaque colonne représente une autorisation. Faites glisser la souris au - dessus du nom d'une autorisation pour obtenir plus d'information sur - ce qu'elle représente. - -

- Chaque ligne représente un utilisateur ou un groupe (souvent appelé - 'rôle', selon les royaumes -realms- de sécurité). - On y trouve un utilisateur spécial 'anonymous' qui représente - les utilisateurs non authentifiés, ainsi qu'un utilisateur 'authenticated', - qui représente les utilisateurs authentifiés (c-à-d, tout le monde, à - l'exception des utilisateurs anonymes). - Utilisez le texte sous la table pour ajouter des nouveaux - utilisateurs/groupes/rôles à la table et cliquez sur l'icône - [x] pour les supprimer. - -

- Les autorisations s'ajoutent les unes aux autres. En clair, si un - utilisateur X est présent dans les groupes A, B et C, alors les - autorisations associées à cet utilisateur sont l'union de toutes les - autorisations accordées à X, A, B, C et anonymous. -

\ No newline at end of file diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_ja.html b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_ja.html deleted file mode 100644 index 2d3401bbef..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_ja.html +++ /dev/null @@ -1,19 +0,0 @@ -
- 大きな表形式で、誰が何をできるのか設定します。 - -

- 各列はパーミッションを表します。パーミッション名の上にマウスをあわせると、 - そのパーミッションの詳細が表示されます。 - -

- 各行はユーザーかグループ(セキュリティ・レルムでは、'ロール'とも呼ばれます)を表します。 - この中には、Jenkinsにログインしていない匿名ユーザーをあらわす特別な「anonymous」と、 - また、全てのログイン済みユーザーをあらわす特別な「authenticated」という名前を使うこともできます。 - 表の下にあるテキストボックスを使用して、ユーザー/グループ/ロールを表に追加し、 - [x] のアイコンをクリックすると、表から削除します。 - -

- パーミッションは追加式です。つまり、ユーザーXがグループA、B、Cに所属しているなら、 - このユーザーが実際に持つパーミッションは、 - ユーザーX、グループA、B、Cおよび匿名ユーザーに与えられた全てのパーミッションの和になります。 -

diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_pt_BR.html b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_pt_BR.html deleted file mode 100644 index 1b5c049fc2..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_pt_BR.html +++ /dev/null @@ -1,20 +0,0 @@ -
- - Neste esquema, você pode configurar quem pode fazer o quê usando uma grande tabela. - -

- Cada coluna representa uma permissão. Passe o mouse sobre os nomes das permissões para - obter mais informação sobre o que elas representam. - -

- Cada linha representa um usuário ou grupo (frequentemente chamado de 'papel', - dependendo do domínio de segurança.) - Isto inclui um usuário especial chamado 'anonymous', que representa os usuários não autenticados. - Use a caixa de texto abaixo da tabela para adicionar novos usuários/grupos/papéis na tabela, e clique - no ícone [x] para remover da tabela. - -

- Permissões são cumulativas. Ou seja, se um usuário X está nos grupos A, B, e C, então - as permissões que este usuário na verdade tem é a únião de todas as permissões dadas para - X, A, B, C, e anônimos. -

diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_ru.html b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_ru.html deleted file mode 100644 index 36f4e2b496..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_ru.html +++ /dev/null @@ -1,20 +0,0 @@ -
- - В этом режиме вы можете явно указать допустимые операции, используя матрицу привилегий. - -

- Каждая колонка представляет собой привилегию. Наведите курсор мыши на имя привелегии - для получения большей информации о её предназначении. - -

- Каждая строка представляет собой пользователя или группу (обычно называемая "ролью", в - зависимости от используемого модуля безопасности). Список включает также специального - пользователя Аноним, который представляет собой неаутентифицированного пользователя. - Чтобы добавить нового пользователя/группу/роль в таблицу, используйте поле ввода под таблицей. - Чтобы удалить пользователя/группу/роль нажмите кнопку [x] в правой колонке. - -

- Привилегии аддитивны, то есть если пользователь X состоит в группах A, B и C, тогда - реальные привилегии пользователя - объединение всех привилегий данных конкретно пользователю, - группам A, B и C и анонимному пользователю. -

\ No newline at end of file diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_tr.html b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_tr.html deleted file mode 100644 index 44d38936aa..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_tr.html +++ /dev/null @@ -1,19 +0,0 @@ -
- - Bu şemada, tabloyu kullanarak kimin ne yapabileceğini belirleyebilirsiniz. - -

- Her kolon bir yetkiyi temsil eder. Mouse ile yetki isimlerinin üzerine - gelerek, daha fazla bilgi alabilirsiniz. - -

- Her satır bir kullanıcı veya grubu temsil eder (Güvenlik alanına bağlı olarak, "rol" olarak da - adlandırılabilir). Bu satırların içerisinde yetkisiz kullanıcıları temsilen bilinmeyen (anonymous) - kullanıcı da yer almaktadır. Aşağıdaki metin kutusunu kullanarak, tabloya kullanıcı/grup/rol ekleyebilir, - [x] ikonuna tıklayarak bunları silebilirsiniz. - -

- Yetkilendirme, kullanıcı ve ait olduğu grupların yetkilerinin birleşim kümesi ile hesaplanır. - Yani X kullanıcısı, A, B ve C gruplarına dahilse, yetkileri X, A, B, C ve bilinmeyen kullanıcıya - verilen yetkilerinin birleşim kümesidir. -

\ No newline at end of file diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_zh_CN.html b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_zh_CN.html deleted file mode 100644 index 72cdd35847..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_zh_CN.html +++ /dev/null @@ -1,13 +0,0 @@ -
- 在这种授权模型中,你可以通过一个大的表格来配置什么用户可以做什么事. - -

- 每一列代表一个权限.把鼠标移动到权限名称上可以查看更详细的权限说明信息. - -

- 每一行代表一个用户或组(通常称为'角色',取决于安全域.),这其中包含特殊用户'anonymous',其代表未登录用户,同样还有'authenticated',其代表所有已认证的用户(也就是除了匿名用户的所有用户.) - 可以使用表格下方的输入框来添加新的用户/组/角色到表格中,并且可以点击[x]图标将其从表格中删除. - -

- 权限是追加的,这说明如果一个用户X在A,B,C三个组中,那么X的权限是联合了X,A,B,C和匿名用户的所有权限. -

diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_zh_TW.html b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_zh_TW.html deleted file mode 100644 index 18b7e9a384..0000000000 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_zh_TW.html +++ /dev/null @@ -1,15 +0,0 @@ -
- 在這種配置下,您可以透過一張大表格,設定每個人可以做的每件事。 - -

- 每一欄都表示一項權限。將滑鼠游標移到權限名稱上,可以看到權限代表的意義說明。 - -

- 一行就是一個使用者或群組 (依據安全性領域不同,一般也叫做「角色」)。 - 包括 "anonymous" 特殊使用者,代表沒有通過驗證的人; - 另外也有 "authenticated",代表所有驗證通過的人 (換句話說,就是除了匿名使用者以外的所有人)。 - 透過表格下方的文字方塊可以新增使用者、群組、角色進來,按一下 [x] 圖示可以把它由表格中移掉。 - -

- 權限會累加。也就是說,如果 X 使用者在 A, B, C 三個群組中,則該使用者實際的權限會是 X, A, B, C 及匿名使用者權限的聯集。 -

diff --git a/core/src/main/resources/hudson/security/Messages.properties b/core/src/main/resources/hudson/security/Messages.properties index 2214960963..d88982fe9a 100644 --- a/core/src/main/resources/hudson/security/Messages.properties +++ b/core/src/main/resources/hudson/security/Messages.properties @@ -22,8 +22,6 @@ GlobalSecurityConfiguration.DisplayName=Configure Global Security GlobalSecurityConfiguration.Description=Secure Jenkins; define who is allowed to access/use the system. -GlobalMatrixAuthorizationStrategy.DisplayName=Matrix-based security - HudsonPrivateSecurityRealm.WouldYouLikeToSignUp=This {0} {1} is new to Jenkins. Would you like to sign up? LegacyAuthorizationStrategy.DisplayName=Legacy mode @@ -56,8 +54,6 @@ LegacySecurityRealm.Displayname=Delegate to servlet container UserDetailsServiceProxy.UnableToQuery=Unable to query user information: {0} -ProjectMatrixAuthorizationStrategy.DisplayName=Project-based Matrix Authorization Strategy - PAMSecurityRealm.DisplayName=Unix user/group database PAMSecurityRealm.ReadPermission=Jenkins needs to be able to read /etc/shadow PAMSecurityRealm.BelongToGroup={0} needs to belong to group {1} to read /etc/shadow diff --git a/core/src/main/resources/hudson/security/Messages_da.properties b/core/src/main/resources/hudson/security/Messages_da.properties index 912d05e897..7e84f2ae64 100644 --- a/core/src/main/resources/hudson/security/Messages_da.properties +++ b/core/src/main/resources/hudson/security/Messages_da.properties @@ -36,9 +36,7 @@ HudsonPrivateSecurityRealm.ManageUserLinks.DisplayName=Brugeradministration HudsonPrivateSecurityRealm.DisplayName=Jenkins''s egen brugerdatabase PAMSecurityRealm.DisplayName=Unix bruger/gruppe database AuthorizationStrategy.DisplayName=Alle kan g\u00f8re alt -ProjectMatrixAuthorizationStrategy.DisplayName=Projektbaseret matriceauthentificering AccessDeniedException2.MissingPermission={0} mangler {1} rettigheden -GlobalMatrixAuthorizationStrategy.DisplayName=Matricebaseret sikkerhed Permission.Permissions.Title=N/A LDAPSecurityRealm.UnableToConnect=Kan ikke oprette forbindelse til {0} : {1} FullControlOnceLoggedInAuthorizationStrategy.DisplayName=Indloggede brugere kan g\u00f8re alt diff --git a/core/src/main/resources/hudson/security/Messages_de.properties b/core/src/main/resources/hudson/security/Messages_de.properties index 52dc616e38..93803b4089 100644 --- a/core/src/main/resources/hudson/security/Messages_de.properties +++ b/core/src/main/resources/hudson/security/Messages_de.properties @@ -22,53 +22,48 @@ GlobalSecurityConfiguration.DisplayName=Globale Sicherheit konfigurieren GlobalSecurityConfiguration.Description=Jenkins absichern und festlegen, wer Zugriff auf das System hat und es benutzen darf. -GlobalMatrixAuthorizationStrategy.DisplayName=Matrix-basierte Sicherheit - LegacyAuthorizationStrategy.DisplayName=Legacy-Autorisierung HudsonPrivateSecurityRealm.DisplayName=Jenkins' eingebautes Benutzerverzeichnis HudsonPrivateSecurityRealm.Details.DisplayName=Passwort HudsonPrivateSecurityRealm.Details.PasswordError=\ - Das angegebene Passwort und seine Wiederholung stimmen nicht überein. \ - Bitte überprüfen Sie Ihre Eingabe. + Das angegebene Passwort und seine Wiederholung stimmen nicht \u00fcberein. \ + Bitte \u00fcberpr\u00fcfen Sie Ihre Eingabe. HudsonPrivateSecurityRealm.ManageUserLinks.DisplayName=Benutzer verwalten -HudsonPrivateSecurityRealm.ManageUserLinks.Description=Anlegen, Aktualisieren und Löschen von Benutzern, die sich an dieser Jenkins-Installation anmelden dürfen. +HudsonPrivateSecurityRealm.ManageUserLinks.Description=Anlegen, Aktualisieren und L\u00f6schen von Benutzern, die sich an dieser Jenkins-Installation anmelden d\u00fcrfen. -HudsonPrivateSecurityRealm.CreateAccount.TextNotMatchWordInImage=Text stimmt nicht mit dem Wort im Bild überein -HudsonPrivateSecurityRealm.CreateAccount.PasswordNotMatch=Das angegebene Passwort und seine Wiederholung stimmen nicht überein -HudsonPrivateSecurityRealm.CreateAccount.PasswordRequired=Passwort wird benötigt -HudsonPrivateSecurityRealm.CreateAccount.UserNameRequired=Benutzername wird benötigt -HudsonPrivateSecurityRealm.CreateAccount.InvalidEmailAddress=Ungültige E-Mail Adresse +HudsonPrivateSecurityRealm.CreateAccount.TextNotMatchWordInImage=Text stimmt nicht mit dem Wort im Bild \u00fcberein +HudsonPrivateSecurityRealm.CreateAccount.PasswordNotMatch=Das angegebene Passwort und seine Wiederholung stimmen nicht \u00fcberein +HudsonPrivateSecurityRealm.CreateAccount.PasswordRequired=Passwort wird ben\u00f6tigt +HudsonPrivateSecurityRealm.CreateAccount.UserNameRequired=Benutzername wird ben\u00f6tigt +HudsonPrivateSecurityRealm.CreateAccount.InvalidEmailAddress=Ung\u00fcltige E-Mail Adresse HudsonPrivateSecurityRealm.CreateAccount.UserNameAlreadyTaken=Benutzername ist bereits vergeben -FullControlOnceLoggedInAuthorizationStrategy.DisplayName=Angemeldete Benutzer dürfen alle Aktionen ausführen +FullControlOnceLoggedInAuthorizationStrategy.DisplayName=Angemeldete Benutzer d\u00fcrfen alle Aktionen ausf\u00fchren -AuthorizationStrategy.DisplayName=Jeder darf alle Aktionen ausführen +AuthorizationStrategy.DisplayName=Jeder darf alle Aktionen ausf\u00fchren LDAPSecurityRealm.DisplayName=LDAP LDAPSecurityRealm.SyntaxOfServerField=\ Syntax der Server-Angabe ist SERVER, SERVER:PORT oder ldaps://SERVER[:PORT] LDAPSecurityRealm.UnknownHost=Unbekannter Host: {0} LDAPSecurityRealm.UnableToConnect=Keine Verbindung zu {0} : {1} -LDAPSecurityRealm.InvalidPortNumber=Ungültige Port-Nummer +LDAPSecurityRealm.InvalidPortNumber=Ung\u00fcltige Port-Nummer LegacySecurityRealm.Displayname=An Servlet-Container delegieren UserDetailsServiceProxy.UnableToQuery=Benutzerinformationen konnten nicht abgefragt werden: {0} PAMSecurityRealm.DisplayName=Unix Benutzer-/Gruppenverzeichnis -PAMSecurityRealm.ReadPermission=Jenkins benötigt Leserechte für /etc/shadow -PAMSecurityRealm.BelongToGroup={0} muß zu Gruppe {1} gehören, um /etc/shadow lesen zu können. +PAMSecurityRealm.ReadPermission=Jenkins ben\u00f6tigt Leserechte f\u00fcr /etc/shadow +PAMSecurityRealm.BelongToGroup={0} mu\u00df zu Gruppe {1} geh\u00f6ren, um /etc/shadow lesen zu k\u00f6nnen. PAMSecurityRealm.RunAsUserOrBelongToGroupAndChmod=\ - Entweder muß Jenkins als {0} ausgeführt werden, oder {1} muß zu Gruppe {2} gehören und \ - ''chmod g+r /etc/shadow'' muß ausgeführt werden, damit Jenkins /etc/shadow lesen kann. + Entweder mu\u00df Jenkins als {0} ausgef\u00fchrt werden, oder {1} mu\u00df zu Gruppe {2} geh\u00f6ren und \ + ''chmod g+r /etc/shadow'' mu\u00df ausgef\u00fchrt werden, damit Jenkins /etc/shadow lesen kann. PAMSecurityRealm.Success=Erfolgreich PAMSecurityRealm.User=Benutzer ''{0}'' PAMSecurityRealm.CurrentUser=Aktueller Benutzer PAMSecurityRealm.Uid=uid: {0} - -ProjectMatrixAuthorizationStrategy.DisplayName=Projektbasierte Matrix-Zugriffssteuerung - # not in use Permission.Permissions.Title=N/A AccessDeniedException2.MissingPermission={0} fehlt das Recht ''{1}'' diff --git a/core/src/main/resources/hudson/security/Messages_es.properties b/core/src/main/resources/hudson/security/Messages_es.properties index 4b56eb6591..45b42f1543 100644 --- a/core/src/main/resources/hudson/security/Messages_es.properties +++ b/core/src/main/resources/hudson/security/Messages_es.properties @@ -20,37 +20,34 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -GlobalSecurityConfiguration.DisplayName=Configuraci\u00F3n global de la seguridad +GlobalSecurityConfiguration.DisplayName=Configuraci\u00f3n global de la seguridad GlobalSecurityConfiguration.Description=Seguridad en Jenkins. \ - Define qui\u00E9n tiene acceso al sistema (autenticaci\u00F3n) y qu\u00E9 puede hacer (autorizaci\u00F3n) -GlobalMatrixAuthorizationStrategy.DisplayName=Configuración de seguridad + Define qui\u00e9n tiene acceso al sistema (autenticaci\u00f3n) y qu\u00e9 puede hacer (autorizaci\u00f3n) LegacyAuthorizationStrategy.DisplayName=Modo ''legacy'' HudsonPrivateSecurityRealm.DisplayName=Usar base de datos de Jenkins -HudsonPrivateSecurityRealm.Details.DisplayName=Contraseña +HudsonPrivateSecurityRealm.Details.DisplayName=Contrase\u00f1a HudsonPrivateSecurityRealm.Details.PasswordError=\ - Las contraseñas no coinciden. -HudsonPrivateSecurityRealm.ManageUserLinks.DisplayName=Gestión de usuarios + Las contrase\u00f1as no coinciden. +HudsonPrivateSecurityRealm.ManageUserLinks.DisplayName=Gesti\u00f3n de usuarios HudsonPrivateSecurityRealm.ManageUserLinks.Description=Crear/borrar/editar usuarios que puedan utilizar Jenkins FullControlOnceLoggedInAuthorizationStrategy.DisplayName=Usuarios autenticados tienen privilegios para todo -AuthorizationStrategy.DisplayName=Cualquiera puede hacer cualquier acción +AuthorizationStrategy.DisplayName=Cualquiera puede hacer cualquier acci\u00f3n LegacySecurityRealm.Displayname=Delegar seguridad al contenedor de servlets -UserDetailsServiceProxy.UnableToQuery=Imposible obtener la información del usuario: {0} - -ProjectMatrixAuthorizationStrategy.DisplayName=Estrategia de seguridad para el proyecto +UserDetailsServiceProxy.UnableToQuery=Imposible obtener la informaci\u00f3n del usuario: {0} # not in use Permission.Permissions.Title=N/D AccessDeniedException2.MissingPermission={0} no tiene el permiso {1} -PAMSecurityRealm.DisplayName=Autenticación basada en usuarios y grupos Unix -PAMSecurityRealm.ReadPermission=Jenkins necesita permisos de lectura del fichero /etc/shadowPAMSecurityRealm.DisplayName=Usar autenticación Unix: usuario/grupo +PAMSecurityRealm.DisplayName=Autenticaci\u00f3n basada en usuarios y grupos Unix +PAMSecurityRealm.ReadPermission=Jenkins necesita permisos de lectura del fichero /etc/shadowPAMSecurityRealm.DisplayName=Usar autenticaci\u00f3n Unix: usuario/grupo PAMSecurityRealm.BelongToGroup={0} tiene que pertenecer al grupo {1} para tener acceso de lectura a /etc/shadow PAMSecurityRealm.RunAsUserOrBelongToGroupAndChmod=\ Es necesario que Jenkins se ejecute como "{0}", o bien "{1}" ha de pertenecer al grupo "{2}" y ejecutar "chmod g+r /etc/shadow" para que Jenkins tenga acceso de lectura a /etc/shadow. @@ -63,6 +60,6 @@ LDAPSecurityRealm.DisplayName=LDAP LDAPSecurityRealm.SyntaxOfServerField=La sintaxis para especificar el servidor es: SERVER o SERVER:PORT o ldaps://SERVER[:PORT] LDAPSecurityRealm.UnknownHost=Nombre de host desconocido: {0} LDAPSecurityRealm.UnableToConnect=Incapaz de conectar con {0} : {1} -LDAPSecurityRealm.InvalidPortNumber=El puerto no es válido +LDAPSecurityRealm.InvalidPortNumber=El puerto no es v\u00e1lido -HudsonPrivateSecurityRealm.WouldYouLikeToSignUp=Este {0} {1} es nuevo en Jenkins. ¿Te gustaría crear una nueva cuenta? +HudsonPrivateSecurityRealm.WouldYouLikeToSignUp=Este {0} {1} es nuevo en Jenkins. \u00bfTe gustar\u00eda crear una nueva cuenta? diff --git a/core/src/main/resources/hudson/security/Messages_fr.properties b/core/src/main/resources/hudson/security/Messages_fr.properties index cb358c7ca8..9258c0680a 100644 --- a/core/src/main/resources/hudson/security/Messages_fr.properties +++ b/core/src/main/resources/hudson/security/Messages_fr.properties @@ -20,33 +20,30 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -GlobalSecurityConfiguration.DisplayName=Configurer la s\u00E9curit\u00E9 globale -GlobalSecurityConfiguration.Description=S\u00E9curiser Jenkins; d\u00E9finir qui est autoris\u00E9 \u00E0 acc\u00E9der au syst\u00E8me. -GlobalMatrixAuthorizationStrategy.DisplayName=Sécurité basée sur une matrice +GlobalSecurityConfiguration.DisplayName=Configurer la s\u00e9curit\u00e9 globale +GlobalSecurityConfiguration.Description=S\u00e9curiser Jenkins; d\u00e9finir qui est autoris\u00e9 \u00e0 acc\u00e9der au syst\u00e8me. LegacyAuthorizationStrategy.DisplayName=Mode legacy -HudsonPrivateSecurityRealm.DisplayName=Base de données des utilisateurs de Jenkins +HudsonPrivateSecurityRealm.DisplayName=Base de donn\u00e9es des utilisateurs de Jenkins HudsonPrivateSecurityRealm.Details.DisplayName=Mot de passe HudsonPrivateSecurityRealm.Details.PasswordError=\ - Le mot de passe de confirmation n''est pas le même que le premier mot de passe. \ - Merci de vous assurer que les mots de passe sont les mêmes dans les deux cases. -HudsonPrivateSecurityRealm.ManageUserLinks.DisplayName=Gérer les utilisateurs -HudsonPrivateSecurityRealm.ManageUserLinks.Description=Créer/supprimer/modifier les utilisateurs qui peuvent se logger sur ce serveur Jenkins + Le mot de passe de confirmation n''est pas le m\u00eame que le premier mot de passe. \ + Merci de vous assurer que les mots de passe sont les m\u00eames dans les deux cases. +HudsonPrivateSecurityRealm.ManageUserLinks.DisplayName=G\u00e9rer les utilisateurs +HudsonPrivateSecurityRealm.ManageUserLinks.Description=Cr\u00e9er/supprimer/modifier les utilisateurs qui peuvent se logger sur ce serveur Jenkins -FullControlOnceLoggedInAuthorizationStrategy.DisplayName=Les utilisateurs connectés peuvent tout faire +FullControlOnceLoggedInAuthorizationStrategy.DisplayName=Les utilisateurs connect\u00e9s peuvent tout faire -AuthorizationStrategy.DisplayName=Tout le monde a accès à toutes les fonctionnalités +AuthorizationStrategy.DisplayName=Tout le monde a acc\u00e8s \u00e0 toutes les fonctionnalit\u00e9s LDAPSecurityRealm.DisplayName=LDAP -LegacySecurityRealm.Displayname=Déléguer au conteneur de servlets +LegacySecurityRealm.Displayname=D\u00e9l\u00e9guer au conteneur de servlets -UserDetailsServiceProxy.UnableToQuery=Impossible de récupérer les informations utilisateur: {0} +UserDetailsServiceProxy.UnableToQuery=Impossible de r\u00e9cup\u00e9rer les informations utilisateur: {0} -ProjectMatrixAuthorizationStrategy.DisplayName=Stratégie d''authorisation matricielle basée sur les projets - -PAMSecurityRealm.DisplayName=Base de données des utilisateurs & des groupes Unix +PAMSecurityRealm.DisplayName=Base de donn\u00e9es des utilisateurs & des groupes Unix # not in use Permission.Permissions.Title=N/A diff --git a/core/src/main/resources/hudson/security/Messages_ja.properties b/core/src/main/resources/hudson/security/Messages_ja.properties index abe483a0c1..8107aa2dac 100644 --- a/core/src/main/resources/hudson/security/Messages_ja.properties +++ b/core/src/main/resources/hudson/security/Messages_ja.properties @@ -21,7 +21,6 @@ # THE SOFTWARE. GlobalSecurityConfiguration.DisplayName=\u30b0\u30ed\u30fc\u30d0\u30eb\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u306e\u8a2d\u5b9a GlobalSecurityConfiguration.Description=Jenkins\u306e\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u3092\u8a2d\u5b9a\u3057\u307e\u3059\u3002\u8ab0\u304c\u30b7\u30b9\u30c6\u30e0\u306b\u30a2\u30af\u30bb\u30b9\u3001\u4f7f\u7528\u3067\u304d\u308b\u304b\u306a\u3069\u3092\u8a2d\u5b9a\u3057\u307e\u3059\u3002 -GlobalMatrixAuthorizationStrategy.DisplayName=\u884c\u5217\u306b\u3088\u308b\u6a29\u9650\u8a2d\u5b9a HudsonPrivateSecurityRealm.WouldYouLikeToSignUp=\u3053\u306e{0}\u306e{1}\u306f\u3001Jenkins\u306b\u306f\u767b\u9332\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u30b5\u30a4\u30f3\u30a2\u30c3\u30d7\u3057\u307e\u3059\u304b? LegacyAuthorizationStrategy.DisplayName=\u4e92\u63db\u6027\u30e2\u30fc\u30c9 @@ -53,8 +52,6 @@ LegacySecurityRealm.Displayname=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u30b3\u30f3 UserDetailsServiceProxy.UnableToQuery={0}\u306e\u30e6\u30fc\u30b6\u30fc\u60c5\u5831\u3092\u691c\u7d22\u3067\u304d\u307e\u305b\u3093\u3002 -ProjectMatrixAuthorizationStrategy.DisplayName=\u884c\u5217\u306b\u3088\u308b\u6a29\u9650\u8a2d\u5b9a(\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u5358\u4f4d) - PAMSecurityRealm.DisplayName=Unix \u30e6\u30fc\u30b6\u30fc/\u30b0\u30eb\u30fc\u30d7 \u30c7\u30fc\u30bf\u30d9\u30fc\u30b9 PAMSecurityRealm.ReadPermission=Jenkins\u304c/etc/shadow\u3092\u8aad\u307f\u8fbc\u307f\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 PAMSecurityRealm.BelongToGroup=/etc/shadow\u3092\u8aad\u3081\u308b\u3088\u3046\u306b\u3001{0} \u304c\u30b0\u30eb\u30fc\u30d7 {1} \u306b\u5c5e\u3057\u3066\u3044\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 diff --git a/core/src/main/resources/hudson/security/Messages_nl.properties b/core/src/main/resources/hudson/security/Messages_nl.properties index aa1c62b8d0..14a9af3ec4 100644 --- a/core/src/main/resources/hudson/security/Messages_nl.properties +++ b/core/src/main/resources/hudson/security/Messages_nl.properties @@ -20,8 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -GlobalMatrixAuthorizationStrategy.DisplayName=Matrix-gebaseerde beveiliging - LegacyAuthorizationStrategy.DisplayName=Legacy-mode HudsonPrivateSecurityRealm.Details.DisplayName=Paswoord diff --git a/core/src/main/resources/hudson/security/Messages_pt_BR.properties b/core/src/main/resources/hudson/security/Messages_pt_BR.properties index 1bda8e932b..272fcb7529 100644 --- a/core/src/main/resources/hudson/security/Messages_pt_BR.properties +++ b/core/src/main/resources/hudson/security/Messages_pt_BR.properties @@ -20,14 +20,12 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -GlobalMatrixAuthorizationStrategy.DisplayName=Seguran\u00E7a baseada em matriz - LegacyAuthorizationStrategy.DisplayName=Modo legado HudsonPrivateSecurityRealm.Details.DisplayName=Senha -HudsonPrivateSecurityRealm.Details.PasswordError=A senha confirmada n\u00E3o \u00E9 igual a senha informada. Por favor assegure-se de digitar a mesma senha duas vezes. +HudsonPrivateSecurityRealm.Details.PasswordError=A senha confirmada n\u00e3o \u00e9 igual a senha informada. Por favor assegure-se de digitar a mesma senha duas vezes. -UserDetailsServiceProxy.UnableToQuery=N\u00E3o foi poss\u00EDvel buscar informa\u00E7\u00F5es do usu\u00E1rio\: {0} +UserDetailsServiceProxy.UnableToQuery=N\u00e3o foi poss\u00edvel buscar informa\u00e7\u00f5es do usu\u00e1rio\: {0} # not in use Permission.Permissions.Title=N/A @@ -36,32 +34,30 @@ PAMSecurityRealm.Success=Sucesso # Unable to connect to {0} : {1} LDAPSecurityRealm.UnableToConnect=Incapaz de conectar {0} : {1} # Logged-in users can do anything -FullControlOnceLoggedInAuthorizationStrategy.DisplayName=Usu\u00E1rios logados n\u00E3o conseguem fazer nada +FullControlOnceLoggedInAuthorizationStrategy.DisplayName=Usu\u00e1rios logados n\u00e3o conseguem fazer nada # Unix user/group database -PAMSecurityRealm.DisplayName=Usu\u00E1rio Uniz / grupo banco da dados +PAMSecurityRealm.DisplayName=Usu\u00e1rio Uniz / grupo banco da dados # User ''{0}'' -PAMSecurityRealm.User=Usu\u00E1rio ''{0}'' +PAMSecurityRealm.User=Usu\u00e1rio ''{0}'' # {0} needs to belong to group {1} to read /etc/shadow PAMSecurityRealm.BelongToGroup= {0} precisa pertencer ao grupo {1} para ler /etc/shadow # Anyone can do anything AuthorizationStrategy.DisplayName=Ninguem consegue fazer nada -# Project-based Matrix Authorization Strategy -#ProjectMatrixAuthorizationStrategy.DisplayName= # Invalid port number -LDAPSecurityRealm.InvalidPortNumber=N\u00FAmero de porta inv\u00E1lido +LDAPSecurityRealm.InvalidPortNumber=N\u00famero de porta inv\u00e1lido # Unknown host: {0} -LDAPSecurityRealm.UnknownHost=Host n\u00E3o localizado {0} +LDAPSecurityRealm.UnknownHost=Host n\u00e3o localizado {0} # uid: {0} PAMSecurityRealm.Uid=uid: {0} # \ # Either Jenkins needs to run as {0} or {1} needs to belong to group {2} and ''chmod g+r /etc/shadow'' needs to be done to enable Jenkins to read /etc/shadow PAMSecurityRealm.RunAsUserOrBelongToGroupAndChmod=Jenkins precisa pertencer ao grupo {2} e ter acesso ''chmod g+r /etc/shadow'' para ler a pasta. # Current User -PAMSecurityRealm.CurrentUser=Usu\u00E1rio atual +PAMSecurityRealm.CurrentUser=Usu\u00e1rio atual # {0} is missing the {1} permission -AccessDeniedException2.MissingPermission= {0} est\u00E1 faltando a permiss\u00E3o {1} +AccessDeniedException2.MissingPermission= {0} est\u00e1 faltando a permiss\u00e3o {1} # Manage Users -HudsonPrivateSecurityRealm.ManageUserLinks.DisplayName=Gerenciar usu\u00E1rios +HudsonPrivateSecurityRealm.ManageUserLinks.DisplayName=Gerenciar usu\u00e1rios # Delegate to servlet container LegacySecurityRealm.Displayname=Delegar para o container servlet # LDAP @@ -71,6 +67,6 @@ HudsonPrivateSecurityRealm.DisplayName=Base de dados interna do Jenkins # Jenkins needs to be able to read /etc/shadow PAMSecurityRealm.ReadPermission=Jenkins precisa de acesso de leitura em /etc/shadow # Create/delete/modify users that can log in to this Jenkins -HudsonPrivateSecurityRealm.ManageUserLinks.Description=Criar/deletar/modificar usu\u00E1rios que logan no Jenkins +HudsonPrivateSecurityRealm.ManageUserLinks.Description=Criar/deletar/modificar usu\u00e1rios que logan no Jenkins # Syntax of server field is SERVER or SERVER:PORT or ldaps://SERVER[:PORT] LDAPSecurityRealm.SyntaxOfServerField=Sintaxe SERVER or SERVER:PORT or ldaps://SERVER[:PORT] diff --git a/core/src/main/resources/hudson/security/Messages_ru.properties b/core/src/main/resources/hudson/security/Messages_ru.properties index 10e9d57b24..2f9b4ecc14 100644 --- a/core/src/main/resources/hudson/security/Messages_ru.properties +++ b/core/src/main/resources/hudson/security/Messages_ru.properties @@ -20,8 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -GlobalMatrixAuthorizationStrategy.DisplayName=\u041c\u0430\u0442\u0440\u0438\u0447\u043d\u043e\u0435 \u0440\u0430\u0441\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u0438\u0435 \u043f\u0440\u0430\u0432 - LegacyAuthorizationStrategy.DisplayName="\u0422\u0440\u0430\u0434\u0438\u0446\u0438\u043e\u043d\u043d\u044b\u0439" \u0440\u0435\u0436\u0438\u043c HudsonPrivateSecurityRealm.Details.DisplayName=\u041f\u0430\u0440\u043e\u043b\u044c diff --git a/core/src/main/resources/hudson/security/Messages_tr.properties b/core/src/main/resources/hudson/security/Messages_tr.properties index f212942b83..062ca3e822 100644 --- a/core/src/main/resources/hudson/security/Messages_tr.properties +++ b/core/src/main/resources/hudson/security/Messages_tr.properties @@ -20,8 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -GlobalMatrixAuthorizationStrategy.DisplayName=Matris-temelli G\u00fcvenlik - LegacyAuthorizationStrategy.DisplayName=Miras modu HudsonPrivateSecurityRealm.Details.DisplayName=\u015fifre diff --git a/core/src/main/resources/hudson/security/Messages_zh_CN.properties b/core/src/main/resources/hudson/security/Messages_zh_CN.properties index b18472c110..a69de52c6a 100644 --- a/core/src/main/resources/hudson/security/Messages_zh_CN.properties +++ b/core/src/main/resources/hudson/security/Messages_zh_CN.properties @@ -20,8 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -GlobalMatrixAuthorizationStrategy.DisplayName=\u5b89\u5168\u77e9\u9635 - LegacyAuthorizationStrategy.DisplayName=\u9057\u7559\u6a21\u5f0f HudsonPrivateSecurityRealm.DisplayName=Jenkins\u4e13\u6709\u7528\u6237\u6570\u636e\u5e93 @@ -46,8 +44,6 @@ LegacySecurityRealm.Displayname=Servlet\u5bb9\u5668\u4ee3\u7406 UserDetailsServiceProxy.UnableToQuery=\u6ca1\u6709\u68c0\u7d22\u5230\u8fd9\u4e2a\u7528\u6237\u4fe1\u606f: {0} -ProjectMatrixAuthorizationStrategy.DisplayName=\u9879\u76ee\u77e9\u9635\u6388\u6743\u7b56\u7565 - PAMSecurityRealm.DisplayName=Unix\u7528\u6237/\u7ec4\u6570\u636e\u5e93 PAMSecurityRealm.ReadPermission=Jenkins\u9700\u8981\u6709/etc/shadow\u8bfb\u7684\u6743\u9650 PAMSecurityRealm.BelongToGroup={0}\u5fc5\u987b\u5c5e\u4e8e{1}\u7ec4\u6765\u8bfb\u53d6/etc/shadow diff --git a/core/src/main/resources/hudson/security/Messages_zh_TW.properties b/core/src/main/resources/hudson/security/Messages_zh_TW.properties index de69665baa..70e9876247 100644 --- a/core/src/main/resources/hudson/security/Messages_zh_TW.properties +++ b/core/src/main/resources/hudson/security/Messages_zh_TW.properties @@ -23,8 +23,6 @@ GlobalSecurityConfiguration.DisplayName=\u8a2d\u5b9a\u5168\u57df\u5b89\u5168\u6027 GlobalSecurityConfiguration.Description=\u4fdd\u8b77 Jenkins\uff0c\u5b9a\u7fa9\u8ab0\u53ef\u4ee5\u5b58\u53d6\u6216\u662f\u4f7f\u7528\u7cfb\u7d71\u3002 -GlobalMatrixAuthorizationStrategy.DisplayName=\u77e9\u9663\u578b\u5b89\u5168\u6027 - HudsonPrivateSecurityRealm.WouldYouLikeToSignUp=Jenkins \u4e0d\u8a8d\u5f97 {0} {1}\u3002\u60a8\u8981\u8a3b\u518a\u55ce? LegacyAuthorizationStrategy.DisplayName=\u820a\u7248\u6a21\u5f0f @@ -57,8 +55,6 @@ LegacySecurityRealm.Displayname=\u59d4\u6d3e\u7d66 Servlet Container UserDetailsServiceProxy.UnableToQuery=\u7121\u6cd5\u67e5\u8a62\u4f7f\u7528\u8005\u8cc7\u8a0a: {0} -ProjectMatrixAuthorizationStrategy.DisplayName=\u5c08\u6848\u578b\u77e9\u9663\u6388\u6b0a\u7b56\u7565 - PAMSecurityRealm.DisplayName=Unix \u4f7f\u7528\u8005\u3001\u7fa4\u7d44\u8cc7\u6599\u5eab PAMSecurityRealm.ReadPermission=Jenkins \u8981\u80fd\u8b80\u53d6 /etc/shadow PAMSecurityRealm.BelongToGroup={0} \u8981\u5728 {1} \u7fa4\u7d44\u88e1\uff0c\u4ee5\u4fbf\u8b80\u53d6 /etc/shadow diff --git a/core/src/main/resources/hudson/security/ProjectMatrixAuthorizationStrategy/help.html b/core/src/main/resources/hudson/security/ProjectMatrixAuthorizationStrategy/help.html deleted file mode 100644 index 0d2bdeb80d..0000000000 --- a/core/src/main/resources/hudson/security/ProjectMatrixAuthorizationStrategy/help.html +++ /dev/null @@ -1,11 +0,0 @@ -
- This mode is an extension to "Matrix-based security" that allows additional ACL matrix to be defined - for each project separately (which is done on the job configuration screen.) - -

- This allows you to say things like "Joe can access project A, B, and C but he can't see D." - See the help of "Matrix-based security" for the concept of matrix-based security in general. - -

- ACLs are additive, so the access rights granted below will be effective for all the projects. -

diff --git a/core/src/main/resources/hudson/security/ProjectMatrixAuthorizationStrategy/help_de.html b/core/src/main/resources/hudson/security/ProjectMatrixAuthorizationStrategy/help_de.html deleted file mode 100644 index ced065c3bc..0000000000 --- a/core/src/main/resources/hudson/security/ProjectMatrixAuthorizationStrategy/help_de.html +++ /dev/null @@ -1,13 +0,0 @@ -
- Dieser Modus erweitert die "Matrix-basierte Sicherheit" um eine zusätzliche ACL-Rechtematrix, - die für jedes Projekt individuell festgelegt werden kann (in der Konfigurationsmaske des jeweiligen Jobs). - -

- Dies erlaubt Ihnen eine Rechtevergabe wie z.B. "Joe darf auf Projekt A, B und C zugreifen - er - soll aber Projekt D nicht sehen dürfen". Lesen Sie den Hilfetext bei "Matrix-basierte Sicherheit", - um mehr über das Konzept der matrix-basierten Sicherheit im Allgemeinen zu erfahren. - -

- ACL-Rechte sind additiv. Dies bedeutet, dass die untenstehend erteilten Rechte für alle - Projekte als erteilt gelten. -

diff --git a/core/src/main/resources/hudson/security/ProjectMatrixAuthorizationStrategy/help_ja.html b/core/src/main/resources/hudson/security/ProjectMatrixAuthorizationStrategy/help_ja.html deleted file mode 100644 index 771a8be542..0000000000 --- a/core/src/main/resources/hudson/security/ProjectMatrixAuthorizationStrategy/help_ja.html +++ /dev/null @@ -1,10 +0,0 @@ -
- "行列による権限設定"の拡張し、プロジェクト毎に行列による権限設定することができます(ジョブの設定画面で行います)。 - -

- 例えば、"JoeはプロジェクトA、B、Cにアクセスできるが、Dは参照できない"といったことができます。 - 行列による権限設定のコンセプトについては、"行列による権限設定"のヘルプを参照してください。 - -

- ここで設定した権限は、すべてのプロジェクトの権限に追加されます。 -

diff --git a/core/src/main/resources/hudson/security/ProjectMatrixAuthorizationStrategy/help_zh_CN.html b/core/src/main/resources/hudson/security/ProjectMatrixAuthorizationStrategy/help_zh_CN.html deleted file mode 100644 index 5cdd5cdd10..0000000000 --- a/core/src/main/resources/hudson/security/ProjectMatrixAuthorizationStrategy/help_zh_CN.html +++ /dev/null @@ -1,9 +0,0 @@ -
- 这个授权模型扩展自"安全矩阵",允许把下面的ACL(访问控制列表)矩阵附加到每个项目定义中(在Job配置页面). - -

- 这允许你宣布类似这样的声明"约翰能够访问A,B和C,但是不能访问D." 查看"安全矩阵"的帮助文档来了解安全矩阵. - -

- ACL配置是追加的,就是说下面的访问控制会追加到所有的项目配置中。 -

diff --git a/core/src/main/resources/hudson/security/ProjectMatrixAuthorizationStrategy/help_zh_TW.html b/core/src/main/resources/hudson/security/ProjectMatrixAuthorizationStrategy/help_zh_TW.html deleted file mode 100644 index 59856a2d21..0000000000 --- a/core/src/main/resources/hudson/security/ProjectMatrixAuthorizationStrategy/help_zh_TW.html +++ /dev/null @@ -1,11 +0,0 @@ -
- 這是「矩陣型安全性」的擴充,可以分別對專案定義額外的存取控制清單 (ACL) 矩陣 - (在作業設定畫面裡調整)。 - -

- 讓您能做到「Joe 可以看到 A, B, C 專案,但是看不到 D」這種程度的設定。 - 可以看看「矩陣型安全性」的說明,了解矩陣型安全性的基本概念。 - -

- ACL 會逐一累加,所以下列授與的存取權限會影響到每一個專案。 -

diff --git a/test/pom.xml b/test/pom.xml index 790ad4ae6a..53b5eaf1b1 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -81,6 +81,11 @@ THE SOFTWARE. mailer 1.5 + + org.jenkins-ci.plugins + matrix-auth + 1.0 + org.mortbay.jetty jetty diff --git a/war/pom.xml b/war/pom.xml index bd7c269983..1b3d4b30ea 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -338,6 +338,12 @@ THE SOFTWARE. 1.5 hpi + + org.jenkins-ci.plugins + matrix-auth + 1.0 + hpi + ${project.build.directory}/${project.build.finalName}/WEB-INF/plugins true From 89149277ae2bba5af702ba01cbb70bd3965b2859 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 4 Oct 2013 17:06:28 -0400 Subject: [PATCH 186/203] matrix-auth 1.0.2 (couple of fixups) --- .../java/hudson/ClassicPluginStrategy.java | 2 +- .../main/resources/hudson/security/table.css | 60 ------------------- test/pom.xml | 2 +- war/pom.xml | 2 +- 4 files changed, 3 insertions(+), 63 deletions(-) delete mode 100644 core/src/main/resources/hudson/security/table.css diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java index 578fe58ef2..db9ed76603 100644 --- a/core/src/main/java/hudson/ClassicPluginStrategy.java +++ b/core/src/main/java/hudson/ClassicPluginStrategy.java @@ -273,7 +273,7 @@ public class ClassicPluginStrategy implements PluginStrategy { new DetachedPlugin("ldap","1.467.*","1.0"), new DetachedPlugin("pam-auth","1.467.*","1.0"), new DetachedPlugin("mailer","1.493.*","1.2"), - new DetachedPlugin("matrix-auth","1.535.*","1.0") + new DetachedPlugin("matrix-auth","1.535.*","1.0.2") ); /** diff --git a/core/src/main/resources/hudson/security/table.css b/core/src/main/resources/hudson/security/table.css deleted file mode 100644 index 3a83f937e4..0000000000 --- a/core/src/main/resources/hudson/security/table.css +++ /dev/null @@ -1,60 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -.global-matrix-authorization-strategy-table { - border-collapse: collapse; - border-spacing: 0; - border: 1px solid #D3D7CF; -} - -.global-matrix-authorization-strategy-table TH { - padding: 0.2em; -} - -.global-matrix-authorization-strategy-table TD.blank { - vertical-align: middle; - padding: 0.2em; -} - -.global-matrix-authorization-strategy-table .caption-row TH { - font-weight: lighter; - writing-mode: tb-rl; /* works in IE, not FF */ - padding: 0; -} - -.global-matrix-authorization-strategy-table TD { - border: 1px solid #D3D7CF; -} - -.global-matrix-authorization-strategy-table TD.left-most { - text-align: left; - border-left: none; - white-space: nowrap; -} - -.global-matrix-authorization-strategy-table TD.stop { - border-top: 1px solid white; - border-right: 1px solid white; - border-bottom: 1px solid white; - white-space: nowrap; -} diff --git a/test/pom.xml b/test/pom.xml index 53b5eaf1b1..53873cc2b1 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -84,7 +84,7 @@ THE SOFTWARE. org.jenkins-ci.plugins matrix-auth - 1.0 + 1.0.2 org.mortbay.jetty diff --git a/war/pom.xml b/war/pom.xml index 1b3d4b30ea..1c278dee71 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -341,7 +341,7 @@ THE SOFTWARE. org.jenkins-ci.plugins matrix-auth - 1.0 + 1.0.2 hpi From 4613b15cc431df19e73b21caff63b3bbe262a761 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 4 Oct 2013 17:32:19 -0400 Subject: [PATCH 187/203] Split out ui-samples-plugin into its own repo. --- .idea/compiler.xml | 4 - .idea/encodings.xml | 1 - .idea/groovyc.xml | 1 - changelog.html | 2 + pom.xml | 1 - ui-samples-plugin/pom.xml | 119 -------------- .../ui_samples/AutoCompleteTextBox.java | 113 ------------- .../plugins/ui_samples/CopyButton.java | 29 ---- .../plugins/ui_samples/DropdownList.java | 93 ----------- .../plugins/ui_samples/DynamicComboBox.java | 64 -------- .../ui_samples/DynamicDropDownListBox.java | 54 ------- .../FormFieldValidationWithContext.java | 127 --------------- .../plugins/ui_samples/HeteroList.java | 150 ------------------ .../InpageNavigationWithBreadcrumb.java | 30 ---- .../plugins/ui_samples/JavaScriptProxy.java | 32 ---- .../ui_samples/ModularizeViewScript.java | 28 ---- .../ui_samples/NavigationContextMenu.java | 50 ------ .../plugins/ui_samples/NotificationBar.java | 29 ---- .../plugins/ui_samples/ProgressBar.java | 29 ---- .../ui_samples/ProgressivelyRendered.java | 77 --------- .../java/jenkins/plugins/ui_samples/Root.java | 52 ------ .../ui_samples/SyntaxHighlightedTextArea.java | 29 ---- .../jenkins/plugins/ui_samples/UISample.java | 135 ---------------- .../ui_samples/UISampleDescriptor.java | 13 -- .../src/main/resources/index.jelly | 3 - .../AutoCompleteTextBox/index.jelly | 36 ----- .../ui_samples/CopyButton/index.groovy | 20 --- .../ui_samples/CopyButton/index.properties | 11 -- .../DropdownList/Apple/config.jelly | 29 ---- .../DropdownList/Banana/config.jelly | 29 ---- .../ui_samples/DropdownList/index.jelly | 50 ------ .../ui_samples/DynamicComboBox/index.jelly | 38 ----- .../DynamicDropDownListBox/index.jelly | 41 ----- .../City/config.groovy | 7 - .../State/config.groovy | 19 --- .../index.groovy | 22 --- .../index.properties | 9 -- .../HeteroList/ChoiceEntry/config.jelly | 32 ---- .../ui_samples/HeteroList/Config/config.jelly | 33 ---- .../HeteroList/SimpleEntry/config.jelly | 31 ---- .../ui_samples/HeteroList/configure.jelly | 42 ----- .../plugins/ui_samples/HeteroList/index.jelly | 41 ----- .../header.groovy | 6 - .../index.groovy | 21 --- .../index.properties | 5 - .../ui_samples/JavaScriptProxy/index.jelly | 45 ------ .../ModularizeViewScript/index.groovy | 43 ----- .../NavigationContextMenu/index.groovy | 48 ------ .../NavigationContextMenu/index.properties | 27 ---- .../ui_samples/NotificationBar/index.groovy | 22 --- .../NotificationBar/index.properties | 6 - .../ui_samples/ProgressBar/index.groovy | 30 ---- .../ProgressivelyRendered/index.jelly | 50 ------ .../plugins/ui_samples/Root/index.jelly | 60 ------- .../SyntaxHighlightedTextArea/index.groovy | 33 ---- .../main/resources/lib/samples/sample.jelly | 51 ------ .../src/main/resources/lib/samples/taglib | 0 war/pom.xml | 2 - 58 files changed, 2 insertions(+), 2202 deletions(-) delete mode 100644 ui-samples-plugin/pom.xml delete mode 100644 ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/AutoCompleteTextBox.java delete mode 100644 ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/CopyButton.java delete mode 100644 ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/DropdownList.java delete mode 100644 ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/DynamicComboBox.java delete mode 100644 ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/DynamicDropDownListBox.java delete mode 100644 ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/FormFieldValidationWithContext.java delete mode 100644 ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/HeteroList.java delete mode 100644 ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/InpageNavigationWithBreadcrumb.java delete mode 100644 ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/JavaScriptProxy.java delete mode 100644 ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/ModularizeViewScript.java delete mode 100644 ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/NavigationContextMenu.java delete mode 100644 ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/NotificationBar.java delete mode 100644 ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/ProgressBar.java delete mode 100644 ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/ProgressivelyRendered.java delete mode 100644 ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/Root.java delete mode 100644 ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/SyntaxHighlightedTextArea.java delete mode 100644 ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/UISample.java delete mode 100644 ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/UISampleDescriptor.java delete mode 100644 ui-samples-plugin/src/main/resources/index.jelly delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/AutoCompleteTextBox/index.jelly delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/CopyButton/index.groovy delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/CopyButton/index.properties delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DropdownList/Apple/config.jelly delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DropdownList/Banana/config.jelly delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DropdownList/index.jelly delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DynamicComboBox/index.jelly delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DynamicDropDownListBox/index.jelly delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/FormFieldValidationWithContext/City/config.groovy delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/FormFieldValidationWithContext/State/config.groovy delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/FormFieldValidationWithContext/index.groovy delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/FormFieldValidationWithContext/index.properties delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/ChoiceEntry/config.jelly delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/Config/config.jelly delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/SimpleEntry/config.jelly delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/configure.jelly delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/index.jelly delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/InpageNavigationWithBreadcrumb/header.groovy delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/InpageNavigationWithBreadcrumb/index.groovy delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/InpageNavigationWithBreadcrumb/index.properties delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/JavaScriptProxy/index.jelly delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/ModularizeViewScript/index.groovy delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/NavigationContextMenu/index.groovy delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/NavigationContextMenu/index.properties delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/NotificationBar/index.groovy delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/NotificationBar/index.properties delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/ProgressBar/index.groovy delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/ProgressivelyRendered/index.jelly delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/Root/index.jelly delete mode 100644 ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/SyntaxHighlightedTextArea/index.groovy delete mode 100644 ui-samples-plugin/src/main/resources/lib/samples/sample.jelly delete mode 100644 ui-samples-plugin/src/main/resources/lib/samples/taglib diff --git a/.idea/compiler.xml b/.idea/compiler.xml index cd8f01b071..7c9af026e3 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -5,8 +5,6 @@ - - @@ -42,7 +40,6 @@ - @@ -53,7 +50,6 @@ - diff --git a/.idea/encodings.xml b/.idea/encodings.xml index 8b72c68c7d..bb7dc2c6f1 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -7,7 +7,6 @@ - diff --git a/.idea/groovyc.xml b/.idea/groovyc.xml index c24d9163c1..117b3f5aa7 100644 --- a/.idea/groovyc.xml +++ b/.idea/groovyc.xml @@ -4,7 +4,6 @@ - diff --git a/changelog.html b/changelog.html index 7ef98c0787..a07bb6c40c 100644 --- a/changelog.html +++ b/changelog.html @@ -63,6 +63,8 @@ Upcoming changes (issue 8957)
  • Split matrix authorization strategies into an independent plugin. +
  • + UI Samples plugin fully separated from core. To view samples during plugin development or at any other time, just install from the update center.
  • SCM polling sometimes broken since 1.527 due to a change in how environment variables are calculated. (issue 19307) diff --git a/pom.xml b/pom.xml index 222b5e53ba..7cff659191 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,6 @@ THE SOFTWARE. core - ui-samples-plugin war test cli diff --git a/ui-samples-plugin/pom.xml b/ui-samples-plugin/pom.xml deleted file mode 100644 index 75cadd59e3..0000000000 --- a/ui-samples-plugin/pom.xml +++ /dev/null @@ -1,119 +0,0 @@ - - - - 4.0.0 - - - org.jenkins-ci.main - pom - 1.535-SNAPSHOT - - - ui-samples-plugin - hpi - - Jenkins UI sample plugin - - - - org.jenkins-ci.main - jenkins-core - ${project.version} - provided - - - - org.jenkins-ci.main - jenkins-test-harness - ${project.version} - test - - - org.jenkins-ci.main - jenkins-war - war - ${project.version} - test - - - javax.servlet - servlet-api - 2.4 - provided - - - - - - ${project.artifactId} - package - - - src/main/resources - - - src/main/java - - - - - org.jenkins-ci.tools - maven-hpi-plugin - - true - - true - - - - org.kohsuke.stapler - maven-stapler-plugin - - true - - - org.jvnet.localizer - maven-localizer-plugin - - - - - generate - - - Messages.properties - target/generated-sources/localizer - - - - - - - - diff --git a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/AutoCompleteTextBox.java b/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/AutoCompleteTextBox.java deleted file mode 100644 index 9a5e1afa99..0000000000 --- a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/AutoCompleteTextBox.java +++ /dev/null @@ -1,113 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2010, InfraDNA, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -package jenkins.plugins.ui_samples; - -import hudson.Extension; -import hudson.model.AutoCompletionCandidates; -import org.kohsuke.stapler.QueryParameter; - -/** - * Adding auto-completion to the text box. - * - * @author Kohsuke Kawaguchi - */ -@Extension -public class AutoCompleteTextBox extends UISample { - @Override - public String getDescription() { - return "Provide auto-completion to the text box"; - } - - @Extension - public static final class DescriptorImpl extends UISampleDescriptor { - /** - * This method provides auto-completion items for the 'state' field. - * Stapler finds this method via the naming convention. - * - * @param value - * The text that the user entered. - */ - public AutoCompletionCandidates doAutoCompleteState(@QueryParameter String value) { - AutoCompletionCandidates c = new AutoCompletionCandidates(); - for (String state : STATES) - if (state.toLowerCase().startsWith(value.toLowerCase())) - c.add(state); - return c; - } - } - - private static final String[] STATES = new String[]{ - "Alabama", - "Alaska", - "Arizona", - "Arkansas", - "California", - "Colorado", - "Connecticut", - "Delaware", - "Florida", - "Georgia", - "Hawaii", - "Idaho", - "Illinois", - "Indiana", - "Iowa", - "Kansas", - "Kentucky", - "Louisiana", - "Maine", - "Maryland", - "Massachusetts", - "Michigan", - "Minnesota", - "Mississippi", - "Missouri", - "Montana", - "Nebraska", - "Nevada", - "New Hampshire", - "New Jersey", - "New Mexico", - "New York", - "North Carolina", - "North Dakota", - "Ohio", - "Oklahoma", - "Oregon", - "Pennsylvania", - "Rhode Island", - "South Carolina", - "South Dakota", - "Tennessee", - "Texas", - "Utah", - "Vermont", - "Virginia", - "Washington", - "West Virginia", - "Wisconsin", - "Wyoming" - }; -} diff --git a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/CopyButton.java b/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/CopyButton.java deleted file mode 100644 index 6a0075ed0a..0000000000 --- a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/CopyButton.java +++ /dev/null @@ -1,29 +0,0 @@ -package jenkins.plugins.ui_samples; - -import hudson.Extension; - -import java.util.Arrays; -import java.util.List; - -/** - * @author Kohsuke Kawaguchi - */ -@Extension -public class CopyButton extends UISample { - @Override - public String getDescription() { - return "A small button to copy text into a clipboard"; - } - - public List getSourceFiles() { - // TODO: generate this from index - return Arrays.asList( - new SourceFile("index.groovy")); - } - - @Extension - public static final class DescriptorImpl extends UISampleDescriptor { - } -} - - diff --git a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/DropdownList.java b/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/DropdownList.java deleted file mode 100644 index 8dcb85c95f..0000000000 --- a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/DropdownList.java +++ /dev/null @@ -1,93 +0,0 @@ -package jenkins.plugins.ui_samples; - -import hudson.DescriptorExtensionList; -import hudson.Extension; -import hudson.ExtensionPoint; -import hudson.model.Describable; -import hudson.model.Descriptor; -import jenkins.model.Jenkins; -import hudson.util.XStream2; -import java.io.IOException; -import java.util.List; -import javax.servlet.ServletException; - -import org.kohsuke.stapler.DataBoundConstructor; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; - -/** - * @author Alan.Harder@oracle.com - */ -@Extension -public class DropdownList extends UISample { - - @Override - public String getDescription() { - return "Show different form elements based on choice in a <select> control"; - } - - public Fruit getFruit() { - // Could return currently configured/saved item here to initialized form with this data - return null; - } - - public DescriptorExtensionList> getFruitDescriptors() { - return Jenkins.getInstance().>getDescriptorList(Fruit.class); - } - - // Process form data and show it as serialized XML - public void doSubmit(StaplerRequest req, StaplerResponse rsp) throws ServletException, IOException { - // stapler-class in form data tells Stapler which Fruit subclass to use - Fruit fruit = req.bindJSON(Fruit.class, req.getSubmittedForm().getJSONObject("fruit")); - rsp.setContentType("text/plain"); - new XStream2().toXML(fruit, rsp.getWriter()); - } - - @Override - public List getSourceFiles() { - List list = new java.util.ArrayList(super.getSourceFiles()); - list.add(new SourceFile("Apple/config.jelly")); - list.add(new SourceFile("Banana/config.jelly")); - return list; - } - - @Extension - public static final class DescriptorImpl extends UISampleDescriptor { - } - - public static abstract class Fruit implements ExtensionPoint, Describable { - protected String name; - protected Fruit(String name) { this.name = name; } - - public Descriptor getDescriptor() { - return Jenkins.getInstance().getDescriptor(getClass()); - } - } - - public static class FruitDescriptor extends Descriptor { - public FruitDescriptor(Class clazz) { - super(clazz); - } - public String getDisplayName() { - return clazz.getSimpleName(); - } - } - - public static class Apple extends Fruit { - private int seeds; - @DataBoundConstructor public Apple(int seeds) { - super("Apple"); - this.seeds = seeds; - } - @Extension public static final FruitDescriptor D = new FruitDescriptor(Apple.class); - } - - public static class Banana extends Fruit { - private boolean yellow; - @DataBoundConstructor public Banana(boolean yellow) { - super("Banana"); - this.yellow = yellow; - } - @Extension public static final FruitDescriptor D = new FruitDescriptor(Banana.class); - } -} diff --git a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/DynamicComboBox.java b/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/DynamicComboBox.java deleted file mode 100644 index edb72122d7..0000000000 --- a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/DynamicComboBox.java +++ /dev/null @@ -1,64 +0,0 @@ -package jenkins.plugins.ui_samples; - -import hudson.Extension; -import hudson.util.ComboBoxModel; -import hudson.util.ListBoxModel; -import org.kohsuke.stapler.QueryParameter; - -/** - * Combo box that changes the contents based on the values of other controls. - * - * @author Kohsuke Kawaguchi - */ -@Extension -public class DynamicComboBox extends UISample { - - @Override - public String getDescription() { - return "Updates the contents of a combo box control dynamically based on selections of other controls"; - } - - // these getter methods should return the current value, which form the initial selection. - - public String getAlbum() { - return "3"; - } - - public String getTitle() { - return "Rocker"; - } - - @Extension - public static final class DescriptorImpl extends UISampleDescriptor { - /** - * This method determines the values of the album drop-down list box. - */ - public ListBoxModel doFillAlbumItems() { - ListBoxModel m = new ListBoxModel(); - m.add("Yellow Submarine","1"); - m.add("Abbey Road","2"); - m.add("Let It Be","3"); - return m; - } - - /** - * This method determines the values of the song title combo box. - * Note that it takes the album information as a parameter, so the contents - * of the combo box changes depending on the currently selected album. - */ - public ComboBoxModel doFillTitleItems(@QueryParameter int album) { - switch (album) { - case 1: - return new ComboBoxModel("Yellow Submarine","Only a Northern Song","All You Need Is Love"); - case 2: - return new ComboBoxModel("Come Together","Something","I Want You"); - case 3: - return new ComboBoxModel("The One After 909","Rocker","Get Back"); - default: - // if no value is selected in the album, we'll get 0 - return new ComboBoxModel(); - } - } - - } -} \ No newline at end of file diff --git a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/DynamicDropDownListBox.java b/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/DynamicDropDownListBox.java deleted file mode 100644 index 73823869d0..0000000000 --- a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/DynamicDropDownListBox.java +++ /dev/null @@ -1,54 +0,0 @@ -package jenkins.plugins.ui_samples; - -import hudson.Extension; -import hudson.util.ListBoxModel; -import org.kohsuke.stapler.QueryParameter; - -import static java.util.Arrays.asList; - -/** - * Example of a dynamic drop-down list box that changes the contents dynamically based on the values of other controls. - * - * @author Kohsuke Kawaguchi - */ -@Extension -public class DynamicDropDownListBox extends UISample { - - @Override - public String getDescription() { - return "Updates the contents of a <select> control dynamically based on selections of other controls"; - } - - // these getter methods should return the current value, which form the initial selection. - - public String getCountry() { - return "USA"; - } - - public String getState() { - return "USA:B"; - } - - public String getCity() { - return "USA:B:Z"; - } - - @Extension - public static final class DescriptorImpl extends UISampleDescriptor { - public ListBoxModel doFillStateItems(@QueryParameter String country) { - ListBoxModel m = new ListBoxModel(); - for (String s : asList("A","B","C")) - m.add(String.format("State %s in %s", s, country), - country+':'+s); - return m; - } - - public ListBoxModel doFillCityItems(@QueryParameter String country, @QueryParameter String state) { - ListBoxModel m = new ListBoxModel(); - for (String s : asList("X","Y","Z")) - m.add(String.format("City %s in %s %s", s, state, country), - state+':'+s); - return m; - } - } -} diff --git a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/FormFieldValidationWithContext.java b/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/FormFieldValidationWithContext.java deleted file mode 100644 index 68f6ec0690..0000000000 --- a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/FormFieldValidationWithContext.java +++ /dev/null @@ -1,127 +0,0 @@ -package jenkins.plugins.ui_samples; - -import hudson.Extension; -import hudson.RelativePath; -import hudson.model.AbstractDescribableImpl; -import hudson.model.Descriptor; -import hudson.util.FormValidation; -import org.kohsuke.stapler.DataBoundConstructor; -import org.kohsuke.stapler.QueryParameter; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -/** - * How to access values of the nearby input fields when you do form field validation. - * - * @author Kohsuke Kawaguchi - */ -@Extension -public class FormFieldValidationWithContext extends UISample { - private List states = new ArrayList(Arrays.asList( - new State("California",new City("Sacramento"), Arrays.asList(new City("San Francisco"),new City("Los Angeles"))), - new State("New York",new City("New York"), Arrays.asList(new City("Albany"),new City("Ithaca"))) - )); - - public FormFieldValidationWithContext() { - } - - @DataBoundConstructor - public FormFieldValidationWithContext(List states) { - this.states = states; - } - - @Override - public String getDescription() { - return "How to access values of the nearby input fields when you do form field validation"; - } - - public List getStates() { - return states; - } - - @Override - public List getSourceFiles() { - List r = super.getSourceFiles(); - r.add(new SourceFile("City/config.groovy")); - r.add(new SourceFile("State/config.groovy")); - return r; - } - - public static class State extends AbstractDescribableImpl { - /* - I'm lazy and just exposing fields as opposed to getter/setter. - Jenkins doesn't care and works correctly either way. - */ - public String name; - public City capital; - public List cities; - - @DataBoundConstructor - public State(String name, City capital, List cities) { - this.name = name; - this.capital = capital; - this.cities = cities; - } - - @Extension - public static class DescriptorImpl extends Descriptor { - @Override - public String getDisplayName() { - return ""; - } - - public FormValidation doCheckName(@QueryParameter String value, - @RelativePath("capital") @QueryParameter String name) { - /* - @RelativePath("capital") @QueryParameter - ... is short for - @RelativePath("capital") @QueryParameter("name") - ... and thus can be thought of "capital/name" - - so this matches the current city name entered as the capital of this state - */ - - return FormValidation.ok("Are you sure " + name + " is a capital of " + value + "?"); - } - } - } - - public static class City extends AbstractDescribableImpl { - public String name; - - @DataBoundConstructor - public City(String name) { - this.name = name; - } - - @Extension - public static class DescriptorImpl extends Descriptor { - @Override - public String getDisplayName() { - return ""; - } - - public FormValidation doCheckName(@QueryParameter String value, - @RelativePath("..") @QueryParameter String name) { - /* - @RelativePath("..") @QueryParameter - ... is short for - @RelativePath("..") @QueryParameter("name") - ... and thus can be thought of "../name" - - in the UI, fields for city is wrapped inside those of state, so "../name" binds - to the name field in the state. - */ - - if (name==null || value==null || value.contains(name)) return FormValidation.ok(); - return FormValidation.warning("City name doesn't contain "+name); - } - } - } - - @Extension - public static class DescriptorImpl extends UISampleDescriptor { - } -} diff --git a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/HeteroList.java b/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/HeteroList.java deleted file mode 100644 index 6b832e8c62..0000000000 --- a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/HeteroList.java +++ /dev/null @@ -1,150 +0,0 @@ -/* - * The MIT License - * - * Copyright 2013 Jesse Glick. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -package jenkins.plugins.ui_samples; - -import hudson.Extension; -import hudson.XmlFile; -import hudson.model.AbstractDescribableImpl; -import hudson.model.Descriptor; -import hudson.util.FormApply; -import hudson.util.ListBoxModel; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import javax.servlet.ServletException; -import jenkins.model.Jenkins; -import org.kohsuke.stapler.DataBoundConstructor; -import org.kohsuke.stapler.HttpResponse; -import org.kohsuke.stapler.StaplerRequest; - -@Extension public final class HeteroList extends UISample { - - @Override public String getDescription() { - return "Show a heterogeneous list of subitems with different data bindings for radio buttons and checkboxes"; - } - - @Override public List getSourceFiles() { - return super.getSourceFiles(); - // TODO add others - } - - @Extension public static final class DescriptorImpl extends UISampleDescriptor {} - - public XmlFile getConfigFile() { - return new XmlFile(new File(Jenkins.getInstance().getRootDir(), "stuff.xml")); - } - - private Config config; - - public HeteroList() throws IOException { - XmlFile xml = getConfigFile(); - if (xml.exists()) { - xml.unmarshal(this); - } - } - - public Config getConfig() { - return config; - } - - public void setConfig(Config config) { - this.config = config; - } - - public HttpResponse doConfigSubmit(StaplerRequest req) throws ServletException, IOException { - config = null; // otherwise bindJSON will never clear it once set - req.bindJSON(this, req.getSubmittedForm()); - getConfigFile().write(this); - return FormApply.success("."); - } - - public static final class Config extends AbstractDescribableImpl { - - private final List entries; - - @DataBoundConstructor public Config(List entries) { - this.entries = entries != null ? new ArrayList(entries) : Collections.emptyList(); - } - - public List getEntries() { - return Collections.unmodifiableList(entries); - } - - @Extension public static class DescriptorImpl extends Descriptor { - @Override public String getDisplayName() {return "";} - } - - } - - public static abstract class Entry extends AbstractDescribableImpl {} - - public static final class SimpleEntry extends Entry { - - private final String text; - - @DataBoundConstructor public SimpleEntry(String text) { - this.text = text; - } - - public String getText() { - return text; - } - - @Extension public static class DescriptorImpl extends Descriptor { - @Override public String getDisplayName() { - return "Simple Entry"; - } - } - - } - - public static final class ChoiceEntry extends Entry { - - private final String choice; - - @DataBoundConstructor public ChoiceEntry(String choice) { - this.choice = choice; - } - - public String getChoice() { - return choice; - } - - @Extension public static class DescriptorImpl extends Descriptor { - - @Override public String getDisplayName() { - return "Choice Entry"; - } - - public ListBoxModel doFillChoiceItems() { - return new ListBoxModel().add("good").add("bad").add("ugly"); - } - - } - } - -} diff --git a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/InpageNavigationWithBreadcrumb.java b/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/InpageNavigationWithBreadcrumb.java deleted file mode 100644 index 1c20d7fe89..0000000000 --- a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/InpageNavigationWithBreadcrumb.java +++ /dev/null @@ -1,30 +0,0 @@ -package jenkins.plugins.ui_samples; - -import hudson.Extension; - -import java.util.Arrays; -import java.util.List; - -/** - * @author Kohsuke Kawaguchi - */ -@Extension -public class InpageNavigationWithBreadcrumb extends UISample { - @Override - public String getDescription() { - return "Adds in-page navigation with extra breadcrumb"; - } - - public List getSourceFiles() { - // TODO: generate this from index - return Arrays.asList( - new SourceFile("index.groovy"), - new SourceFile("header.groovy")); - } - - @Extension - public static final class DescriptorImpl extends UISampleDescriptor { - } -} - - diff --git a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/JavaScriptProxy.java b/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/JavaScriptProxy.java deleted file mode 100644 index 80afaa2649..0000000000 --- a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/JavaScriptProxy.java +++ /dev/null @@ -1,32 +0,0 @@ -package jenkins.plugins.ui_samples; - -import hudson.Extension; -import org.kohsuke.stapler.bind.JavaScriptMethod; - -/** - * "Export" Java objects to JavaScript in the browser as a proxy object, so that - * you can make ajax-calls to the server later. - * - * @author Kohsuke Kawaguchi - */ -@Extension -public class JavaScriptProxy extends UISample { - private int i; - - @Override - public String getDescription() { - return "Use JavaScript proxy objects to access server-side Java objects from inside the browser."; - } - - /** - * The annotation exposes this method to JavaScript proxy. - */ - @JavaScriptMethod - public int increment(int n) { - return i+=n; - } - - @Extension - public static final class DescriptorImpl extends UISampleDescriptor { - } -} diff --git a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/ModularizeViewScript.java b/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/ModularizeViewScript.java deleted file mode 100644 index 36eca31e3d..0000000000 --- a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/ModularizeViewScript.java +++ /dev/null @@ -1,28 +0,0 @@ -package jenkins.plugins.ui_samples; - -import hudson.Extension; - -import java.util.Arrays; -import java.util.List; - -/** - * Define portions of view fragments in separate methods/classes to improve reuse. - * - * @author Kohsuke Kawaguchi - */ -@Extension -public class ModularizeViewScript extends UISample { - @Override - public String getDescription() { - return "Define portions of view fragments in separate methods/classes to improve reuse"; - } - - public List getSourceFiles() { - // TODO: generate this from index - return Arrays.asList(new SourceFile("index.groovy")); - } - - @Extension - public static final class DescriptorImpl extends UISampleDescriptor { - } -} diff --git a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/NavigationContextMenu.java b/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/NavigationContextMenu.java deleted file mode 100644 index 6770a566ca..0000000000 --- a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/NavigationContextMenu.java +++ /dev/null @@ -1,50 +0,0 @@ -package jenkins.plugins.ui_samples; - -import hudson.Extension; -import jenkins.model.ModelObjectWithChildren; -import jenkins.model.ModelObjectWithContextMenu; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; - -/** - * @author Kohsuke Kawaguchi - */ -@Extension -public class NavigationContextMenu extends UISample implements ModelObjectWithContextMenu, ModelObjectWithChildren { - @Override - public String getDescription() { - return "Integrate with navigational context menu to provider quick access around object graph"; - } - - /** - * This method is called via AJAX to obtain the context menu for this model object. - */ - public ContextMenu doContextMenu(StaplerRequest request, StaplerResponse response) throws Exception { - if (false) { - // this implementation is suffice for most ModelObjects. It uses sidepanel.jelly/.groovy to - // generate the context menu - return new ContextMenu().from(this,request,response); - } else { - // otherwise you can also programatically create them. - // see the javadoc for various convenience methods to add items - return new ContextMenu() - .add("http://jenkins-ci.org/","Jenkins project") - .add("http://www.cloudbees.com/","CloudBees") - .add(new MenuItem().withContextRelativeUrl("/").withStockIcon("gear.png").withDisplayName("top page")); - } - } - - public ContextMenu doChildrenContextMenu(StaplerRequest request, StaplerResponse response) throws Exception { - // You implement this method in much the same way you do doContextMenu - return new ContextMenu() - .add("http://yahoo.com/","Yahoo") - .add("http://google.com/","Google") - .add("http://microsoft.com/","Microsoft"); - } - - @Extension - public static final class DescriptorImpl extends UISampleDescriptor { - } -} - - diff --git a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/NotificationBar.java b/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/NotificationBar.java deleted file mode 100644 index cf81df117b..0000000000 --- a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/NotificationBar.java +++ /dev/null @@ -1,29 +0,0 @@ -package jenkins.plugins.ui_samples; - -import hudson.Extension; - -import java.util.Arrays; -import java.util.List; - -/** - * @author Kohsuke Kawaguchi - */ -@Extension -public class NotificationBar extends UISample { - @Override - public String getDescription() { - return "Notification bar shows a transient message on the top of the page"; - } - - public List getSourceFiles() { - // TODO: generate this from index - return Arrays.asList( - new SourceFile("index.groovy")); - } - - @Extension - public static final class DescriptorImpl extends UISampleDescriptor { - } -} - - diff --git a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/ProgressBar.java b/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/ProgressBar.java deleted file mode 100644 index 49b7094e80..0000000000 --- a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/ProgressBar.java +++ /dev/null @@ -1,29 +0,0 @@ -package jenkins.plugins.ui_samples; - -import hudson.Extension; - -import java.util.Arrays; -import java.util.List; - -/** - * @author Kohsuke Kawaguchi - */ -@Extension -public class ProgressBar extends UISample { - @Override - public String getDescription() { - return "Shows you how to use the progress bar widget that's used in the executor view and other places"; - } - - public List getSourceFiles() { - // TODO: generate this from index - return Arrays.asList( - // new SourceFile(getClass().getSimpleName() + ".java"), // nothing interesting in the Java source file - new SourceFile("index.groovy")); - } - - @Extension - public static final class DescriptorImpl extends UISampleDescriptor { - } -} - diff --git a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/ProgressivelyRendered.java b/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/ProgressivelyRendered.java deleted file mode 100644 index e70729e5be..0000000000 --- a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/ProgressivelyRendered.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * The MIT License - * - * Copyright 2012 Jesse Glick. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -package jenkins.plugins.ui_samples; - -import hudson.Extension; -import java.util.LinkedList; -import java.util.List; -import jenkins.util.ProgressiveRendering; -import net.sf.json.JSON; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; - -@Extension -public class ProgressivelyRendered extends UISample { - - @Override public String getDescription() { - return "Shows how to use progressively rendered content to avoid overloading the server with a slow HTTP request."; - } - - public ProgressiveRendering factor(final String numberS) { - return new ProgressiveRendering() { - final List newFactors = new LinkedList(); - @Override protected void compute() throws Exception { - int number = Integer.parseInt(numberS); // try entering a nonnumeric value! - // Deliberately inefficient: - for (int i = 1; i <= number; i++) { - if (canceled()) { - return; - } - if (i % 1000000 == 0) { - Thread.sleep(10); // take a breather - } - if (number % i == 0) { - synchronized (this) { - newFactors.add(i); - } - } - progress(((double) i) / number); - } - } - @Override protected synchronized JSON data() { - JSONArray r = new JSONArray(); - for (int i : newFactors) { - r.add(i); - } - newFactors.clear(); - return new JSONObject().accumulate("newfactors", r); - } - }; - } - - @Extension - public static final class DescriptorImpl extends UISampleDescriptor {} - -} diff --git a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/Root.java b/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/Root.java deleted file mode 100644 index f22e01f11c..0000000000 --- a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/Root.java +++ /dev/null @@ -1,52 +0,0 @@ -package jenkins.plugins.ui_samples; - -import hudson.Extension; -import hudson.model.RootAction; -import jenkins.model.ModelObjectWithContextMenu; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; - -import java.util.List; - -/** - * Entry point to all the UI samples. - * - * @author Kohsuke Kawaguchi - */ -@Extension -public class Root implements RootAction, ModelObjectWithContextMenu { - public String getIconFileName() { - return "gear.png"; - } - - public String getDisplayName() { - return "UI Samples"; - } - - public String getUrlName() { - return "ui-samples"; - } - - public UISample getDynamic(String name) { - for (UISample ui : getAll()) - if (ui.getUrlName().equals(name)) - return ui; - return null; - } - - public List getAll() { - return UISample.all(); - } - - public List getAllGroovy() { - return UISample.getGroovySamples(); - } - - public List getAllOther() { - return UISample.getOtherSamples(); - } - - public ContextMenu doContextMenu(StaplerRequest request, StaplerResponse response) throws Exception { - return new ContextMenu().addAll(getAll()); - } -} diff --git a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/SyntaxHighlightedTextArea.java b/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/SyntaxHighlightedTextArea.java deleted file mode 100644 index 514d572404..0000000000 --- a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/SyntaxHighlightedTextArea.java +++ /dev/null @@ -1,29 +0,0 @@ -package jenkins.plugins.ui_samples; - -import hudson.Extension; - -import java.util.Arrays; -import java.util.List; - -/** - * Syntax-highlighted text area (powered by CodeMirror). - * - * @author Kohsuke Kawaguchi - */ -@Extension -public class SyntaxHighlightedTextArea extends UISample { - @Override - public String getDescription() { - return "Syntax-highlighted text area powered by CodeMirror"; - } - - public List getSourceFiles() { - // TODO: generate this from index - return Arrays.asList(new SourceFile(getClass().getSimpleName() + ".java"), - new SourceFile("index.groovy")); - } - - @Extension - public static final class DescriptorImpl extends UISampleDescriptor { - } -} diff --git a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/UISample.java b/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/UISample.java deleted file mode 100644 index 5ba7bae936..0000000000 --- a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/UISample.java +++ /dev/null @@ -1,135 +0,0 @@ -package jenkins.plugins.ui_samples; - -import static org.apache.commons.io.IOUtils.copy; -import hudson.ExtensionList; -import hudson.ExtensionPoint; -import hudson.model.Action; -import hudson.model.Describable; - -import java.io.IOException; -import java.net.URL; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import jenkins.model.Jenkins; - -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; - -/** - * @author Kohsuke Kawaguchi - */ -public abstract class UISample implements ExtensionPoint, Action, Describable { - public String getIconFileName() { - return "gear.png"; - } - - public String getUrlName() { - return getClass().getSimpleName(); - } - - /** - * Default display name. - */ - public String getDisplayName() { - return getClass().getSimpleName(); - } - - /** - * Source files associated with this sample. - */ - public List getSourceFiles() { - List r = new ArrayList(); - - r.add(new SourceFile(getClass().getSimpleName()+".java")); - for (String name : new String[]{"index.jelly","index.groovy"}) { - SourceFile s = new SourceFile(name); - if (s.resolve()!=null) - r.add(s); - } - return r; - } - - /** - * Binds {@link SourceFile}s into URL. - */ - public void doSourceFile(StaplerRequest req, StaplerResponse rsp) throws IOException { - String name = req.getRestOfPath().substring(1); // Remove leading / - for (SourceFile sf : getSourceFiles()) - if (sf.name.equals(name)) { - sf.doIndex(rsp); - return; - } - rsp.sendError(rsp.SC_NOT_FOUND); - } - - /** - * Returns a paragraph of natural text that describes this sample. - * Interpreted as HTML. - */ - public abstract String getDescription(); - - public UISampleDescriptor getDescriptor() { - return (UISampleDescriptor) Jenkins.getInstance().getDescriptorOrDie(getClass()); - } - - /** - * Returns all the registered {@link UISample}s. - */ - public static ExtensionList all() { - return Jenkins.getInstance().getExtensionList(UISample.class); - } - - public static List getGroovySamples() { - List r = new ArrayList(); - for (UISample uiSample : UISample.all()) { - for (SourceFile src : uiSample.getSourceFiles()) { - if (src.name.contains("groovy")) { - r.add(uiSample); - break; - } - } - } - return r; - } - - public static List getOtherSamples() { - List r = new ArrayList(); - OUTER: - for (UISample uiSample : UISample.all()) { - for (SourceFile src : uiSample.getSourceFiles()) { - if (src.name.contains("groovy")) { - continue OUTER; - } - } - r.add(uiSample); - } - return r; - } - - /** - * @author Kohsuke Kawaguchi - */ - public class SourceFile { - public final String name; - - public SourceFile(String name) { - this.name = name; - } - - public URL resolve() { - return UISample.this.getClass().getResource( - (name.endsWith(".jelly") || name.endsWith(".groovy")) ? UISample.this.getClass().getSimpleName()+"/"+name : name); - } - - /** - * Serves this source file. - */ - public void doIndex(StaplerResponse rsp) throws IOException { - rsp.setContentType("text/plain;charset=UTF-8"); - copy(resolve().openStream(),rsp.getOutputStream()); - } - } - -} diff --git a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/UISampleDescriptor.java b/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/UISampleDescriptor.java deleted file mode 100644 index d339263125..0000000000 --- a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/UISampleDescriptor.java +++ /dev/null @@ -1,13 +0,0 @@ -package jenkins.plugins.ui_samples; - -import hudson.model.Descriptor; - -/** - * @author Kohsuke Kawaguchi - */ -public abstract class UISampleDescriptor extends Descriptor { - @Override - public String getDisplayName() { - return clazz.getSimpleName(); - } -} diff --git a/ui-samples-plugin/src/main/resources/index.jelly b/ui-samples-plugin/src/main/resources/index.jelly deleted file mode 100644 index 42497a610a..0000000000 --- a/ui-samples-plugin/src/main/resources/index.jelly +++ /dev/null @@ -1,3 +0,0 @@ -
    - Demonstration of UI controls available in Jenkins based on Stapler, Jelly, Groovy and etc. -
    diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/AutoCompleteTextBox/index.jelly b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/AutoCompleteTextBox/index.jelly deleted file mode 100644 index 45381e7a3a..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/AutoCompleteTextBox/index.jelly +++ /dev/null @@ -1,36 +0,0 @@ - - - - -
    - - - - -
    -
    -
    -
    - diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/CopyButton/index.groovy b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/CopyButton/index.groovy deleted file mode 100644 index 7d3f5a4b63..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/CopyButton/index.groovy +++ /dev/null @@ -1,20 +0,0 @@ -package jenkins.plugins.ui_samples.CopyButton; - -import lib.JenkinsTagLib -import lib.LayoutTagLib - -def st=namespace("jelly:stapler") - -t=namespace(JenkinsTagLib.class) -l=namespace(LayoutTagLib.class) - -namespace("/lib/samples").sample(title:_("Copy Button")) { - raw(_("blurb")) - - div(style:"margin:2em") { - text("Copy this text! ") - l.copyButton(message:"text copied",text:"here comes ABC",container:"DIV") - } - - raw(_("aboutContainerElement")) -} diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/CopyButton/index.properties b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/CopyButton/index.properties deleted file mode 100644 index a3c52f5643..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/CopyButton/index.properties +++ /dev/null @@ -1,11 +0,0 @@ -blurb=\ - l.copyButton tag creates a small button that allows users to paste text into the clipboard. \ - Browsers make it unbelievably hard to do this simple task, so that's why we use a tag to encapsulate it. \ - The tag requires two mandatory attributes. One is text, which represents the text to be copied into the clipboard. \ - The other is message, which represents a message to be displayed upon the successful copying into the clipboard. - -aboutContainerElement=\ - According to ZeroClipboard documentation, \ - which is what we use for the copying, it is desirable to have an outer block element that houses a button, to improve \ - the accuracy of positioning a hidden flash movie. This can be specified as a CSS selector in the container attribute. \ - Note that you do not need to set the position:relative manually, as this tag will automatically set it. \ No newline at end of file diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DropdownList/Apple/config.jelly b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DropdownList/Apple/config.jelly deleted file mode 100644 index 932613bd80..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DropdownList/Apple/config.jelly +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DropdownList/Banana/config.jelly b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DropdownList/Banana/config.jelly deleted file mode 100644 index 8079626f8c..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DropdownList/Banana/config.jelly +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DropdownList/index.jelly b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DropdownList/index.jelly deleted file mode 100644 index c2f6b05a75..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DropdownList/index.jelly +++ /dev/null @@ -1,50 +0,0 @@ - - - - -
    - - - - - - - - - - - - - - - - - - -
    -
    -
    -
    diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DynamicComboBox/index.jelly b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DynamicComboBox/index.jelly deleted file mode 100644 index 0d66eedb85..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DynamicComboBox/index.jelly +++ /dev/null @@ -1,38 +0,0 @@ - - - - -
    - - - - - - - -
    -
    -
    -
    diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DynamicDropDownListBox/index.jelly b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DynamicDropDownListBox/index.jelly deleted file mode 100644 index 7366121636..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/DynamicDropDownListBox/index.jelly +++ /dev/null @@ -1,41 +0,0 @@ - - - - -
    - - - - - - - - - - -
    -
    -
    -
    diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/FormFieldValidationWithContext/City/config.groovy b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/FormFieldValidationWithContext/City/config.groovy deleted file mode 100644 index b7dd63efdc..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/FormFieldValidationWithContext/City/config.groovy +++ /dev/null @@ -1,7 +0,0 @@ -package jenkins.plugins.ui_samples.FormFieldValidationWithContext.City; - -def f = namespace(lib.FormTagLib) - -f.entry(title:"City Name", field:"name") { - f.textbox() -} diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/FormFieldValidationWithContext/State/config.groovy b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/FormFieldValidationWithContext/State/config.groovy deleted file mode 100644 index 53fdcd9ef9..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/FormFieldValidationWithContext/State/config.groovy +++ /dev/null @@ -1,19 +0,0 @@ -package jenkins.plugins.ui_samples.FormFieldValidationWithContext.State; - -def f = namespace(lib.FormTagLib) - -f.entry(title:"State Name", field:"name") { - f.textbox() -} - -f.nested { - table { - f.section(title:"Capital city") { - f.property(field:"capital") - } - - f.entry(title:"Other cities") { - f.repeatableProperty(field:"cities") - } - } -} diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/FormFieldValidationWithContext/index.groovy b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/FormFieldValidationWithContext/index.groovy deleted file mode 100644 index ef37b97a2f..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/FormFieldValidationWithContext/index.groovy +++ /dev/null @@ -1,22 +0,0 @@ -package jenkins.plugins.ui_samples.FormFieldValidationWithContext; - -import lib.JenkinsTagLib -import lib.FormTagLib - -def f=namespace(FormTagLib.class) - -t=namespace(JenkinsTagLib.class) - -namespace("/lib/samples").sample(title:_("Context-sensitive form validation")) { - p { - raw(_("blurb.context")) - raw(_("blurb.otheruse")) - raw(_("blurb.contrived")) - } - - f.form { - f.entry(title:"States") { - f.repeatableProperty(field:"states") - } - } -} diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/FormFieldValidationWithContext/index.properties b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/FormFieldValidationWithContext/index.properties deleted file mode 100644 index 16568baed4..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/FormFieldValidationWithContext/index.properties +++ /dev/null @@ -1,9 +0,0 @@ -blurb.context=\ - Form field validation can access values of the nearby input controls, which is useful for performing \ - complex context sensitive form validation. -blurb.otheruse=\ - The same technique can be also used for auto-completion, populating combobox/listbox, and so on. -blurb.contrived=\ - The example below is bit contrived, but all the input elements are named 'name' (for city name and state name), \ - and we use @RelativePath so that the validation of the state name refers to the capital name, \ - and the validation of the city name refers to the state name. \ No newline at end of file diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/ChoiceEntry/config.jelly b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/ChoiceEntry/config.jelly deleted file mode 100644 index 9fba952485..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/ChoiceEntry/config.jelly +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/Config/config.jelly b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/Config/config.jelly deleted file mode 100644 index abe64ce337..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/Config/config.jelly +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/SimpleEntry/config.jelly b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/SimpleEntry/config.jelly deleted file mode 100644 index e98b3ef2a3..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/SimpleEntry/config.jelly +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/configure.jelly b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/configure.jelly deleted file mode 100644 index e48529c9be..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/configure.jelly +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - -

    Configuration

    - - - - - - - - - -
    -
    -
    diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/index.jelly b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/index.jelly deleted file mode 100644 index 2ed9ee4a9f..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/index.jelly +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - -

    - Configure me! -

    - -

    - Current configuration: -

    -
    -                ${it.configFile.asString()}
    -            
    -
    -
    -
    diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/InpageNavigationWithBreadcrumb/header.groovy b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/InpageNavigationWithBreadcrumb/header.groovy deleted file mode 100644 index 58f1cde3fe..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/InpageNavigationWithBreadcrumb/header.groovy +++ /dev/null @@ -1,6 +0,0 @@ -package jenkins.plugins.ui_samples.InpageNavigationWithBreadcrumb - -def l=namespace(lib.LayoutTagLib.class) - -// put them under your l.layout -l.breadcrumb(title:"Click me! Click me!",id:"id-of-breadcrumb-item") diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/InpageNavigationWithBreadcrumb/index.groovy b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/InpageNavigationWithBreadcrumb/index.groovy deleted file mode 100644 index 44b9d6e4c7..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/InpageNavigationWithBreadcrumb/index.groovy +++ /dev/null @@ -1,21 +0,0 @@ -package jenkins.plugins.ui_samples.InpageNavigationWithBreadcrumb; - -import lib.JenkinsTagLib - -def st=namespace("jelly:stapler") - -t=namespace(JenkinsTagLib.class) - -namespace("/lib/samples").sample(title:_("In-page navigation via breadcrumb")) { - raw(_("blurb")) - - script """ - Event.observe(window,"load",function(){ - var menu = new breadcrumbs.ContextMenu(); - menu.add('#section1',rootURL+"/images/24x24/gear.png","Section 1") - menu.add('#section2',rootURL+"/images/24x24/gear.png","Section 2") - breadcrumbs.attachMenu('id-of-breadcrumb-item',menu); - }); -""" - -} diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/InpageNavigationWithBreadcrumb/index.properties b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/InpageNavigationWithBreadcrumb/index.properties deleted file mode 100644 index 46400ae7b9..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/InpageNavigationWithBreadcrumb/index.properties +++ /dev/null @@ -1,5 +0,0 @@ -blurb=You can add arbitrary additional items to the breadcrumb bar (see above), and associate menus with them. \ - This mechanism is convenient for adding anchors to a large page and provide quick access to the key parts. \ - A very typical place where you want to do this is in the configuration page. There's a <f:breadcrumb-config-outline> \ - tag specifically for this use case, which parses <f:section>s and use that to build the context menu. \ - See the freestyle job configuration page for an example of using this tag. \ No newline at end of file diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/JavaScriptProxy/index.jelly b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/JavaScriptProxy/index.jelly deleted file mode 100644 index 7192bbca48..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/JavaScriptProxy/index.jelly +++ /dev/null @@ -1,45 +0,0 @@ - - - - -

    - In Jenkins, you can export arbitrary server-side Java object to JavaScript via a proxy, - then invoke their methods from JavaScript. See the Wiki for more details. - In this sample, we call a method on the server to increment a counter. This object is a singleton, - so you'll see the same counter value across all the browsers. -

    - - - -
    - - - diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/ModularizeViewScript/index.groovy b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/ModularizeViewScript/index.groovy deleted file mode 100644 index 5ea27a431f..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/ModularizeViewScript/index.groovy +++ /dev/null @@ -1,43 +0,0 @@ -package jenkins.plugins.ui_samples.ModularizeViewScript - -import org.kohsuke.stapler.jelly.groovy.JellyBuilder -import jenkins.util.groovy.AbstractGroovyViewModule - -namespace("/lib/samples").sample(title:_("Define View Fragments Elsewhere")) { - - // normally this is how you generate tags, - // but these are actually just a syntax sugar for method calls to the "builder" object (which is set as the delegate of the script for you) - h2("One") - div (style:"border:1px solid blue") { - p("some pointless text") - } - - // so all we need to do is to pass around this delegate object and then you can generate fragments - // from elsewhere - new SomeGenerator(builder).generateSomeFragment() -} - - -// I defined this class here just to make the sample concise. -// this class can be defined anywhere, and typically you'd do this somewhere in your src/main/groovy -class SomeGenerator extends AbstractGroovyViewModule { - SomeGenerator(JellyBuilder builder) { - super(builder) - } - - def generateSomeFragment() { - h2("Two") - div(style:"background-color:gray; padding:2em") { - p("Hello") // once inside a closure, no explicit 'b.' reference is needed. this is just like other Groovy builders - - // calling other methods - generateMoreFragment("Testing generation"); - } - } - - def generateMoreFragment(String msg) { - h2(msg); - f.textarea(); - } -} - diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/NavigationContextMenu/index.groovy b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/NavigationContextMenu/index.groovy deleted file mode 100644 index 8326b55ac3..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/NavigationContextMenu/index.groovy +++ /dev/null @@ -1,48 +0,0 @@ -package jenkins.plugins.ui_samples.NavigationContextMenu; - -import lib.JenkinsTagLib - -def st=namespace("jelly:stapler") - -t=namespace(JenkinsTagLib.class) - -def example(html) { - tr { - td { - text(html) - } - td { - raw(html) - } - } -} - -namespace("/lib/samples").sample(title:_("Navigational context menu integration")) { - raw(_("blurb")) - - h2(_("Defining context menu")) - raw(_("blurb.define")) - - h2(_("Breadcrumb integration")) - raw(_("blurb.breadcrumb")) - - - h2(_("Model hyperlink")) - raw(_("blurb.modelLink")) - table(border:1) { - example "self" - example "up" - } - - raw(_("blurb.modelLink.inside")) - table(border:1) { - example "self" - example "up" - } - - raw(_("blurb.tltr")) - table(border:1) { - example "self" - example "up" - } -} diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/NavigationContextMenu/index.properties b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/NavigationContextMenu/index.properties deleted file mode 100644 index 5af5fd3150..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/NavigationContextMenu/index.properties +++ /dev/null @@ -1,27 +0,0 @@ -blurb=

    Jenkins consists of a large and complex graph of domain objects (ModelObject), where each node in the graph is a web page and edges are hyperlinks. \ - To help users navigate quickly on this graph, Jenkins provides a mechanism to attach context menus to model objects, \ - which can be used to hop multiple edges without going through individual hyperlinks. - -blurb.define=

    To define a context menu on ModelObject, implement ModelObjectWithContextMenu. \ - See the example for how to implement this method. - -blurb.breadcrumb=

    Implementing ModelObjectWithContextMenu is sufficient for the core to show the context menu \ - for your model object in the breadcrumb. Hover your mouse over the breadcrumb of this page to see context menu \ - associated with this sample. \ -

    \ - In addition, implementing \ - ModelObjectWithChildren \ - enables you to show children of your model object in the breadcrumb when you click the \u2018>\u2019 icon that separates \ - breadcrumb items. - -blurb.modelLink=

    By adding CSS class "model-link" to the <a> tags pointing to model objects with context menu, \ - you can enable the context menu support to that hyperlink. For example: - -blurb.modelLink.inside=\ -

    Unless the hyperlink appears inline, it is often better to pre-allocate a space for the context menu anchor \ - that appears when the mouse hovers over. To do this, also add the 'inside' CSS element. For example: - - -blurb.tltr=

    By default, context menu appears below the link ,but this is inconvenient when model links line up in a vertical list. \ - Add additional "tl-tr" CSS class (read it as 'top-left of the context menu to top-right of the target anchor) to \ - make context menu appear on the right. \ No newline at end of file diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/NotificationBar/index.groovy b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/NotificationBar/index.groovy deleted file mode 100644 index 8d1e6e8197..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/NotificationBar/index.groovy +++ /dev/null @@ -1,22 +0,0 @@ -package jenkins.plugins.ui_samples.NotificationBar; - -import lib.JenkinsTagLib - -def st=namespace("jelly:stapler") - -t=namespace(JenkinsTagLib.class) - -namespace("/lib/samples").sample(title:_("Notification Bar")) { - raw(_("blurb")) - - raw("To show a notification bar, call notificationBar.show('message')") - button(onclick:"notificationBar.show('This is a notification');", "Show a notification bar") - - raw(_("blurb.hide")) - button(onclick:"notificationBar.hide();", "Hide it now") - - raw(_("blurb.stock")) - button(onclick:"notificationBar.show('it worked!', notificationBar.OK );", "OK") - button(onclick:"notificationBar.show('something went wrong',notificationBar.WARNING);", "WARNING") - button(onclick:"notificationBar.show('something went wrong',notificationBar.ERROR);", "ERROR") -} diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/NotificationBar/index.properties b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/NotificationBar/index.properties deleted file mode 100644 index da9ba766a4..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/NotificationBar/index.properties +++ /dev/null @@ -1,6 +0,0 @@ -blurb=

    Notification bar shows a message that disappears in a few seconds. \ - It is typically used to provide feedback for asynchronous operations. - -blurb.hide=

    A notification bar will auto-hide itself, but you can programmatically hide it via notificationBar.hide() - -blurb.stock=

    For typical notifications, there are several pre-defined option set available as constants that you can use as notificationBar.show(msg,notificationBar.OK) \ No newline at end of file diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/ProgressBar/index.groovy b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/ProgressBar/index.groovy deleted file mode 100644 index 7118008c41..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/ProgressBar/index.groovy +++ /dev/null @@ -1,30 +0,0 @@ -package jenkins.plugins.ui_samples.ProgressBar; - -import lib.JenkinsTagLib - -def st=namespace("jelly:stapler") - -t=namespace(JenkinsTagLib.class) - -namespace("/lib/samples").sample(title:_("Progress Bar")) { - // in this sample, we add extra margin around them - style(".progress-bar {margin:1em;}") - p("This page shows you how to use the progress bar widget") - - p("The 'pos' parameter controls the degree of progress, 0-100") - t.progressBar(pos:30) - t.progressBar(pos:60) - t.progressBar(pos:90) - p("-1 will draw the progress bar in the 'indeterminate' state"); - t.progressBar(pos:-1) - - p("The 'red' parameter turns the progress bar to red. Used to indicate that it's overdue") - t.progressBar(pos:99, red:true) - t.progressBar(pos:-1, red:true) - - p("Tooltip can be added with the 'tooltip' parameter. It can contain arbitrary HTML. Hover your mouse below to see.") - t.progressBar(pos:70, tooltip:"Allows arbitrary html") - - p("Hyperlink can be added with the 'href' pointer. Click the progress bar below") - t.progressBar(pos:70, href:"http://jenkins-ci.org/") -} diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/ProgressivelyRendered/index.jelly b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/ProgressivelyRendered/index.jelly deleted file mode 100644 index b8a949b284..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/ProgressivelyRendered/index.jelly +++ /dev/null @@ -1,50 +0,0 @@ - - - - -

    - Shows how to do something slow on the server while displaying progress. -

    - -
    - Enter a big number: -
    - - -

    Factors of ${number}:

    - -
      - - - - diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/Root/index.jelly b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/Root/index.jelly deleted file mode 100644 index baa8682cfa..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/Root/index.jelly +++ /dev/null @@ -1,60 +0,0 @@ - - - - - -

      UI Samples

      - -

      Groovy Templates

      - - - - - -
      - -
      -
      -
      -
      - -

      Jelly Templates

      - - - - - -
      - -
      -
      -
      -
      - -
      -
      -
      diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/SyntaxHighlightedTextArea/index.groovy b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/SyntaxHighlightedTextArea/index.groovy deleted file mode 100644 index 25f8d94435..0000000000 --- a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/SyntaxHighlightedTextArea/index.groovy +++ /dev/null @@ -1,33 +0,0 @@ -def st=namespace("jelly:stapler") - -namespace("/lib/samples").sample(title:_("Syntax Highlighted Text Area")) { - p("CodeMirror can be used to turn ordinary text area into syntax-highlighted content-assistable text area") - - // this loads the necessary JavaScripts, if it hasn't loaded already - // the first we load is the mode definition file (mode as in Emacs mode) - // the second is the theme. - // - // for other modes, look for "clike.js" in your IDE and see adjacent folders. - st.adjunct(includes:"org.kohsuke.stapler.codemirror.mode.clike.clike") - st.adjunct(includes:"org.kohsuke.stapler.codemirror.theme.default") - - // TODO: adjunct tag doesn't work because 'wroteHEAD' is not set correctly - // TODO: provide abstraction that hides CSS hookup - - // this text area is what we convert to the super text area - // we use CSS class to hook up the initialization script. In this particular demo, - // the ID attribute can be used, but in more general case (such as when you use this in your Builder, etc., - // a single web page may end up containing multiple instances of such text area, so the CSS class works better. - textarea("class":"my-groovy-textbox", style:"width:100%; height:10em") - - // see CodeMirror web site for more about how to control the newly instantiated text area. - script(""" - Behaviour.specify("TEXTAREA.my-groovy-textbox", "SyntaxHighlightedTextArea", 0, function(e) { - var w = CodeMirror.fromTextArea(e,{ - mode:"text/x-groovy", - lineNumbers: true - }).getWrapperElement(); - w.setAttribute("style","border:1px solid black; margin-top: 1em; margin-bottom: 1em") - }); - """) -} diff --git a/ui-samples-plugin/src/main/resources/lib/samples/sample.jelly b/ui-samples-plugin/src/main/resources/lib/samples/sample.jelly deleted file mode 100644 index b5250eada4..0000000000 --- a/ui-samples-plugin/src/main/resources/lib/samples/sample.jelly +++ /dev/null @@ -1,51 +0,0 @@ - - - - - Page layout for UI samples and variable bindings that emulate the form environment. - - Page title - - - - - - - -

      ${title}

      -

      - -

      -

      Source Files

      - -

      Sample

      - -
      -
      -
      diff --git a/ui-samples-plugin/src/main/resources/lib/samples/taglib b/ui-samples-plugin/src/main/resources/lib/samples/taglib deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/war/pom.xml b/war/pom.xml index 1c278dee71..c9d24474d5 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -452,14 +452,12 @@ THE SOFTWARE. stapler.resourcePath ../core/src/main/resources; - ../ui-samples-plugin/src/main/resources; hudson.bundled.plugins - ${basedir}/../ui-samples-plugin/target/test-classes/the.hpl, ${project.build.directory}/${project.build.finalName}/WEB-INF/plugins/*.hpi From b9437154d8b20023d5242ac4e063a0d63ac2b5da Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 4 Oct 2013 18:19:49 -0400 Subject: [PATCH 188/203] ClassicPluginStrategy.DETACHED_LIST could confuse ClassicPluginStrategyTest by injecting dependencies on split plugins that have an index.jelly. --- .../hudson/ClassicPluginStrategyTest.java | 9 ++++----- .../testDependencyClassLoader.zip | Bin 4601 -> 4689 bytes .../testDisabledDependencyClassLoader.zip | Bin 2879 -> 1972 bytes 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/test/src/test/java/hudson/ClassicPluginStrategyTest.java b/test/src/test/java/hudson/ClassicPluginStrategyTest.java index 3737744e89..26779a1371 100644 --- a/test/src/test/java/hudson/ClassicPluginStrategyTest.java +++ b/test/src/test/java/hudson/ClassicPluginStrategyTest.java @@ -50,13 +50,12 @@ public class ClassicPluginStrategyTest extends HudsonTestCase { // Test data has: foo3 depends on foo2,foo1; foo2 depends on foo1 // (thus findResources from foo3 can find foo1 resources via 2 dependency paths) PluginWrapper p = jenkins.getPluginManager().getPlugin("foo3"); - String res = p.getIndexPage().toString(); - assertTrue(res + "should be foo3", res.contains("/foo3/")); + String res; // In the current impl, the dependencies are the parent ClassLoader so resources // are found there before checking the plugin itself. Adjust the expected results // below if this is ever changed to check the plugin first. - Enumeration en = p.classLoader.getResources("index.jelly"); + Enumeration en = p.classLoader.getResources("test-resource"); for (int i = 0; en.hasMoreElements(); i++) { res = en.nextElement().toString(); if (i < 2) @@ -65,7 +64,7 @@ public class ClassicPluginStrategyTest extends HudsonTestCase { else assertTrue("In current impl, " + res + "should be foo3", res.contains("/foo3/")); } - res = p.classLoader.getResource("index.jelly").toString(); + res = p.classLoader.getResource("test-resource").toString(); assertTrue("In current impl, " + res + " should be foo1 or foo2", res.contains("/foo1/") || res.contains("/foo2/")); } @@ -79,7 +78,7 @@ public class ClassicPluginStrategyTest extends HudsonTestCase { public void testDisabledDependencyClassLoader() throws Exception { PluginWrapper p = jenkins.getPluginManager().getPlugin("foo4"); - Enumeration en = p.classLoader.getResources("index.jelly"); + Enumeration en = p.classLoader.getResources("test-resource"); for (int i = 0; en.hasMoreElements(); i++) { String res = en.nextElement().toString(); if (i == 0) diff --git a/test/src/test/resources/hudson/ClassicPluginStrategyTest/testDependencyClassLoader.zip b/test/src/test/resources/hudson/ClassicPluginStrategyTest/testDependencyClassLoader.zip index 63ebd2dc442beae0df1cea754e95e77f73ea00ee..f016ea70702f54dcd1b5e45b057f5fbc1c5b4c99 100644 GIT binary patch delta 3711 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 WQrJYZux?`5=pTN1^%Cjv0Pq)yP8Jsc diff --git a/test/src/test/resources/hudson/ClassicPluginStrategyTest/testDisabledDependencyClassLoader.zip b/test/src/test/resources/hudson/ClassicPluginStrategyTest/testDisabledDependencyClassLoader.zip index 5dd55f0fa22dca20068795110ff5afb14894dbfd..81caae376b4ae7ea31df0a73aaa02d0885228d4f 100644 GIT binary patch delta 1729 zcmZ|Qc{o&S9Ki9z7`tr6BwI<6EX~LgMMO7a&sb}cG#S?z#bgP`Bovi(Y(vUT8#9!# zb&1O*8B7^nqLgI_ku_wQJJWL2({rEmocDdt`Q!8a&OhH%D?<}Ew?{(wHUa=32%JYx z7+dS{HSqHQfCMi92m|uKDZD=hdqyh+=ZA6<0w75V#@5xDJr0Br5rBv9Jp=%_%R_x3 z9uUGO%uxWKGx?DDm&3P3kfQ|n5zb)!1GT>xjQw_w?>P6*2CzN{SD;?SH+1p=fF}o) z_(8zn@w!?*0oeZ}uEv$X^>F}^DGa9H3m}d*Y3IO_0JUh*=;Gfm|3ST*M~?InRD%S* zPV*p+;8vrpG%7d4+|W7*ov16oP04MhV)CMaM9bd`R9VuCf?GycHtlv8AT_|ErdenNbp4jU7xm6-UYuIzxY}kL>o7#19=<_exc0=Dm0#Jl*>hDk-nfC7BGV zkV1})iyg@A@>4DuDZSUUu*J>_abqRkbu+CQhiZ0t*sP1Gh4kv_MuxIK$BtcMfp^a_ znRF&SMBBEev3hmTGFO%K$ga4?asQp{iJLU*8RJ1KN<-RCAG_Ib^=Gm zGs4ls*r2Jk@j`kT!QV1uJ0pC?6J>X4BYR)+oX)kp)hkM*-tNR)N>;AQF|V0N4Y)yk zBI%&qvJ8w;%6>q9_^~b@lF{LK#o z^H+{qP!cJpF_V#XA*|V=Rs9&7e1burLbmL?#pfS7h~?zKH1~2}n`&H;eRUwwda0n1 z5j<+Oa(+>IssYbplo|H2#-;wr+TEvK9*!ycyWq%Cg-N^78E0e_V)g=Pc_hDJaJVT> zx>|u8A)f$a>d|2As@K)WTOIt{&CJh&PX;Qa+wxYCFFgi=r{`YxZaSWk4w^KQ%G~1{ zs1bOJww}ka@vlNB#NWuC=sbMQnbIH`0X0PnNf;$5P@on|(EApuS@#n$j$BJ#jn&1jPQGr zAS!x}*v(>J4O^nV!Ss5BwGE~18VTKVzQ4^S-ca9UG!yiDmPimWlo5dT%prvmO!}%n zOs;9qu%xxu{z`Q-h&mt^OfXBM@Rjz)T+wQ8-XW-*m6Vg}dMpPNZmU#_x+BqAS;R87 zvmp9Oq&Ip=?Mx#iI3~;@6H<;&L$MgNm2V8%+1J*#z|1`|`69Wtc8^PxzDlY*g6eC* zI~iSZU0Lpa%E=ffILuaHb6jCO5hmab-;E8j)Z0){&v|d)YSV;T+h#-~Ci9f)Vq*A2 zgks0?VPR5C(B4cHG3qRL%N1L9D4+D)Q7*5hvc+d8Gs`@^W=e`|Fz!H?@*YocYc5l) z^4_|C%Fv$IB%Q>g-X*OkhG3|W^^~6J9ule(R_76{l-$c!iR(n}zLQVluas|Z;fKeH z2-fm0-SSlAbdrZx5%Np1!EecieaSAT;J|Gn_xNMLpO$BppBK`Rcs xo^p=%J-(dw27UV%{50RMCI8L=0F8L{2X4LVKeOv9l%M-K5Y9En*&lp)`WG_+<^=!% literal 2879 zcmaKudpy(o8^FI~G55JFexcD#j?AqgsoYXBHh1MR48y|AJ-Krdk&LMvjUs2&nQJa{ zEr&QRl`e!Xl>0~rp~!E`uPmqY+g_j7Yy0DQUeELXJm2s8!I*M`B>)KP8>Nb(i}s(o=L%3m^#~(W1k=SruA0rgYtrv}2D!7L??;0C3R~ zZ^ep~4BJeK4Y(BFPAFFBHsrUA9q69vWZt3B9iIJ(FEQWdR1hAL+nT4evw)s5KfN$C zsp(Xnw7s5aT)sDL!pJi`r2LeHdb4Ve^UEqs`2Odmzh%I+p_!sh*RaC1U6c$^0zDM- zai3Bt&g&4Sj0xsh4BKxT6~MI1@;YGfvc;x3S1CiyVRVmvWz{GcHluy&g&#tZ?9x9F z6=TyQ^g)4~PHW$Oj0hlRsx=u_tp`tRoo`$~Lnh(K-ID&>jOTXO8{UYjB?%yl86*?4 zHn}6`L$z$_L-@;+Xcf?+OQGnU=m9a~%+9q{9*ik31f>aX<^cf!lnVebESmgZ88SV_ z4LD%3_(B2V>0rFKU!V$`T2DaGcEk2g-7cG;p#O#g>&seZcj`o&81AVjA*cd^% zd#M_SGy1kB&^5c|6QBl3kvMwLV2HFqlB_yaB#|BzC{5+n3Bjp5ji1n}D#hmQ%pFHb zGJ3kY3_GL_Ur>@3PgYB`&!4g@-uLHgB5`E-^AT6%nt*(iRLa|6nOR|Qhj4Mo)a0)V zrh2o~#3H}b`ARPb84yS*49&*o10?yDu?T^sII+FogpH2{0E;!#H$+?6f8}8~fDQ*R*G^msd z8o#73C?||c1h{S4o$^8&43p)4VRdfFIvWEMvFY)X;<$QTNFc(8=#6mq4s>-p?cvUz z0Cp!=|MxI%3{a~3k7Ebr$l~emzaQa6^!^t83uPUnz^td|kQ)#?(XR5FR63v#55yM} zl5Wt8s5wzyV3GL0DjZ@1to*h_c}TcI03UJJH^BWGuYRNSyURMC!WlI@=f;;A_fTzd zS1~$66|Y^nLA~#ve3@M%RJ1vcTLi3g2K;qsaz#x|?8oSGhWhiw#hoh5Xw z)!OKNhDjyz0Mc~0xuGNL0lfcH{ zu*4XQaDfJ^tH*Fd#b$iHKy4RgVrtHN(86aQRq69bGOq@!A;%;Or#!Mo3Mu0rnKvcI z#wM}~wq}pR-eumzkHW|<6{0lbqLHy27bHA`_^2yXu45%`#j!r_`byl>>lvL--GTN@ZMWA9E2WThjGl%NFT#bw? zpR+BWw?iI>Cpmq2_CC;94Z;pM(gK!chczD>4n?b9U5H#bLg zd%Ffz*Z!Hfd`qMGu0yD|_~_wdBbpy^c!K8`B>Qq5lQ^(6fb&RiZP;Qw#cZ4;F%OoE zH;o`sSGvVtXoWkidejExjwlDp=UNpPdj(OzH>tQoduziYhpjE9aD*#YYT>HR%esU$ zGgq>gY+C5K(Jk7C_tysHO^?bHQvNt4?k_DX@!nC+D$4uAoD)N=QT7XXW!7Oi(6>8e znUN5@CnYplnff240Ph~_bDymkb3qT` z(b?9=+Ju>yC*r0tg@55SA#wo z%X=;GwNBjLg1_Rpolojr(6ffMdE`MdL`}DKT}suXX=}fM@s`D_c9^;I+Ni3#P_E0& z>NVlh5y|=vYC=1#uZ!VRMU#8|)H!M`{D@E)Zxd6R0m}@zo${mKv2F zNW0>gbFXlF0H`BYtb}q$@OaH7ZE-LL)pkrBbV(y10)BwkVj2q*#`J=d_%Y zqn^ExAo8TD$k!LEto50)7BB$N`PeU35EqPlW3%D3G(RBtP0e}*vFx9mdk*CLp0l3g z-+aE2V_M&w<^K)MK)&0ZvkJD`Ii)B1Llp@e88|!x`EGj7Vm9lJk0aHpej;lT`7S>j zd&pN+uyyhOQgBwYs$a*Mg0r!2{@mOcr_*FOsws&5{IgU)xb){e{?msWz++;gxi^6S w(~j#cv+c-PC)U>(#5N_ybPErARM@Ms1*@k%2>aiE0VKg Date: Tue, 1 Oct 2013 19:09:56 +0200 Subject: [PATCH 189/203] German localization for "Disable remember me" option --- .../help-disableRememberMe_de.html | 4 ++++ .../security/GlobalSecurityConfiguration/index_de.properties | 1 + 2 files changed, 5 insertions(+) create mode 100644 core/src/main/resources/hudson/security/GlobalSecurityConfiguration/help-disableRememberMe_de.html diff --git a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/help-disableRememberMe_de.html b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/help-disableRememberMe_de.html new file mode 100644 index 0000000000..060ef51cc5 --- /dev/null +++ b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/help-disableRememberMe_de.html @@ -0,0 +1,4 @@ +
      + Wählen Sie diese Option, um die "Meine Anmeldedaten auf diesem Rechner speichern"-Option + vom Benutzeranmeldedialog zu entfernen. +
      diff --git a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_de.properties b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_de.properties index affa1cebc7..ed694c8119 100644 --- a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_de.properties +++ b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_de.properties @@ -23,6 +23,7 @@ LOADING=LADE DATEN Enable\ security=Jenkins absichern TCP\ port\ for\ JNLP\ slave\ agents=TCP-Port f\u00fcr JNLP-Slave +Disable\ remember\ me=Deaktiviere "Anmeldedaten speichern" Markup\ Formatter=Markup-Formatierer Access\ Control=Zugriffskontrolle Security\ Realm=Benutzerverzeichnis (Realm) From b19f4650d7cc146e28398a33ad0625d46991e27f Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 6 Oct 2013 11:27:00 -0700 Subject: [PATCH 190/203] [FIXED JENKINS-18366] Winstone is now powered by Jetty --- changelog.html | 5 +++++ pom.xml | 5 ++++- war/pom.xml | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/changelog.html b/changelog.html index a07bb6c40c..95abae9583 100644 --- a/changelog.html +++ b/changelog.html @@ -71,6 +71,11 @@ Upcoming changes
    • Breadcrumb bar moves away from header when scrolling past end of page on OS X. (issue 19803) +
    • + "java -jar jenkins.war" now runs on Jetty8. Command line options are still compatible. + (issue 18366) +
    • + "java -jar jenkins.war" gets the "--spdy" option to enable SPDY.
    diff --git a/pom.xml b/pom.xml index 7cff659191..d2def83e67 100644 --- a/pom.xml +++ b/pom.xml @@ -630,6 +630,9 @@ THE SOFTWARE. 1.${java.level} + + org.eclipse.jetty.spdy.* + @@ -654,7 +657,7 @@ THE SOFTWARE. org.codehaus.mojo extra-enforcer-rules - 1.0-alpha-5 + 1.0-beta-1+kohsuke diff --git a/war/pom.xml b/war/pom.xml index c9d24474d5..7c6e23c89d 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -51,7 +51,7 @@ THE SOFTWARE. org.jenkins-ci executable-war - 1.28 + 1.29 provided @@ -103,7 +103,7 @@ THE SOFTWARE. --> org.jenkins-ci winstone - 0.9.10-jenkins-47 + 2.0 test From b533f77065dabd94ef7c85ccea366be6497d13b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20Gond=C5=BEa?= Date: Mon, 7 Oct 2013 10:38:11 +0200 Subject: [PATCH 191/203] Amend #616 --- changelog.html | 3 +++ .../src/main/resources/lib/hudson/artifactList.jelly | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/changelog.html b/changelog.html index 95abae9583..957f9f3c06 100644 --- a/changelog.html +++ b/changelog.html @@ -76,6 +76,9 @@ Upcoming changes (issue 18366)
  • "java -jar jenkins.war" gets the "--spdy" option to enable SPDY. +
  • + Expand all/Collapse all functionality for artifact tree view. + (pull request 616) diff --git a/core/src/main/resources/lib/hudson/artifactList.jelly b/core/src/main/resources/lib/hudson/artifactList.jelly index 4118c98392..92d6e00418 100644 --- a/core/src/main/resources/lib/hudson/artifactList.jelly +++ b/core/src/main/resources/lib/hudson/artifactList.jelly @@ -76,13 +76,13 @@ THE SOFTWARE. - +
    + + ${%Expand all} + + ${%Collapse all} +
    - Expand all