From 4d6187d290bfe664238f2402e36bf65503ba0b46 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 18 Jun 2011 09:59:05 -0700 Subject: [PATCH 01/19] Allow the text of "New Job" to be modified externally. --- core/src/main/java/hudson/model/View.java | 12 ++++++++++++ .../main/resources/hudson/model/View/sidepanel.jelly | 2 +- .../resources/hudson/model/View/sidepanel.properties | 1 + .../hudson/model/View/sidepanel_da.properties | 2 +- .../hudson/model/View/sidepanel_de.properties | 2 +- .../hudson/model/View/sidepanel_el.properties | 1 - .../hudson/model/View/sidepanel_es.properties | 2 +- .../hudson/model/View/sidepanel_fi.properties | 2 +- .../hudson/model/View/sidepanel_fr.properties | 2 +- .../hudson/model/View/sidepanel_hu.properties | 2 +- .../hudson/model/View/sidepanel_it.properties | 2 +- .../hudson/model/View/sidepanel_ja.properties | 1 - .../hudson/model/View/sidepanel_ko.properties | 2 +- .../hudson/model/View/sidepanel_nb_NO.properties | 2 +- .../hudson/model/View/sidepanel_nl.properties | 2 +- .../hudson/model/View/sidepanel_pt_BR.properties | 2 +- .../hudson/model/View/sidepanel_pt_PT.properties | 2 +- .../hudson/model/View/sidepanel_ru.properties | 2 +- .../hudson/model/View/sidepanel_sv_SE.properties | 2 +- .../hudson/model/View/sidepanel_tr.properties | 2 +- .../hudson/model/View/sidepanel_zh_CN.properties | 1 - .../hudson/model/View/sidepanel_zh_TW.properties | 1 - 22 files changed, 29 insertions(+), 20 deletions(-) create mode 100644 core/src/main/resources/hudson/model/View/sidepanel.properties diff --git a/core/src/main/java/hudson/model/View.java b/core/src/main/java/hudson/model/View.java index 544ba158a3..064740fdc3 100644 --- a/core/src/main/java/hudson/model/View.java +++ b/core/src/main/java/hudson/model/View.java @@ -38,6 +38,8 @@ import hudson.security.ACL; import hudson.security.AccessControlled; import hudson.security.Permission; import hudson.security.PermissionGroup; +import hudson.util.AlternativeUiTextProvider; +import hudson.util.AlternativeUiTextProvider.Message; import hudson.util.DescribableList; import hudson.util.DescriptorList; import hudson.util.RunList; @@ -294,6 +296,10 @@ public abstract class View extends AbstractModelObject implements AccessControll return getViewName(); } + public String getNewPronoun() { + return AlternativeUiTextProvider.get(NEW_PRONOUN, this, Messages.AbstractItem_Pronoun()); + } + /** * By default, return true to render the "Edit view" link on the page. * This method is really just for the default "All" view to hide the edit link @@ -837,4 +843,10 @@ public abstract class View extends AbstractModelObject implements AccessControll p.setView(getOwner()); } } + + /** + * "Job" in "New Job". When a view is used in a context that restricts the child type, + * It might be useful to override this. + */ + public static final Message NEW_PRONOUN = new Message(); } diff --git a/core/src/main/resources/hudson/model/View/sidepanel.jelly b/core/src/main/resources/hudson/model/View/sidepanel.jelly index 631fac0e0f..bdc100d2ca 100644 --- a/core/src/main/resources/hudson/model/View/sidepanel.jelly +++ b/core/src/main/resources/hudson/model/View/sidepanel.jelly @@ -39,7 +39,7 @@ THE SOFTWARE. - + diff --git a/core/src/main/resources/hudson/model/View/sidepanel.properties b/core/src/main/resources/hudson/model/View/sidepanel.properties new file mode 100644 index 0000000000..41d26287d3 --- /dev/null +++ b/core/src/main/resources/hudson/model/View/sidepanel.properties @@ -0,0 +1 @@ +NewJob=New {0} \ No newline at end of file diff --git a/core/src/main/resources/hudson/model/View/sidepanel_da.properties b/core/src/main/resources/hudson/model/View/sidepanel_da.properties index c83089cd5a..effd42a790 100644 --- a/core/src/main/resources/hudson/model/View/sidepanel_da.properties +++ b/core/src/main/resources/hudson/model/View/sidepanel_da.properties @@ -26,4 +26,4 @@ Delete\ View=Slet visning People=Personer Build\ History=Byggehistorik Edit\ View=Rediger visning -New\ Job=Nyt job +NewJob=Nyt {0} diff --git a/core/src/main/resources/hudson/model/View/sidepanel_de.properties b/core/src/main/resources/hudson/model/View/sidepanel_de.properties index 85e890039a..533ca73bac 100644 --- a/core/src/main/resources/hudson/model/View/sidepanel_de.properties +++ b/core/src/main/resources/hudson/model/View/sidepanel_de.properties @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -New\ Job=Neuen Job anlegen +NewJob=Neuen {0} anlegen People=Benutzer Build\ History=Build-Verlauf Edit\ View=Ansicht bearbeiten diff --git a/core/src/main/resources/hudson/model/View/sidepanel_el.properties b/core/src/main/resources/hudson/model/View/sidepanel_el.properties index 77ce44a127..2abeb55dcf 100644 --- a/core/src/main/resources/hudson/model/View/sidepanel_el.properties +++ b/core/src/main/resources/hudson/model/View/sidepanel_el.properties @@ -23,6 +23,5 @@ Build\ History=\u0399\u03C3\u03C4\u03BF\u03C1\u03B9\u03BA\u03CC Build Delete\ View=\u0394\u03B9\u03B1\u03B3\u03C1\u03B1\u03C6\u03AE \u038C\u03C8\u03B7\u03C2 Edit\ View=\u0395\u03C0\u03B5\u03BE\u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1 \u038C\u03C8\u03B7\u03C2 -New\ Job=\u039D\u03AD\u03B1 \u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1 People=\u039F\u03B9 \u03AC\u03BD\u03B8\u03C1\u03C9\u03C0\u03BF\u03B9 Project\ Relationship=\u03A3\u03C5\u03C3\u03C7\u03B5\u03C4\u03AF\u03C3\u03B5\u03B9\u03C2 \u03C4\u03BF\u03C5 Project diff --git a/core/src/main/resources/hudson/model/View/sidepanel_es.properties b/core/src/main/resources/hudson/model/View/sidepanel_es.properties index 3a0b79f3b2..ad9e6ded48 100644 --- a/core/src/main/resources/hudson/model/View/sidepanel_es.properties +++ b/core/src/main/resources/hudson/model/View/sidepanel_es.properties @@ -22,7 +22,7 @@ # THE SOFTWARE. Build\ History=Historia de ejecuciones -New\ Job=Crear nueva Tarea +NewJob=Crear nueva {0} People=Actividad Edit\ View=Editar la vista Delete\ View=Borrar la vista diff --git a/core/src/main/resources/hudson/model/View/sidepanel_fi.properties b/core/src/main/resources/hudson/model/View/sidepanel_fi.properties index 015d36faff..084aae47ac 100644 --- a/core/src/main/resources/hudson/model/View/sidepanel_fi.properties +++ b/core/src/main/resources/hudson/model/View/sidepanel_fi.properties @@ -22,6 +22,6 @@ Build\ History=K\u00E4\u00E4nn\u00F6shistoria Check\ File\ Fingerprint=Tarkasta tiedoston sormenj\u00E4ljet -New\ Job=Uusi ty\u00F6 +NewJob=Uusi {0} People=K\u00E4ytt\u00E4j\u00E4t Project\ Relationship=Projektien riippuvuudet diff --git a/core/src/main/resources/hudson/model/View/sidepanel_fr.properties b/core/src/main/resources/hudson/model/View/sidepanel_fr.properties index a5b8552cd7..37bef36cfa 100644 --- a/core/src/main/resources/hudson/model/View/sidepanel_fr.properties +++ b/core/src/main/resources/hudson/model/View/sidepanel_fr.properties @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -New\ Job=Nouvelle t\u00E2che +NewJob=Nouvelle {0} People=Personnes Build\ History=Historique des constructions Edit\ View=\u00C9diter la vue diff --git a/core/src/main/resources/hudson/model/View/sidepanel_hu.properties b/core/src/main/resources/hudson/model/View/sidepanel_hu.properties index 5fa04936cf..18a8515fc6 100644 --- a/core/src/main/resources/hudson/model/View/sidepanel_hu.properties +++ b/core/src/main/resources/hudson/model/View/sidepanel_hu.properties @@ -22,5 +22,5 @@ Build\ History=\u00C9p\u00EDt\u00E9sek T\u00F6rt\u00E9nete Check\ File\ Fingerprint=F\u00E1jl Ujjlenyomat Ellen\u0151rz\u00E9se -New\ Job=\u00FAj feladat +NewJob=\u00FAj {0} Project\ Relationship=Projekt Kapcsolat diff --git a/core/src/main/resources/hudson/model/View/sidepanel_it.properties b/core/src/main/resources/hudson/model/View/sidepanel_it.properties index 2f91d7a24a..ab92c0df7b 100644 --- a/core/src/main/resources/hudson/model/View/sidepanel_it.properties +++ b/core/src/main/resources/hudson/model/View/sidepanel_it.properties @@ -22,6 +22,6 @@ Build\ History=Cronologia build Check\ File\ Fingerprint=Controlla impronta file -New\ Job=Nuovo job +NewJob=Nuovo {0} People=Utenti Project\ Relationship=Relazioni fra progetti diff --git a/core/src/main/resources/hudson/model/View/sidepanel_ja.properties b/core/src/main/resources/hudson/model/View/sidepanel_ja.properties index e7baec4f7a..023b233f66 100644 --- a/core/src/main/resources/hudson/model/View/sidepanel_ja.properties +++ b/core/src/main/resources/hudson/model/View/sidepanel_ja.properties @@ -20,7 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -New\ Job=\u65b0\u898f\u30b8\u30e7\u30d6\u4f5c\u6210 People=\u4eba\u3005 Build\ History=\u30d3\u30eb\u30c9\u5c65\u6b74 Edit\ View=\u30d3\u30e5\u30fc\u306e\u5909\u66f4 diff --git a/core/src/main/resources/hudson/model/View/sidepanel_ko.properties b/core/src/main/resources/hudson/model/View/sidepanel_ko.properties index c526e68bd6..8892093430 100644 --- a/core/src/main/resources/hudson/model/View/sidepanel_ko.properties +++ b/core/src/main/resources/hudson/model/View/sidepanel_ko.properties @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -New\ Job=\uC0C8 \uC791\uC5C5 +NewJob=\uC0C8 {0} Delete\ View=\uBCF4\uAE30 \uC0AD\uC81C People=\uAC1C\uBC1C\uC790 Build\ History=\uBE4C\uB4DC \uAE30\uB85D diff --git a/core/src/main/resources/hudson/model/View/sidepanel_nb_NO.properties b/core/src/main/resources/hudson/model/View/sidepanel_nb_NO.properties index 361921588d..3fe432152a 100644 --- a/core/src/main/resources/hudson/model/View/sidepanel_nb_NO.properties +++ b/core/src/main/resources/hudson/model/View/sidepanel_nb_NO.properties @@ -24,6 +24,6 @@ Build\ History=Bygghistorie Check\ File\ Fingerprint=Unders\u00F8k fingeravtrykk for filer Delete\ View=Slett visning Edit\ View=Rediger visning -New\ Job=Ny jobb +NewJob=Ny {0} People=Folk Project\ Relationship=Forhold mellom prosjekter diff --git a/core/src/main/resources/hudson/model/View/sidepanel_nl.properties b/core/src/main/resources/hudson/model/View/sidepanel_nl.properties index 69551b5698..e6d2d83e81 100644 --- a/core/src/main/resources/hudson/model/View/sidepanel_nl.properties +++ b/core/src/main/resources/hudson/model/View/sidepanel_nl.properties @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -New\ Job=Nieuwe job +NewJob=Nieuwe {0} People=Gebruikers Build\ History=Overzicht bouwpogingen Edit\ View=Overzichtsscherm bewerken diff --git a/core/src/main/resources/hudson/model/View/sidepanel_pt_BR.properties b/core/src/main/resources/hudson/model/View/sidepanel_pt_BR.properties index 59c56aea80..dead05bbd9 100644 --- a/core/src/main/resources/hudson/model/View/sidepanel_pt_BR.properties +++ b/core/src/main/resources/hudson/model/View/sidepanel_pt_BR.properties @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -New\ Job=Nova Tarefa +NewJob=Nova {0} People=Pessoas Build\ History=Hist\u00f3rico de Constru\u00e7\u00e3o Edit\ View=Editar View diff --git a/core/src/main/resources/hudson/model/View/sidepanel_pt_PT.properties b/core/src/main/resources/hudson/model/View/sidepanel_pt_PT.properties index 12a5a196c2..bb4654ff8e 100644 --- a/core/src/main/resources/hudson/model/View/sidepanel_pt_PT.properties +++ b/core/src/main/resources/hudson/model/View/sidepanel_pt_PT.properties @@ -22,6 +22,6 @@ Build\ History=Historial de compila\u00E7\u00F5es Check\ File\ Fingerprint=Verificar a impress\u00E3o digital de ficheiro -New\ Job=Novo processo +NewJob=Novo {0} People=Pessoal Project\ Relationship=Relacionamento de Projectos diff --git a/core/src/main/resources/hudson/model/View/sidepanel_ru.properties b/core/src/main/resources/hudson/model/View/sidepanel_ru.properties index cce00c52c9..f0cddef278 100644 --- a/core/src/main/resources/hudson/model/View/sidepanel_ru.properties +++ b/core/src/main/resources/hudson/model/View/sidepanel_ru.properties @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -New\ Job=\u041d\u043e\u0432\u0430\u044f \u0437\u0430\u0434\u0430\u0447\u0430 +NewJob=\u041d\u043e\u0432\u0430\u044f {0} People=\u041F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0438 Build\ History=\u0418\u0441\u0442\u043e\u0440\u0438\u044f \u0441\u0431\u043e\u0440\u043e\u043a Edit\ View=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0432\u0438\u0434 diff --git a/core/src/main/resources/hudson/model/View/sidepanel_sv_SE.properties b/core/src/main/resources/hudson/model/View/sidepanel_sv_SE.properties index 5cdc051719..42e7c4bc85 100644 --- a/core/src/main/resources/hudson/model/View/sidepanel_sv_SE.properties +++ b/core/src/main/resources/hudson/model/View/sidepanel_sv_SE.properties @@ -23,6 +23,6 @@ Build\ History=Bygghistorik Delete\ View=Ta bort vy Edit\ View=Redigera vy -New\ Job=Skapa nytt jobb +NewJob=Skapa nytt {0} People=Personer Project\ Relationship=Jobbsamband diff --git a/core/src/main/resources/hudson/model/View/sidepanel_tr.properties b/core/src/main/resources/hudson/model/View/sidepanel_tr.properties index cee6677004..77537b4a85 100644 --- a/core/src/main/resources/hudson/model/View/sidepanel_tr.properties +++ b/core/src/main/resources/hudson/model/View/sidepanel_tr.properties @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -New\ Job=Yeni \u0130\u015f +NewJob=Yeni {0} People=\u0130nsanlar Build\ History=Yap\u0131land\u0131rma Ge\u00e7mi\u015fi Edit\ View=G\u00f6r\u00fcnt\u00fcy\u00fc D\u00fczenle diff --git a/core/src/main/resources/hudson/model/View/sidepanel_zh_CN.properties b/core/src/main/resources/hudson/model/View/sidepanel_zh_CN.properties index da72b5af43..bd600e13fd 100644 --- a/core/src/main/resources/hudson/model/View/sidepanel_zh_CN.properties +++ b/core/src/main/resources/hudson/model/View/sidepanel_zh_CN.properties @@ -21,5 +21,4 @@ # THE SOFTWARE. Build\ History=\u6784\u5efa\u5386\u53f2 -New\ Job=\u65b0\u5efa\u4efb\u52a1 People=\u7528\u6237 diff --git a/core/src/main/resources/hudson/model/View/sidepanel_zh_TW.properties b/core/src/main/resources/hudson/model/View/sidepanel_zh_TW.properties index 65aa888501..431b5b7284 100644 --- a/core/src/main/resources/hudson/model/View/sidepanel_zh_TW.properties +++ b/core/src/main/resources/hudson/model/View/sidepanel_zh_TW.properties @@ -21,5 +21,4 @@ # THE SOFTWARE. Build\ History=\u5EFA\u69CB\u6B77\u7A0B -New\ Job=\u8D77\u59CB\u65B0\u5DE5\u4F5C People=\u4F7F\u7528\u8005 From 4edbb455e4b9688f4769f8893933e0abfb63e830 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 18 Jun 2011 10:26:02 -0700 Subject: [PATCH 02/19] Use that in the page to create new jobs --- core/src/main/resources/hudson/model/View/newJob.jelly | 4 ++-- core/src/main/resources/hudson/model/View/newJob.properties | 3 +++ .../main/resources/hudson/model/View/newJob_da.properties | 6 +++--- .../main/resources/hudson/model/View/newJob_de.properties | 6 +++--- .../main/resources/hudson/model/View/newJob_el.properties | 2 -- .../main/resources/hudson/model/View/newJob_es.properties | 6 +++--- .../main/resources/hudson/model/View/newJob_fr.properties | 4 ++-- .../main/resources/hudson/model/View/newJob_it.properties | 4 ++-- .../main/resources/hudson/model/View/newJob_ja.properties | 3 --- .../main/resources/hudson/model/View/newJob_ko.properties | 2 -- .../resources/hudson/model/View/newJob_nb_NO.properties | 4 ++-- .../main/resources/hudson/model/View/newJob_nl.properties | 4 ++-- .../main/resources/hudson/model/View/newJob_pl.properties | 4 ++-- .../resources/hudson/model/View/newJob_pt_BR.properties | 6 +++--- .../main/resources/hudson/model/View/newJob_ru.properties | 3 --- .../resources/hudson/model/View/newJob_sv_SE.properties | 4 ++-- .../main/resources/hudson/model/View/newJob_tr.properties | 6 +++--- .../resources/hudson/model/View/newJob_zh_CN.properties | 4 ++-- .../resources/hudson/model/View/newJob_zh_TW.properties | 2 +- 19 files changed, 35 insertions(+), 42 deletions(-) create mode 100644 core/src/main/resources/hudson/model/View/newJob.properties diff --git a/core/src/main/resources/hudson/model/View/newJob.jelly b/core/src/main/resources/hudson/model/View/newJob.jelly index 1cbdff1558..83ffab7838 100644 --- a/core/src/main/resources/hudson/model/View/newJob.jelly +++ b/core/src/main/resources/hudson/model/View/newJob.jelly @@ -27,11 +27,11 @@ THE SOFTWARE. --> - + - diff --git a/core/src/main/resources/hudson/model/View/newJob.properties b/core/src/main/resources/hudson/model/View/newJob.properties new file mode 100644 index 0000000000..2b841de29e --- /dev/null +++ b/core/src/main/resources/hudson/model/View/newJob.properties @@ -0,0 +1,3 @@ +NewJob=New {0} +JobName={0} name +CopyExisting=Copy existing {0} diff --git a/core/src/main/resources/hudson/model/View/newJob_da.properties b/core/src/main/resources/hudson/model/View/newJob_da.properties index f232537292..7b2985813f 100644 --- a/core/src/main/resources/hudson/model/View/newJob_da.properties +++ b/core/src/main/resources/hudson/model/View/newJob_da.properties @@ -20,6 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Copy\ existing\ job=Kopier eksisterende job -Job\ name=Job navn -New\ Job=Nyt job +CopyExisting=Kopier eksisterende {0} +JobName={0} navn +NewJob=Nyt {0} diff --git a/core/src/main/resources/hudson/model/View/newJob_de.properties b/core/src/main/resources/hudson/model/View/newJob_de.properties index 62e69d2675..3f7f038d6f 100644 --- a/core/src/main/resources/hudson/model/View/newJob_de.properties +++ b/core/src/main/resources/hudson/model/View/newJob_de.properties @@ -20,6 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Job\ name=Job Name -Copy\ existing\ job=Kopiere bestehenden Job -New\ Job=Neuen Job anlegen +JobName={0} Name +CopyExisting=Kopiere bestehenden {0} +NewJob=Neuen {0} anlegen diff --git a/core/src/main/resources/hudson/model/View/newJob_el.properties b/core/src/main/resources/hudson/model/View/newJob_el.properties index b6fd522b77..ccabb0279d 100644 --- a/core/src/main/resources/hudson/model/View/newJob_el.properties +++ b/core/src/main/resources/hudson/model/View/newJob_el.properties @@ -20,5 +20,3 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Copy\ existing\ job=\u0391\u03BD\u03C4\u03B9\u03B3\u03C1\u03B1\u03C6\u03AE \u03C5\u03C0\u03AC\u03C1\u03C7\u03BF\u03C5\u03C3\u03B1\u03C2 \u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1\u03C2 -Job\ name=\u039F\u03BD\u03BF\u03BC\u03B1\u03C3\u03AF\u03B1 \u0395\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1\u03C2 diff --git a/core/src/main/resources/hudson/model/View/newJob_es.properties b/core/src/main/resources/hudson/model/View/newJob_es.properties index 5858160243..ab3c60388a 100644 --- a/core/src/main/resources/hudson/model/View/newJob_es.properties +++ b/core/src/main/resources/hudson/model/View/newJob_es.properties @@ -20,6 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Job\ name=Nombre del proyecto -Copy\ existing\ job=Copiar un proyecto existente -New\ Job=Nuevo proyecto +JobName=Nombre del {0} +CopyExisting=Copiar un {0} existente +NewJob=Nuevo {0} diff --git a/core/src/main/resources/hudson/model/View/newJob_fr.properties b/core/src/main/resources/hudson/model/View/newJob_fr.properties index a375ab2cec..e83da6a657 100644 --- a/core/src/main/resources/hudson/model/View/newJob_fr.properties +++ b/core/src/main/resources/hudson/model/View/newJob_fr.properties @@ -20,5 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Job\ name=Nom du job -Copy\ existing\ job=Copier un job existant +JobName=Nom du {0} +CopyExisting=Copier un {0} existant diff --git a/core/src/main/resources/hudson/model/View/newJob_it.properties b/core/src/main/resources/hudson/model/View/newJob_it.properties index fc61930fc7..b18711cc33 100644 --- a/core/src/main/resources/hudson/model/View/newJob_it.properties +++ b/core/src/main/resources/hudson/model/View/newJob_it.properties @@ -20,5 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Copy\ existing\ job=Copia job esistente -Job\ name=Nome job +CopyExisting=Copia {0} esistente +JobName=Nome {0} diff --git a/core/src/main/resources/hudson/model/View/newJob_ja.properties b/core/src/main/resources/hudson/model/View/newJob_ja.properties index ec25ad3266..d4fa2f52a8 100644 --- a/core/src/main/resources/hudson/model/View/newJob_ja.properties +++ b/core/src/main/resources/hudson/model/View/newJob_ja.properties @@ -20,6 +20,3 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Job\ name=\u30B8\u30E7\u30D6\u540D -Copy\ existing\ job=\u65E2\u5B58\u30B8\u30E7\u30D6\u306E\u30B3\u30D4\u30FC -New\ Job=\u65B0\u898F\u30B8\u30E7\u30D6 diff --git a/core/src/main/resources/hudson/model/View/newJob_ko.properties b/core/src/main/resources/hudson/model/View/newJob_ko.properties index ab03e15052..3c50e826e4 100644 --- a/core/src/main/resources/hudson/model/View/newJob_ko.properties +++ b/core/src/main/resources/hudson/model/View/newJob_ko.properties @@ -20,6 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Job\ name=\uC791\uC5C5\uBA85 -Copy\ existing\ job=\uAE30\uC874 \uC791\uC5C5 \uBCF5\uC0AC Copy\ from=\uBCF5\uC0AC \uC704\uCE58 diff --git a/core/src/main/resources/hudson/model/View/newJob_nb_NO.properties b/core/src/main/resources/hudson/model/View/newJob_nb_NO.properties index 099ca9c316..751f289a23 100644 --- a/core/src/main/resources/hudson/model/View/newJob_nb_NO.properties +++ b/core/src/main/resources/hudson/model/View/newJob_nb_NO.properties @@ -20,5 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Copy\ existing\ job=Kopier eksisterende jobb -Job\ name=Jobbnavn +CopyExisting=Kopier eksisterende {0} +JobName={0}navn diff --git a/core/src/main/resources/hudson/model/View/newJob_nl.properties b/core/src/main/resources/hudson/model/View/newJob_nl.properties index 93c1207997..5c7fa71790 100644 --- a/core/src/main/resources/hudson/model/View/newJob_nl.properties +++ b/core/src/main/resources/hudson/model/View/newJob_nl.properties @@ -20,6 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Job\ name=Jobnaam -Copy\ existing\ job=Kopi\u00EBer bestaande job +JobName={0}naam +CopyExisting=Kopi\u00EBer bestaande {0} Copy\ from=Kopi\u00EBer van diff --git a/core/src/main/resources/hudson/model/View/newJob_pl.properties b/core/src/main/resources/hudson/model/View/newJob_pl.properties index 5dbb2ab842..356f15a5ab 100644 --- a/core/src/main/resources/hudson/model/View/newJob_pl.properties +++ b/core/src/main/resources/hudson/model/View/newJob_pl.properties @@ -20,5 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Copy\ existing\ job=Kopiuj istniej\u0105ce zadanie -Job\ name=Nazwa zadania +CopyExisting=Kopiuj istniej\u0105ce {0} +JobName=Nazwa {0} diff --git a/core/src/main/resources/hudson/model/View/newJob_pt_BR.properties b/core/src/main/resources/hudson/model/View/newJob_pt_BR.properties index b9a9dc4687..5507436540 100644 --- a/core/src/main/resources/hudson/model/View/newJob_pt_BR.properties +++ b/core/src/main/resources/hudson/model/View/newJob_pt_BR.properties @@ -20,6 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Job\ name=Nome da tarefa -Copy\ existing\ job=Copiar tarefa existente -New\ Job=Nova Tarefa +JobName=Nome da {0} +CopyExisting=Copiar {0} existente +NewJob=Nova {0} diff --git a/core/src/main/resources/hudson/model/View/newJob_ru.properties b/core/src/main/resources/hudson/model/View/newJob_ru.properties index c662e645c3..28899d1655 100644 --- a/core/src/main/resources/hudson/model/View/newJob_ru.properties +++ b/core/src/main/resources/hudson/model/View/newJob_ru.properties @@ -20,6 +20,3 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Job\ name=\u0418\u043c\u044f \u0437\u0430\u0434\u0430\u0447\u0438 -Copy\ existing\ job=\u041a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0449\u0443\u044e \u0437\u0430\u0434\u0430\u0447\u0443 -Copy\ from=\u0421\u043d\u044f\u0442\u044c \u043a\u043e\u043f\u0438\u044e \u0441 diff --git a/core/src/main/resources/hudson/model/View/newJob_sv_SE.properties b/core/src/main/resources/hudson/model/View/newJob_sv_SE.properties index c7b45438e2..fa9d27596d 100644 --- a/core/src/main/resources/hudson/model/View/newJob_sv_SE.properties +++ b/core/src/main/resources/hudson/model/View/newJob_sv_SE.properties @@ -20,5 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Copy\ existing\ job=Kopiera existerande jobb -Job\ name=Namn p\u00E5 jobb +CopyExisting=Kopiera existerande {0} +JobName=Namn p\u00E5 {0} diff --git a/core/src/main/resources/hudson/model/View/newJob_tr.properties b/core/src/main/resources/hudson/model/View/newJob_tr.properties index de96a06518..7172c45a1c 100644 --- a/core/src/main/resources/hudson/model/View/newJob_tr.properties +++ b/core/src/main/resources/hudson/model/View/newJob_tr.properties @@ -20,6 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Job\ name=\u0130\u015f\ ad\u0131 -Copy\ existing\ job=Varolan\ bir\ i\u015fi\ kopyala -Copy\ from=Kopyalanacak i\u015f +#JobName=\u0130\u015f\ ad\u0131 +#CopyExisting=Varolan\ bir\ i\u015fi\ kopyala +#Copy\ from=Kopyalanacak i\u015f diff --git a/core/src/main/resources/hudson/model/View/newJob_zh_CN.properties b/core/src/main/resources/hudson/model/View/newJob_zh_CN.properties index 67bf9991c9..133ccb8347 100644 --- a/core/src/main/resources/hudson/model/View/newJob_zh_CN.properties +++ b/core/src/main/resources/hudson/model/View/newJob_zh_CN.properties @@ -20,5 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Copy\ existing\ job=\u590D\u5236\u73B0\u6709\u4EFB\u52A1 -Job\ name=\u4EFB\u52A1\u540D\u79F0 +#CopyExisting=\u590D\u5236\u73B0\u6709\u4EFB\u52A1 +#JobName=\u4EFB\u52A1\u540D\u79F0 diff --git a/core/src/main/resources/hudson/model/View/newJob_zh_TW.properties b/core/src/main/resources/hudson/model/View/newJob_zh_TW.properties index dbf48f24d0..bb88ddd0b0 100644 --- a/core/src/main/resources/hudson/model/View/newJob_zh_TW.properties +++ b/core/src/main/resources/hudson/model/View/newJob_zh_TW.properties @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Job\ name=\u5DE5\u4F5C\u540D\u7A31 +#JobName=\u5DE5\u4F5C\u540D\u7A31 From fd57ec32434677dd9fef0d374ba4b3f1877662e8 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 23 Jun 2011 17:29:19 -0700 Subject: [PATCH 03/19] dependency graph needs to be rebuilt to reflect the copied item --- core/src/main/java/hudson/model/ItemGroupMixIn.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/main/java/hudson/model/ItemGroupMixIn.java b/core/src/main/java/hudson/model/ItemGroupMixIn.java index 98bfa23ffd..47545122b7 100644 --- a/core/src/main/java/hudson/model/ItemGroupMixIn.java +++ b/core/src/main/java/hudson/model/ItemGroupMixIn.java @@ -207,6 +207,7 @@ public abstract class ItemGroupMixIn { add(result); ItemListener.fireOnCopied(src,result); + Hudson.getInstance().rebuildDependencyGraph(); return result; } From ac79f36fe84de426edb2002bc5932f1e2db10ee2 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 23 Jun 2011 17:45:51 -0700 Subject: [PATCH 04/19] added defensive check. --- core/src/main/java/hudson/model/Hudson.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/main/java/hudson/model/Hudson.java b/core/src/main/java/hudson/model/Hudson.java index c50bcba108..07bda7625f 100644 --- a/core/src/main/java/hudson/model/Hudson.java +++ b/core/src/main/java/hudson/model/Hudson.java @@ -2045,6 +2045,7 @@ public class Hudson extends Node implements ModifiableItemGroup, S * Note that the look up is case-insensitive. */ public TopLevelItem getItem(String name) { + if (name==null) return null; TopLevelItem item = items.get(name); if (item==null || !item.hasPermission(Item.READ)) return null; From 189e95d2dbe30c79f253d30f0bd2ff9e0311b311 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 23 Jun 2011 22:24:27 -0700 Subject: [PATCH 05/19] added a convenience method to obtain a relative name from one Item to another. --- .../main/java/hudson/model/AbstractItem.java | 42 +++++++++++++++++++ core/src/main/java/hudson/model/Item.java | 16 +++++++ 2 files changed, 58 insertions(+) diff --git a/core/src/main/java/hudson/model/AbstractItem.java b/core/src/main/java/hudson/model/AbstractItem.java index df287c0524..3773ecb2a3 100644 --- a/core/src/main/java/hudson/model/AbstractItem.java +++ b/core/src/main/java/hudson/model/AbstractItem.java @@ -48,7 +48,11 @@ import org.kohsuke.stapler.export.ExportedBean; import java.io.File; import java.io.IOException; +import java.util.ArrayList; import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; @@ -283,6 +287,44 @@ public abstract class AbstractItem extends Actionable implements Item, HttpDelet else return n+" \u00BB "+getDisplayName(); } + public String getRelativeNameFrom(ItemGroup p) { + // first list up all the parents + Map parents = new HashMap(); + int depth=0; + while (p!=null) { + parents.put(p, depth++); + if (p instanceof Item) + p = ((Item)p).getParent(); + else + p = null; + } + + StringBuilder buf = new StringBuilder(); + Item i=this; + while (true) { + if (buf.length()>0) buf.insert(0,'/'); + buf.insert(0,i.getName()); + ItemGroup g = i.getParent(); + + Integer d = parents.get(g); + if (d!=null) { + String s=""; + for (int j=d; j>0; j--) + s+="../"; + return s+buf; + } + + if (g instanceof Item) + i = (Item)g; + else + return null; + } + } + + public String getRelativeNameFrom(Item item) { + return getRelativeNameFrom(item.getParent()); + } + /** * Called right after when a {@link Item} is loaded from disk. * This is an opporunity to do a post load processing. diff --git a/core/src/main/java/hudson/model/Item.java b/core/src/main/java/hudson/model/Item.java index f4f2e17002..7c089b051a 100644 --- a/core/src/main/java/hudson/model/Item.java +++ b/core/src/main/java/hudson/model/Item.java @@ -122,6 +122,22 @@ public interface Item extends PersistenceRoot, SearchableModelObject, AccessCont */ String getFullDisplayName(); + /** + * Gets the relative name to this item from the specified group. + * + * @since 1.419 + * @return + * String like "../foo/bar" + */ + String getRelativeNameFrom(ItemGroup g); + + /** + * Short for {@code getRelativeNameFrom(item.getParent())} + * + * @since 1.419 + */ + String getRelativeNameFrom(Item item); + /** * Returns the URL of this item relative to the context root of the application. * From 1fffb3403b5e37c63bb710d628aca5765dbad92b Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 23 Jun 2011 22:24:59 -0700 Subject: [PATCH 06/19] added a method to find a nearest job name (with a proper consideration to jobs in a hierarchy) --- .../main/java/hudson/model/AbstractProject.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index 76ae75e7a1..f3bb7573a6 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -1912,13 +1912,22 @@ public abstract class AbstractProject

,R extends A * Finds a {@link AbstractProject} that has the name closest to the given name. */ public static AbstractProject findNearest(String name) { - List projects = Hudson.getInstance().getItems(AbstractProject.class); + return findNearest(name,Hudson.getInstance()); + } + + /** + * Finds a {@link AbstractProject} whose name (when referenced from the specified context) is closest to the given name. + * + * @since 1.419 + */ + public static AbstractProject findNearest(String name, ItemGroup context) { + List projects = Hudson.getInstance().getAllItems(AbstractProject.class); String[] names = new String[projects.size()]; for( int i=0; i REVERSE_INTEGER_COMPARATOR = new Comparator() { From d68ce62bf4bb3e56bab33a6513d7285e50b6d422 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 23 Jun 2011 22:25:25 -0700 Subject: [PATCH 07/19] do a proper check that works correctly with hierarchical jobs --- core/src/main/java/hudson/tasks/BuildTrigger.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/tasks/BuildTrigger.java b/core/src/main/java/hudson/tasks/BuildTrigger.java index 55a9a3b3f3..a39d96e9e8 100644 --- a/core/src/main/java/hudson/tasks/BuildTrigger.java +++ b/core/src/main/java/hudson/tasks/BuildTrigger.java @@ -46,6 +46,7 @@ import hudson.model.Run; import hudson.model.TaskListener; import hudson.model.listeners.ItemListener; import hudson.security.AccessControlled; +import hudson.tasks.BuildTrigger.DescriptorImpl.ItemListenerImpl; import hudson.util.FormValidation; import net.sf.json.JSONObject; import org.apache.commons.lang.StringUtils; @@ -324,7 +325,8 @@ public class BuildTrigger extends Recorder implements DependecyDeclarer { if (StringUtils.isNotBlank(projectName)) { Item item = Hudson.getInstance().getItem(projectName,project,Item.class); if(item==null) - return FormValidation.error(Messages.BuildTrigger_NoSuchProject(projectName,AbstractProject.findNearest(projectName).getName())); + return FormValidation.error(Messages.BuildTrigger_NoSuchProject(projectName, + AbstractProject.findNearest(projectName,project.getParent()).getRelativeNameFrom(project))); if(!(item instanceof AbstractProject)) return FormValidation.error(Messages.BuildTrigger_NotBuildable(projectName)); hasProjects = true; From 04d64fd49bbc0f7a30855ce0b52d5f81fdc592a1 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 23 Jun 2011 23:12:09 -0700 Subject: [PATCH 08/19] adding something to DescriptorExtensionList should cause addition to ExtensionList of Descriptors as well. --- core/src/main/java/hudson/DescriptorExtensionList.java | 6 ++++++ core/src/main/java/hudson/ExtensionList.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/DescriptorExtensionList.java b/core/src/main/java/hudson/DescriptorExtensionList.java index 8548d8f23f..46a0c32639 100644 --- a/core/src/main/java/hudson/DescriptorExtensionList.java +++ b/core/src/main/java/hudson/DescriptorExtensionList.java @@ -164,6 +164,12 @@ public class DescriptorExtensionList, D extends Descrip return r; } + @Override + public boolean add(D d) { + hudson.getExtensionList(Descriptor.class).add(d); // add it to the master descriptor list as well + return super.add(d); + } + /** * Stores manually registered Descriptor instances. Keyed by the {@link Describable} type. */ diff --git a/core/src/main/java/hudson/ExtensionList.java b/core/src/main/java/hudson/ExtensionList.java index 4290c2565c..6d44a61755 100644 --- a/core/src/main/java/hudson/ExtensionList.java +++ b/core/src/main/java/hudson/ExtensionList.java @@ -76,7 +76,7 @@ public class ExtensionList extends AbstractList { private volatile List> extensions; /** - * Place to store manually registered instances with the per-Hudson scope. + * Place to store manually registered instances with the per-Jenkins scope. * {@link CopyOnWriteArrayList} is used here to support concurrent iterations and mutation. */ private final CopyOnWriteArrayList> legacyInstances; From b8af4ae31227697c00ddc971e479af27e4c1b85e Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 2 Jul 2011 14:07:43 -0700 Subject: [PATCH 09/19] Added a mechanism to bypass basic authentication. --- .../main/java/hudson/security/NoopFilter.java | 49 +++++++++++++++++++ .../WEB-INF/security/SecurityFilters.groovy | 3 ++ 2 files changed, 52 insertions(+) create mode 100644 core/src/main/java/hudson/security/NoopFilter.java diff --git a/core/src/main/java/hudson/security/NoopFilter.java b/core/src/main/java/hudson/security/NoopFilter.java new file mode 100644 index 0000000000..36e6e78420 --- /dev/null +++ b/core/src/main/java/hudson/security/NoopFilter.java @@ -0,0 +1,49 @@ +/* + * The MIT License + * + * Copyright (c) 2011, CloudBees, 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 hudson.security; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import java.io.IOException; + +/** + * {@link Filter} that does nothing. + * + * @author Kohsuke Kawaguchi + */ +public class NoopFilter implements Filter { + public void init(FilterConfig filterConfig) throws ServletException { + } + + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { + chain.doFilter(request,response); + } + + public void destroy() { + } +} diff --git a/war/src/main/webapp/WEB-INF/security/SecurityFilters.groovy b/war/src/main/webapp/WEB-INF/security/SecurityFilters.groovy index 83d821c92e..0e6b6ffdb4 100644 --- a/war/src/main/webapp/WEB-INF/security/SecurityFilters.groovy +++ b/war/src/main/webapp/WEB-INF/security/SecurityFilters.groovy @@ -39,6 +39,7 @@ import org.acegisecurity.ui.basicauth.BasicProcessingFilterEntryPoint import org.acegisecurity.ui.rememberme.RememberMeProcessingFilter import hudson.security.HttpSessionContextIntegrationFilter2 import hudson.security.SecurityRealm +import hudson.security.NoopFilter // providers that apply to both patterns def commonProviders() { @@ -63,6 +64,8 @@ filter(ChainedServletFilter) { bean(HttpSessionContextIntegrationFilter2) { }, // allow clients to submit basic authentication credential + // but allow that to be skipped since it can interfere with reverse proxy setup + Boolean.getBoolean("jenkins.security.ignoreBasicAuth") ? bean(NoopFilter) : bean(BasicProcessingFilter) { authenticationManager = securityComponents.manager // if basic authentication fails (which only happens incorrect basic auth credential is sent), From a4df6c6a7bbfab87922523138047bb808696f696 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 30 Jun 2011 17:49:15 -0700 Subject: [PATCH 10/19] follow up to b2a9ccd4f01c3bf74cb24edd944586020b87cdaa. Name is more appropriate than Job --- core/src/main/resources/hudson/views/Messages.properties | 2 +- core/src/main/resources/hudson/views/Messages_da.properties | 1 - core/src/main/resources/hudson/views/Messages_de.properties | 1 - core/src/main/resources/hudson/views/Messages_es.properties | 1 - core/src/main/resources/hudson/views/Messages_ja.properties | 1 - core/src/main/resources/hudson/views/Messages_pt_BR.properties | 2 -- 6 files changed, 1 insertion(+), 7 deletions(-) diff --git a/core/src/main/resources/hudson/views/Messages.properties b/core/src/main/resources/hudson/views/Messages.properties index b8ee8646a0..eef88e7266 100644 --- a/core/src/main/resources/hudson/views/Messages.properties +++ b/core/src/main/resources/hudson/views/Messages.properties @@ -21,7 +21,7 @@ # THE SOFTWARE. BuildButtonColumn.DisplayName=Build Button -JobColumn.DisplayName=Job +JobColumn.DisplayName=Name LastDurationColumn.DisplayName=Last Duration LastFailureColumn.DisplayName=Last Failure LastStableColumn.DisplayName=Last Stable diff --git a/core/src/main/resources/hudson/views/Messages_da.properties b/core/src/main/resources/hudson/views/Messages_da.properties index 8f3108b06a..2a83f55fc2 100644 --- a/core/src/main/resources/hudson/views/Messages_da.properties +++ b/core/src/main/resources/hudson/views/Messages_da.properties @@ -27,4 +27,3 @@ WeatherColumn.DisplayName=Vejrudsigt LastSuccessColumn.DisplayName=Seneste succes LastFailureColumn.DisplayName=Seneste fejlede LastStableColumn.DisplayName=Seneste stabile -JobColumn.DisplayName=Job diff --git a/core/src/main/resources/hudson/views/Messages_de.properties b/core/src/main/resources/hudson/views/Messages_de.properties index de687ac54f..c030ebc410 100644 --- a/core/src/main/resources/hudson/views/Messages_de.properties +++ b/core/src/main/resources/hudson/views/Messages_de.properties @@ -21,7 +21,6 @@ # THE SOFTWARE. BuildButtonColumn.DisplayName=Build-Schaltfläche -JobColumn.DisplayName=Job LastDurationColumn.DisplayName=Letzte Dauer LastFailureColumn.DisplayName=Letzter Fehlschlag LastStableColumn.DisplayName=Letzter stabiler Build diff --git a/core/src/main/resources/hudson/views/Messages_es.properties b/core/src/main/resources/hudson/views/Messages_es.properties index 970f80ec23..4f500856f6 100644 --- a/core/src/main/resources/hudson/views/Messages_es.properties +++ b/core/src/main/resources/hudson/views/Messages_es.properties @@ -21,7 +21,6 @@ # THE SOFTWARE. BuildButtonColumn.DisplayName=Botón de ejecución -JobColumn.DisplayName=Tarea LastDurationColumn.DisplayName=Última duración LastFailureColumn.DisplayName=Último fallo LastStableColumn.DisplayName=Último estable diff --git a/core/src/main/resources/hudson/views/Messages_ja.properties b/core/src/main/resources/hudson/views/Messages_ja.properties index 35c728fee8..ae2a7c924d 100644 --- a/core/src/main/resources/hudson/views/Messages_ja.properties +++ b/core/src/main/resources/hudson/views/Messages_ja.properties @@ -21,7 +21,6 @@ # THE SOFTWARE. BuildButtonColumn.DisplayName=\u30D3\u30EB\u30C9\u30DC\u30BF\u30F3 -JobColumn.DisplayName=\u30B8\u30E7\u30D6 LastDurationColumn.DisplayName=\u30D3\u30EB\u30C9\u6240\u8981\u6642\u9593 LastFailureColumn.DisplayName=\u6700\u65B0\u306E\u5931\u6557\u30D3\u30EB\u30C9 LastStableColumn.DisplayName=\u6700\u65B0\u306E\u5B89\u5B9A\u30D3\u30EB\u30C9 diff --git a/core/src/main/resources/hudson/views/Messages_pt_BR.properties b/core/src/main/resources/hudson/views/Messages_pt_BR.properties index c92238bb7c..3430c688e9 100644 --- a/core/src/main/resources/hudson/views/Messages_pt_BR.properties +++ b/core/src/main/resources/hudson/views/Messages_pt_BR.properties @@ -34,5 +34,3 @@ LastSuccessColumn.DisplayName=\u00daltimo sucesso LastFailureColumn.DisplayName=\u00daltima falha # Last Stable LastStableColumn.DisplayName=\u00daltimo est\u00e1vel -# Job -JobColumn.DisplayName=Tarefa From f53bb92f9494b4cb3173dd6e5ff3a5f77c0c62aa Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 2 Jul 2011 14:52:49 -0700 Subject: [PATCH 11/19] call sequence of this is different from that of Maven2, and this breaks MavenArtifactArchiver. By the time MavenModuleSetBuild.notifyModuleBuild() is called, we need the processing on one module to be completed. --- .../main/java/hudson/maven/Maven3Builder.java | 9 +++--- .../main/java/hudson/maven/MavenBuild.java | 3 ++ .../hudson/maven/MavenModuleSetBuild.java | 6 +++- .../MavenAbstractArtifactRecord.java | 16 +++++++++++ .../MavenAggregatedArtifactRecord.java | 28 ++++++++++++++----- .../hudson/maven/reporters/MavenArtifact.java | 9 +++++- .../maven/reporters/MavenArtifactRecord.java | 16 +++++++---- 7 files changed, 69 insertions(+), 18 deletions(-) diff --git a/maven-plugin/src/main/java/hudson/maven/Maven3Builder.java b/maven-plugin/src/main/java/hudson/maven/Maven3Builder.java index c14fdc83ba..1cbf0b2a10 100644 --- a/maven-plugin/src/main/java/hudson/maven/Maven3Builder.java +++ b/maven-plugin/src/main/java/hudson/maven/Maven3Builder.java @@ -393,7 +393,6 @@ public class Maven3Builder extends AbstractMavenBuilder implements DelegatingCal public void reccordProjectSucceeded( ExecutionEvent event ) { MavenBuildProxy2 mavenBuildProxy2 = getMavenBuildProxy2( event.getProject() ); - mavenBuildProxy2.end(); mavenBuildProxy2.setResult( Result.SUCCESS ); @@ -423,7 +422,8 @@ public class Maven3Builder extends AbstractMavenBuilder implements DelegatingCal } } - } + mavenBuildProxy2.end(); + } /** * @see org.apache.maven.execution.ExecutionListener#projectFailed(org.apache.maven.execution.ExecutionEvent) @@ -438,7 +438,6 @@ public class Maven3Builder extends AbstractMavenBuilder implements DelegatingCal public void reccordProjectFailed( ExecutionEvent event ) { MavenBuildProxy2 mavenBuildProxy2 = getMavenBuildProxy2( event.getProject() ); - mavenBuildProxy2.end(); mavenBuildProxy2.setResult( Result.FAILURE ); MavenProject mavenProject = event.getProject(); List mavenReporters = getMavenReporters( mavenProject ); @@ -466,7 +465,9 @@ public class Maven3Builder extends AbstractMavenBuilder implements DelegatingCal } } } - } + + mavenBuildProxy2.end(); + } /** * @see org.apache.maven.execution.ExecutionListener#mojoSkipped(org.apache.maven.execution.ExecutionEvent) diff --git a/maven-plugin/src/main/java/hudson/maven/MavenBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenBuild.java index 80d999ef8a..1b9eb43893 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenBuild.java @@ -25,6 +25,8 @@ package hudson.maven; import hudson.FilePath; import hudson.EnvVars; +import hudson.maven.reporters.MavenArtifact; +import hudson.maven.reporters.MavenArtifactRecord; import hudson.maven.reporters.SurefireArchiver; import hudson.slaves.WorkspaceList; import hudson.slaves.WorkspaceList.Lease; @@ -55,6 +57,7 @@ import org.apache.maven.project.MavenProject; import org.kohsuke.stapler.Ancestor; import org.kohsuke.stapler.Stapler; import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.export.Exported; import java.io.File; import java.io.FileNotFoundException; diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java index 5a9615527e..afef8d617f 100755 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java @@ -33,6 +33,8 @@ import hudson.FilePath.FileCallable; import hudson.Launcher; import hudson.Util; import hudson.maven.MavenBuild.ProxyImpl2; +import hudson.maven.reporters.MavenAggregatedArtifactRecord; +import hudson.maven.reporters.MavenArtifactRecord; import hudson.maven.reporters.MavenFingerprinter; import hudson.maven.reporters.MavenMailer; import hudson.model.AbstractProject; @@ -95,6 +97,7 @@ import org.apache.maven.project.ProjectBuildingException; import org.codehaus.plexus.util.PathTool; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; +import org.kohsuke.stapler.export.Exported; import org.sonatype.aether.transfer.TransferCancelledException; import org.sonatype.aether.transfer.TransferEvent; import org.sonatype.aether.transfer.TransferListener; @@ -342,6 +345,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild> extends TaskAction implements BuildBadgeAction { + @ExportedBean public final class Record { /** * Repository URL that artifacts were deployed. */ + @Exported public final String url; /** @@ -107,26 +112,32 @@ public abstract class MavenAbstractArtifactRecord> /** * Result of the deployment. During the build, this value is null. */ + @Exported public Result getResult() { return result; } + @Exported public int getNumber() { return records.indexOf(this); } + @Exported public boolean isBuilding() { return result==null; } + @Exported public Calendar getTimestamp() { return (Calendar) timeStamp.clone(); } + @Exported public String getBuildStatusUrl() { return getIconColor().getImage(); } + @Exported public BallColor getIconColor() { if(result==null) return BallColor.GREY_ANIME; @@ -144,6 +155,7 @@ public abstract class MavenAbstractArtifactRecord> /** * Records of a deployment. */ + @Exported public final CopyOnWriteArrayList records = new CopyOnWriteArrayList(); /** @@ -171,6 +183,10 @@ public abstract class MavenAbstractArtifactRecord> return REDEPLOY; } + public Api getApi() { + return new Api(this); + } + public boolean hasBadge() { if (records != null) { for (final Record record : records) { diff --git a/maven-plugin/src/main/java/hudson/maven/reporters/MavenAggregatedArtifactRecord.java b/maven-plugin/src/main/java/hudson/maven/reporters/MavenAggregatedArtifactRecord.java index 03840985f1..0a57ed6b1e 100644 --- a/maven-plugin/src/main/java/hudson/maven/reporters/MavenAggregatedArtifactRecord.java +++ b/maven-plugin/src/main/java/hudson/maven/reporters/MavenAggregatedArtifactRecord.java @@ -34,18 +34,22 @@ import hudson.model.Action; import hudson.model.TaskListener; import java.io.IOException; +import java.util.ArrayList; import java.util.List; import java.util.Map; import org.apache.maven.artifact.deployer.ArtifactDeploymentException; import org.apache.maven.artifact.repository.ArtifactRepository; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; +import org.kohsuke.stapler.export.Exported; +import org.kohsuke.stapler.export.ExportedBean; /** * Redeploy action for the entire {@link MavenModuleSetBuild}. * * @author Kohsuke Kawaguchi */ +@ExportedBean public class MavenAggregatedArtifactRecord extends MavenAbstractArtifactRecord implements MavenAggregatedReport { public final MavenModuleSetBuild parent; @@ -68,17 +72,27 @@ public class MavenAggregatedArtifactRecord extends MavenAbstractArtifactRecord getModuleRecords() { + List r = new ArrayList(); + for (MavenBuild build : parent.getModuleLastBuilds().values()) { + MavenArtifactRecord mar = build.getAction(MavenArtifactRecord.class); + if(mar!=null) r.add(mar); + } + return r; + } + public void deploy(MavenEmbedder embedder, ArtifactRepository deploymentRepository, TaskListener listener) throws MavenEmbedderException, IOException, ComponentLookupException, ArtifactDeploymentException { if(debug) listener.getLogger().println("Redeploying artifacts of "+parent+" timestamp="+parent.getTimestamp()); - for (MavenBuild build : parent.getModuleLastBuilds().values()) { - MavenArtifactRecord mar = build.getAction(MavenArtifactRecord.class); - if(mar!=null) { - if(debug) - listener.getLogger().println("Deploying module: "+build+" timestamp="+build.getTimestamp()); - mar.deploy(embedder,deploymentRepository,listener); - } + for (MavenArtifactRecord mar : getModuleRecords()) { + if(debug) + listener.getLogger().println("Deploying module: "+mar.parent+" timestamp="+mar.parent.getTimestamp()); + mar.deploy(embedder,deploymentRepository,listener); } } } diff --git a/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifact.java b/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifact.java index 5ed722d756..29110499d1 100644 --- a/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifact.java +++ b/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifact.java @@ -1,7 +1,7 @@ /* * The MIT License * - * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi + * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, CloudBees, 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 @@ -39,6 +39,8 @@ import org.apache.maven.artifact.handler.DefaultArtifactHandler; import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager; import com.google.common.collect.Maps; +import org.kohsuke.stapler.export.Exported; +import org.kohsuke.stapler.export.ExportedBean; import java.io.File; import java.io.FileInputStream; @@ -61,10 +63,12 @@ import java.util.logging.Logger; * @author Kohsuke Kawaguchi * @since 1.189 */ +@ExportedBean public final class MavenArtifact implements Serializable { /** * Basic parameters of a Maven artifact. */ + @Exported public final String groupId, artifactId, version, classifier, type; /** @@ -78,6 +82,7 @@ public final class MavenArtifact implements Serializable { * use their finalName if one is configured.) This is often * different from {@link #canonicalName}. */ + @Exported public final String fileName; /** @@ -88,11 +93,13 @@ public final class MavenArtifact implements Serializable { * The reason we persist this is that the extension is only available * through {@link ArtifactHandler}. */ + @Exported public final String canonicalName; /** * The md5sum for this artifact. */ + @Exported public final String md5sum; public MavenArtifact(Artifact a) throws IOException { diff --git a/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactRecord.java b/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactRecord.java index f2d3bf5106..368c00d8f3 100644 --- a/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactRecord.java +++ b/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactRecord.java @@ -1,8 +1,8 @@ /* * The MIT License * - * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi - * + * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, CloudBees, 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 @@ -33,6 +33,7 @@ import hudson.maven.MavenModuleSetBuild; import hudson.maven.MavenUtil; import hudson.maven.RedeployPublisher.WrappedArtifactRepository; import hudson.model.Action; +import hudson.model.Api; import hudson.model.TaskListener; import java.io.IOException; @@ -50,6 +51,8 @@ import org.apache.maven.artifact.installer.ArtifactInstaller; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.project.artifact.ProjectArtifactMetadata; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; +import org.kohsuke.stapler.export.Exported; +import org.kohsuke.stapler.export.ExportedBean; /** * {@link Action} that remembers {@link MavenArtifact artifact}s that are built. @@ -59,15 +62,18 @@ import org.codehaus.plexus.component.repository.exception.ComponentLookupExcepti * @author Kohsuke Kawaguchi * @see MavenArtifactArchiver */ +@ExportedBean public class MavenArtifactRecord extends MavenAbstractArtifactRecord implements AggregatableAction { /** * The build to which this record belongs. */ + @Exported public final MavenBuild parent; /** * POM artifact. */ + @Exported(inline=true) public final MavenArtifact pomArtifact; /** @@ -75,11 +81,13 @@ public class MavenArtifactRecord extends MavenAbstractArtifactRecord * * If this is a POM module, the main artifact contains the same value as {@link #pomArtifact}. */ + @Exported(inline=true) public final MavenArtifact mainArtifact; /** * Attached artifacts. Can be empty but never null. */ + @Exported(inline=true) public final List attachedArtifacts; public MavenArtifactRecord(MavenBuild parent, MavenArtifact pomArtifact, MavenArtifact mainArtifact, List attachedArtifacts) { @@ -102,7 +110,7 @@ public class MavenArtifactRecord extends MavenAbstractArtifactRecord return mainArtifact.isPOM(); } - public MavenAggregatedReport createAggregatedAction(MavenModuleSetBuild build, Map> moduleBuilds) { + public MavenAggregatedArtifactRecord createAggregatedAction(MavenModuleSetBuild build, Map> moduleBuilds) { return new MavenAggregatedArtifactRecord(build); } @@ -144,8 +152,6 @@ public class MavenArtifactRecord extends MavenAbstractArtifactRecord } } - - /** * Installs the artifact to the local Maven repository. */ From cee86fbb733f6b0125bb7d15cd19f8f0ca56a2de Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 2 Jul 2011 15:21:40 -0700 Subject: [PATCH 12/19] Making artifacts available for downloads. --- .../main/java/hudson/util/HttpResponses.java | 43 +++++++++++++++++++ .../main/java/hudson/maven/MavenBuild.java | 9 +++- .../hudson/maven/MavenModuleSetBuild.java | 8 ++++ .../hudson/maven/reporters/MavenArtifact.java | 16 ++++++- .../maven/AbstractMavenBuild/_api.jelly | 32 ++++++++++++++ 5 files changed, 105 insertions(+), 3 deletions(-) create mode 100644 core/src/main/java/hudson/util/HttpResponses.java create mode 100644 maven-plugin/src/main/resources/hudson/maven/AbstractMavenBuild/_api.jelly diff --git a/core/src/main/java/hudson/util/HttpResponses.java b/core/src/main/java/hudson/util/HttpResponses.java new file mode 100644 index 0000000000..16755adc4c --- /dev/null +++ b/core/src/main/java/hudson/util/HttpResponses.java @@ -0,0 +1,43 @@ +/* + * The MIT License + * + * Copyright (c) 2011, CloudBees, 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 hudson.util; + +import org.kohsuke.stapler.HttpResponse; + +import java.io.File; +import java.io.IOException; + +/** + * Various {@link HttpResponse} implementations. + * + *

+ * This class extends from Stapler so that we can move implementations from here to Stapler periodically. + * + * @author Kohsuke Kawaguchi + */ +public class HttpResponses extends org.kohsuke.stapler.HttpResponses { + public static HttpResponse staticResource(File f) throws IOException { + return staticResource(f.toURI().toURL()); + } +} diff --git a/maven-plugin/src/main/java/hudson/maven/MavenBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenBuild.java index 1b9eb43893..4ea982a79f 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenBuild.java @@ -25,7 +25,6 @@ package hudson.maven; import hudson.FilePath; import hudson.EnvVars; -import hudson.maven.reporters.MavenArtifact; import hudson.maven.reporters.MavenArtifactRecord; import hudson.maven.reporters.SurefireArchiver; import hudson.slaves.WorkspaceList; @@ -184,6 +183,14 @@ public class MavenBuild extends AbstractMavenBuild { return true; } + /** + * Information about artifacts produced by Maven. + */ + @Exported + public MavenArtifactRecord getMavenArtifacts() { + return getAction(MavenArtifactRecord.class); + } + /** * Exposes {@code MAVEN_OPTS} to forked processes. * diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java index afef8d617f..7872f0704f 100755 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java @@ -374,6 +374,14 @@ public class MavenModuleSetBuild extends AbstractMavenBuild + + + +

Artifact Information

+

+ Information about Maven artifacts produced by this are exposed + in a machine readable form. This allows programmatic retrieval of the artifacts. +

+
\ No newline at end of file From 1ed7733fd23234041176153c0a61719360409803 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 2 Jul 2011 15:32:07 -0700 Subject: [PATCH 13/19] Added API --- .../hudson/maven/reporters/MavenArtifact.java | 6 ++- .../reporters/MavenArtifactRecord/_api.jelly | 37 +++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 maven-plugin/src/main/resources/hudson/maven/reporters/MavenArtifactRecord/_api.jelly diff --git a/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifact.java b/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifact.java index af9366c8ed..5cd940e341 100644 --- a/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifact.java +++ b/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifact.java @@ -27,6 +27,7 @@ import hudson.FilePath; import hudson.Util; import hudson.maven.MavenBuild; import hudson.maven.MavenBuildProxy; +import hudson.model.Api; import hudson.model.BuildListener; import hudson.model.FingerprintMap; import hudson.model.Hudson; @@ -48,7 +49,6 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.Serializable; -import java.net.URL; import java.util.Map; import java.util.logging.Logger; @@ -281,6 +281,10 @@ public final class MavenArtifact implements Serializable { map.getOrCreate(build,fileName,md5sum); } + public Api getApi() { + return new Api(this); + } + private static final Logger LOGGER = Logger.getLogger(MavenArtifact.class.getName()); private static final long serialVersionUID = 1L; diff --git a/maven-plugin/src/main/resources/hudson/maven/reporters/MavenArtifactRecord/_api.jelly b/maven-plugin/src/main/resources/hudson/maven/reporters/MavenArtifactRecord/_api.jelly new file mode 100644 index 0000000000..fb1a34bc8a --- /dev/null +++ b/maven-plugin/src/main/resources/hudson/maven/reporters/MavenArtifactRecord/_api.jelly @@ -0,0 +1,37 @@ + + + +

Artifact Download

+

+ primary artifact, + primary artifact, + attached artifact #1, + attached artifact #2, etc., all have + stable URLs that's not affected by their GAV IDs (if you want to access them through GAV IDs, + you can do so through the artifacts link.) Swap the last file with api + and you can retrieve their GAV IDs and other information, such as + this. +

+
\ No newline at end of file From 7f4dc667b22ba8224127fce856140833a488b45d Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 2 Jul 2011 20:35:55 -0700 Subject: [PATCH 14/19] null check useful in case this.clazz is an interface --- core/src/main/java/hudson/model/Descriptor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/model/Descriptor.java b/core/src/main/java/hudson/model/Descriptor.java index 46deacb39e..0a340fbe0d 100644 --- a/core/src/main/java/hudson/model/Descriptor.java +++ b/core/src/main/java/hudson/model/Descriptor.java @@ -667,7 +667,7 @@ public abstract class Descriptor> implements Saveable { } private String getViewPage(Class clazz, String pageName, String defaultValue) { - while(clazz!=Object.class) { + while(clazz!=Object.class && clazz!=null) { String name = clazz.getName().replace('.', '/').replace('$', '/') + "/" + pageName; if(clazz.getClassLoader().getResource(name)!=null) return '/'+name; From d2287b650ccfe00837c5f67b4d034fbfb6614bf5 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 2 Jul 2011 20:38:46 -0700 Subject: [PATCH 15/19] relaxed the error check. --- core/src/main/java/hudson/model/AbstractItem.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/hudson/model/AbstractItem.java b/core/src/main/java/hudson/model/AbstractItem.java index 3773ecb2a3..a9916e5104 100644 --- a/core/src/main/java/hudson/model/AbstractItem.java +++ b/core/src/main/java/hudson/model/AbstractItem.java @@ -368,10 +368,10 @@ public abstract class AbstractItem extends Actionable implements Item, HttpDelet @Exported(visibility=999,name="url") public final String getAbsoluteUrl() { - StaplerRequest request = Stapler.getCurrentRequest(); - if(request==null) - throw new IllegalStateException("Not processing a HTTP request"); - return Util.encode(Hudson.getInstance().getRootUrl()+getUrl()); + String r = Hudson.getInstance().getRootUrl(); + if(r==null) + throw new IllegalStateException("Root URL isn't configured yet. Cannot compute absolute URL."); + return Util.encode(r +getUrl()); } /** From 5510f0fd76cbdcc660b0dc3295c291c59d806356 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 2 Jul 2011 21:10:40 -0700 Subject: [PATCH 16/19] allowing programmatic manipulation of the columns. --- core/src/main/java/hudson/model/ListView.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/hudson/model/ListView.java b/core/src/main/java/hudson/model/ListView.java index 5e463c26a9..1a7299c032 100644 --- a/core/src/main/java/hudson/model/ListView.java +++ b/core/src/main/java/hudson/model/ListView.java @@ -24,6 +24,8 @@ */ package hudson.model; +import com.infradna.tool.bridge_method_injector.BridgeMethodsAdded; +import com.infradna.tool.bridge_method_injector.WithBridgeMethods; import hudson.Extension; import hudson.Util; import hudson.model.Descriptor.FormException; @@ -119,8 +121,9 @@ public class ListView extends View implements Saveable { public DescribableList> getJobFilters() { return jobFilters; } - - public Iterable getColumns() { + + @WithBridgeMethods(Iterable.class) + public DescribableList> getColumns() { return columns; } From 0b6063d1ae973d1eef31fd91612d61857c60740f Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 2 Jul 2011 21:11:05 -0700 Subject: [PATCH 17/19] doc improvement --- core/src/main/java/hudson/model/Run.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java index e9e1709511..5561462f96 100644 --- a/core/src/main/java/hudson/model/Run.java +++ b/core/src/main/java/hudson/model/Run.java @@ -773,10 +773,9 @@ public abstract class Run ,RunT extends RunNEVER be used during HTML page rendering, as it won't work with - * network set up like Apache reverse proxy. - * This method is only intended for the remote API clients who cannot resolve relative references - * (even this won't work for the same reason, which should be fixed.) + * This method shall NEVER be used during HTML page rendering, as it's too easy for + * misconfiguration to break this value, with network set up like Apache reverse proxy. + * This method is only intended for the remote API clients who cannot resolve relative references. */ @Exported(visibility=2,name="url") public final String getAbsoluteUrl() { From 12396aadaf6df3088db561d86025782527a04584 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 2 Jul 2011 21:11:33 -0700 Subject: [PATCH 18/19] exposed more methods --- .../main/java/hudson/model/AbstractItem.java | 2 +- .../maven/reporters/MavenArtifactRecord.java | 29 ++++++++++++++++++- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/hudson/model/AbstractItem.java b/core/src/main/java/hudson/model/AbstractItem.java index a9916e5104..a2caf60fef 100644 --- a/core/src/main/java/hudson/model/AbstractItem.java +++ b/core/src/main/java/hudson/model/AbstractItem.java @@ -371,7 +371,7 @@ public abstract class AbstractItem extends Actionable implements Item, HttpDelet String r = Hudson.getInstance().getRootUrl(); if(r==null) throw new IllegalStateException("Root URL isn't configured yet. Cannot compute absolute URL."); - return Util.encode(r +getUrl()); + return Util.encode(r+getUrl()); } /** diff --git a/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactRecord.java b/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactRecord.java index 368c00d8f3..6d5f8f7d9d 100644 --- a/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactRecord.java +++ b/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactRecord.java @@ -32,12 +32,14 @@ import hudson.maven.MavenModule; import hudson.maven.MavenModuleSetBuild; import hudson.maven.MavenUtil; import hudson.maven.RedeployPublisher.WrappedArtifactRepository; +import hudson.model.AbstractItem; import hudson.model.Action; import hudson.model.Api; import hudson.model.TaskListener; import java.io.IOException; import java.io.PrintStream; +import java.net.URL; import java.util.List; import java.util.Map; @@ -106,6 +108,31 @@ public class MavenArtifactRecord extends MavenAbstractArtifactRecord return parent; } + /** + * Returns the URL of this record relative to the context root of the application. + * + * @see AbstractItem#getUrl() for how to implement this. + * + * @return + * URL that ends with '/'. + */ + public String getUrl() { + return parent.getUrl()+"mavenArtifacts/"; + } + + /** + * Obtains the absolute URL to this build. + * + * @deprecated + * This method shall NEVER be used during HTML page rendering, as it's too easy for + * misconfiguration to break this value, with network set up like Apache reverse proxy. + * This method is only intended for the remote API clients who cannot resolve relative references. + */ + @Exported(visibility=2,name="url") + public String getAbsoluteUrl() { + return parent.getAbsoluteUrl()+"mavenArtifacts/"; + } + public boolean isPOM() { return mainArtifact.isPOM(); } @@ -166,7 +193,7 @@ public class MavenArtifactRecord extends MavenAbstractArtifactRecord installer.install(mainArtifact.getFile(parent),main,embedder.getLocalRepository()); for (MavenArtifact aa : attachedArtifacts) - installer.install(aa.getFile(parent),aa.toArtifact(handlerManager,factory,parent),embedder.getLocalRepository()); + installer.install(aa.getFile(parent), aa.toArtifact(handlerManager, factory, parent), embedder.getLocalRepository()); } public void recordFingerprints() throws IOException { From ce27914ce9a2ca6940653806ff362ccd0a868387 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 2 Jul 2011 21:24:01 -0700 Subject: [PATCH 19/19] fixed a bug where Maven projects couldn't be created inside containers. --- maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java index 2de6d8a6a7..5b1ed400e1 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java @@ -224,12 +224,16 @@ public final class MavenModuleSet extends AbstractMavenProject> buildWrappers = new DescribableList>(this); + /** + * @deprecated + * Use {@link #MavenModuleSet(ItemGroup, String)} + */ public MavenModuleSet(String name) { this(Hudson.getInstance(),name); } public MavenModuleSet(ItemGroup parent, String name) { - super(Hudson.getInstance(),name); + super(parent,name); } public String getUrlChildPrefix() {