Skip to content
Permalink
Browse files

[JENKINS-8446] it's better to let those directories setting be a part…

… of JENKINS_HOME rather than being independent configuration properties, since they aren't orthogonal.
  • Loading branch information...
kohsuke committed Jul 6, 2011
1 parent 7fdb8a8 commit 68d4d22fcff170501e5d91da5f5a35070c272de3
Showing with 205 additions and 213 deletions.
  1. +3 −0 changelog.html
  2. +27 −61 core/src/main/java/hudson/model/Job.java
  3. +35 −49 core/src/main/java/jenkins/model/Jenkins.java
  4. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/_api.jelly
  5. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/_cli.jelly
  6. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/_cli.properties
  7. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/_cli_da.properties
  8. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/_cli_de.properties
  9. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/_cli_es.properties
  10. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/_cli_fr.properties
  11. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/_cli_ja.properties
  12. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/_cli_pt_BR.properties
  13. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/_cli_zh_CN.properties
  14. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/_cli_zh_TW.properties
  15. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/_restart.jelly
  16. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/_restart_da.properties
  17. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/_restart_de.properties
  18. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/_restart_es.properties
  19. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/_restart_fr.properties
  20. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/_restart_ja.properties
  21. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/_restart_pt_BR.properties
  22. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/_safeRestart.jelly
  23. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/_safeRestart_da.properties
  24. +26 −26 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/_safeRestart_de.properties
  25. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/_safeRestart_es.properties
  26. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/_safeRestart_fr.properties
  27. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/_safeRestart_ja.properties
  28. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/_safeRestart_pt_BR.properties
  29. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/_script.jelly
  30. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/_scriptText.jelly
  31. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/accessDenied.jelly
  32. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/accessDenied_da.properties
  33. +27 −27 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/accessDenied_de.properties
  34. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/accessDenied_es.properties
  35. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/accessDenied_ja.properties
  36. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/accessDenied_pt_BR.properties
  37. +8 −0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/configure.jelly
  38. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/configure.properties
  39. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/configureExecutors.jelly
  40. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/configure_da.properties
  41. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/configure_de.properties
  42. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/configure_es.properties
  43. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/configure_fi.properties
  44. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/configure_fr.properties
  45. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/configure_hu.properties
  46. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/configure_ja.properties
  47. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/configure_nl.properties
  48. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/configure_pt_BR.properties
  49. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/configure_ru.properties
  50. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/configure_sv_SE.properties
  51. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/configure_tr.properties
  52. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/configure_zh_CN.properties
  53. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/configure_zh_TW.properties
  54. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/downgrade.jelly
  55. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/downgrade.properties
  56. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/downgrade_da.properties
  57. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/downgrade_de.properties
  58. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/downgrade_es.properties
  59. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/downgrade_ja.properties
  60. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/fingerprintCheck.jelly
  61. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/fingerprintCheck.properties
  62. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/fingerprintCheck_da.properties
  63. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/fingerprintCheck_de.properties
  64. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/fingerprintCheck_es.properties
  65. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/fingerprintCheck_fr.properties
  66. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/fingerprintCheck_hu.properties
  67. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/fingerprintCheck_it.properties
  68. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/fingerprintCheck_ja.properties
  69. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/fingerprintCheck_nl.properties
  70. 0 ...rc/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/fingerprintCheck_pt_BR.properties
  71. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/fingerprintCheck_ru.properties
  72. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/fingerprintCheck_tr.properties
  73. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/help-markupFormatter.html
  74. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/help-markupFormatter_ja.html
  75. +15 −0 core/src/main/resources/jenkins/model/Jenkins/help-rawBuildsDir.html
  76. +14 −0 core/src/main/resources/jenkins/model/Jenkins/help-rawWorkspaceDir.html
  77. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/legend.jelly
  78. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/legend.properties
  79. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/legend_da.properties
  80. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/legend_de.properties
  81. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/legend_es.properties
  82. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/legend_fr.properties
  83. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/legend_ja.properties
  84. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/legend_ko.properties
  85. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/legend_pt_BR.properties
  86. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/legend_zh_TW.properties
  87. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/load-statistics.jelly
  88. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/load-statistics_ja.properties
  89. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/login.jelly
  90. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/login.properties
  91. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/loginError.jelly
  92. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/loginError_da.properties
  93. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/loginError_de.properties
  94. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/loginError_es.properties
  95. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/loginError_fr.properties
  96. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/loginError_ja.properties
  97. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/loginError_ko.properties
  98. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/loginError_nl.properties
  99. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/loginError_pt_BR.properties
  100. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/loginError_ru.properties
  101. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/loginError_tr.properties
  102. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/login_da.properties
  103. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/login_de.properties
  104. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/login_es.properties
  105. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/login_fr.properties
  106. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/login_ja.properties
  107. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/login_ko.properties
  108. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/login_nl.properties
  109. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/login_pt_BR.properties
  110. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/login_ru.properties
  111. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/login_sv_SE.properties
  112. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/login_tr.properties
  113. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/login_zh_TW.properties
  114. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/manag_.groovy
  115. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/manage.jelly
  116. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/manage.properties
  117. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/manage_da.properties
  118. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/manage_de.properties
  119. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/manage_el.properties
  120. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/manage_es.properties
  121. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/manage_fi.properties
  122. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/manage_fr.properties
  123. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/manage_it.properties
  124. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/manage_ja.properties
  125. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/manage_ko.properties
  126. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/manage_nb_NO.properties
  127. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/manage_nl.properties
  128. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/manage_pt_BR.properties
  129. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/manage_ru.properties
  130. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/manage_sv_SE.properties
  131. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/manage_tr.properties
  132. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/manage_uk.properties
  133. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/manage_zh_CN.properties
  134. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/manage_zh_TW.properties
  135. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/newView.jelly
  136. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/newView_da.properties
  137. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/newView_de.properties
  138. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/newView_es.properties
  139. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/newView_fr.properties
  140. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/newView_ja.properties
  141. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/newView_ko.properties
  142. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/newView_nl.properties
  143. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/newView_pt_BR.properties
  144. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/newView_ru.properties
  145. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/newView_sv_SE.properties
  146. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/newView_tr.properties
  147. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/noPrincipal.jelly
  148. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/noPrincipal.properties
  149. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/noPrincipal_da.properties
  150. +26 −26 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/noPrincipal_de.properties
  151. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/noPrincipal_es.properties
  152. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/noPrincipal_ja.properties
  153. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/noPrincipal_pt_BR.properties
  154. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/opensearch.xml.jelly
  155. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/projectRelationship-help.jelly
  156. 0 .../main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/projectRelationship-help.properties
  157. 0 ...in/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/projectRelationship-help_da.properties
  158. 0 ...in/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/projectRelationship-help_de.properties
  159. 0 ...in/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/projectRelationship-help_es.properties
  160. 0 ...in/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/projectRelationship-help_fr.properties
  161. 0 ...in/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/projectRelationship-help_ja.properties
  162. 0 ...in/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/projectRelationship-help_nl.properties
  163. 0 ...resources/{hudson/model/Hudson → jenkins/model/Jenkins}/projectRelationship-help_pt_BR.properties
  164. 0 ...in/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/projectRelationship-help_ru.properties
  165. 0 ...in/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/projectRelationship-help_tr.properties
  166. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/projectRelationship.jelly
  167. 0 ...rc/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/projectRelationship_da.properties
  168. 0 ...rc/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/projectRelationship_de.properties
  169. 0 ...rc/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/projectRelationship_es.properties
  170. 0 ...rc/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/projectRelationship_fr.properties
  171. 0 ...rc/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/projectRelationship_it.properties
  172. 0 ...rc/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/projectRelationship_ja.properties
  173. 0 ...rc/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/projectRelationship_nl.properties
  174. 0 ...main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/projectRelationship_pt_BR.properties
  175. 0 ...rc/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/projectRelationship_ru.properties
  176. 0 ...main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/projectRelationship_sv_SE.properties
  177. 0 ...rc/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/projectRelationship_tr.properties
  178. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/sidepanel.jelly
  179. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/systemInfo.jelly
  180. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/systemInfo_da.properties
  181. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/systemInfo_de.properties
  182. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/systemInfo_es.properties
  183. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/systemInfo_fr.properties
  184. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/systemInfo_ja.properties
  185. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/systemInfo_ko.properties
  186. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/systemInfo_nl.properties
  187. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/systemInfo_pt_BR.properties
  188. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/systemInfo_ru.properties
  189. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/systemInfo_sv_SE.properties
  190. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/systemInfo_tr.properties
  191. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/systemInfo_zh_CN.properties
  192. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/systemInfo_zh_TW.properties
  193. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/threadDump.jelly
  194. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/threadDump_da.properties
  195. +24 −24 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/threadDump_de.properties
  196. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/threadDump_es.properties
  197. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/threadDump_ja.properties
  198. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/threadDump_pt_BR.properties
  199. 0 core/src/main/resources/{hudson/model/Hudson → jenkins/model/Jenkins}/whoAmI.jelly
@@ -55,6 +55,9 @@
<!-- Record your changes in the trunk here. -->
<div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
<ul class=image>
<li class=rfe>
Allow build directories and workspace directories in $JENKINS_HOME to be placed elsewhere.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-8446">issue 8446</a>)
<li class=rfe>
Mac installer update: set file permissions to be more in line with Mac conventions.
(<a href="https://github.com/jenkinsci/jenkins/pull/188">pull request 188</a>)
@@ -1,7 +1,7 @@
/*
* The MIT License
*
* Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Martin Eigenbrodt, Matthew R. Harrah, Red Hat, Inc., Stephen Connolly, Tom Huybrechts
* Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Martin Eigenbrodt, Matthew R. Harrah, Red Hat, Inc., Stephen Connolly, Tom Huybrechts, 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
@@ -23,19 +23,15 @@
*/
package hudson.model;

import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;

import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
import hudson.EnvVars;
import hudson.Extension;
import hudson.ExtensionPoint;
import hudson.PermalinkList;
import hudson.Extension;
import hudson.cli.declarative.CLIResolver;
import hudson.model.Descriptor.FormException;
import hudson.model.PermalinkProjectAction.Permalink;
import hudson.model.Fingerprint.RangeSet;
import hudson.model.Fingerprint.Range;
import hudson.model.Fingerprint.RangeSet;
import hudson.model.PermalinkProjectAction.Permalink;
import hudson.search.QuickSilver;
import hudson.search.SearchIndex;
import hudson.search.SearchIndexBuilder;
@@ -49,40 +45,18 @@
import hudson.util.CopyOnWriteList;
import hudson.util.DataSetBuilder;
import hudson.util.DescribableList;
import hudson.util.Graph;
import hudson.util.IOException2;
import hudson.util.RunList;
import hudson.util.ShiftedCategoryAxis;
import hudson.util.StackedAreaRenderer2;
import hudson.util.TextFile;
import hudson.util.Graph;
import hudson.widgets.HistoryWidget;
import hudson.widgets.Widget;
import hudson.widgets.HistoryWidget.Adapter;

import java.awt.Color;
import java.awt.Paint;
import java.io.File;
import java.io.IOException;
import java.io.StringWriter;
import java.io.PrintWriter;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.SortedMap;
import java.util.LinkedList;

import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.servlet.ServletException;

import hudson.widgets.Widget;
import jenkins.model.Jenkins;
import net.sf.json.JSONObject;
import net.sf.json.JSONException;

import net.sf.json.JSONObject;
import org.jfree.chart.ChartFactory;
import org.jfree.chart.JFreeChart;
import org.jfree.chart.axis.CategoryAxis;
@@ -94,12 +68,29 @@
import org.jfree.data.category.CategoryDataset;
import org.jfree.ui.RectangleInsets;
import org.jvnet.localizer.Localizable;
import org.kohsuke.args4j.Argument;
import org.kohsuke.args4j.CmdLineException;
import org.kohsuke.stapler.StaplerOverridable;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerResponse;
import org.kohsuke.stapler.export.Exported;
import org.kohsuke.args4j.Argument;
import org.kohsuke.args4j.CmdLineException;

import javax.servlet.ServletException;
import java.awt.*;
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.SortedMap;

import static javax.servlet.http.HttpServletResponse.*;

/**
* A job is an runnable entity under the monitoring of Hudson.
@@ -639,32 +630,7 @@ public Object getDynamic(String token, StaplerRequest req,
* @see RunMap
*/
protected File getBuildDir() {
// check JNDI for the home directory first
try {
InitialContext iniCtxt = new InitialContext();
Context env = (Context) iniCtxt.lookup("java:comp/env");
String value = (String) env.lookup("JENKINS_BUILDS");
if(value!=null && value.trim().length()>0)
return new File(value.trim());
// look at one more place. See issue #1314
value = (String) iniCtxt.lookup("JENKINS_BUILDS");
if(value!=null && value.trim().length()>0)
return new File(value.trim() + "/" + getSearchName());
} catch (NamingException e) {
// ignore
}

// finally check the system property
String sysProp = System.getProperty("JENKINS_BUILDS");
if(sysProp!=null)
return new File(sysProp.trim() + "/" + getSearchName());

// look at the env var next
String env = EnvVars.masterEnvVars.get("JENKINS_BUILDS");
if(env!=null)
return new File(env.trim() + "/" + getSearchName()).getAbsoluteFile();

return new File(getRootDir(), "builds");
return Jenkins.getInstance().getBuildDirFor(this);
}

/**
@@ -26,11 +26,11 @@
package jenkins.model;

import antlr.ANTLRException;
import com.google.common.collect.ImmutableMap;
import com.thoughtworks.xstream.XStream;
import hudson.BulkChange;
import hudson.DNSMultiCast;
import hudson.DescriptorExtensionList;
import hudson.EnvVars;
import hudson.Extension;
import hudson.ExtensionList;
import hudson.ExtensionPoint;
@@ -176,9 +176,6 @@
import org.xml.sax.InputSource;

import javax.crypto.SecretKey;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
@@ -310,9 +307,20 @@
private volatile SecurityRealm securityRealm = SecurityRealm.NO_AUTHENTICATION;

/**
* Root directory for the workspaces.
* Root directory for the workspaces. This value will be variable-expanded against
* job name and JENKINS_HOME.
*
* @see #getWorkspaceFor(TopLevelItem)
*/
private String workspaceDir = "${ITEM_ROOTDIR}/"+WORKSPACE_DIRNAME;

/**
* Root directory for the workspaces. This value will be variable-expanded against
* job name and JENKINS_HOME.
*
* @see #getBuildDirFor(Job)
*/
private String configuredWorkspaceRoot = null;
private String buildsDir = "${ITEM_ROOTDIR}/builds";

/**
* Message displayed in the top page.
@@ -1696,52 +1704,27 @@ public File getRootDir() {
return root;
}

private String getConfiguredWorkspaceRoot() {
if (configuredWorkspaceRoot == null) {
try {
InitialContext iniCtxt = new InitialContext();
Context env = (Context) iniCtxt.lookup("java:comp/env");
String value = (String) env.lookup("JENKINS_WORKSPACES");
if(value!=null && value.trim().length()>0) {
configuredWorkspaceRoot = value.trim();
return configuredWorkspaceRoot;
}
// look at one more place. See issue #1314
value = (String) iniCtxt.lookup("JENKINS_WORKSPACES");
if(value!=null && value.trim().length()>0) {
configuredWorkspaceRoot = value.trim();
return configuredWorkspaceRoot;
}
} catch (NamingException e) {
// ignore
}
public FilePath getWorkspaceFor(TopLevelItem item) {
return new FilePath(expandVariablesForDirectory(workspaceDir, item));
}

// finally check the system property
String sysProp = System.getProperty("JENKINS_WORKSPACES");
if(sysProp!=null) {
configuredWorkspaceRoot = sysProp.trim();
return configuredWorkspaceRoot;
}

// look at the env var next
String env = EnvVars.masterEnvVars.get("JENKINS_WORKSPACES");
if(env!=null) {
configuredWorkspaceRoot = env.trim();
return configuredWorkspaceRoot;
}

//not set
configuredWorkspaceRoot = "";
}
return configuredWorkspaceRoot;
public File getBuildDirFor(Job job) {
return expandVariablesForDirectory(buildsDir, job);
}

public FilePath getWorkspaceFor(TopLevelItem item) {
if(getConfiguredWorkspaceRoot().equals("")) {
return new FilePath(new File(item.getRootDir(), WORKSPACE_DIRNAME));
} else {
return new FilePath(new File(getConfiguredWorkspaceRoot() + "/" + item.getName(), WORKSPACE_DIRNAME));
}
private File expandVariablesForDirectory(String base, Item item) {
return new File(Util.replaceMacro(base, ImmutableMap.of(
"JENKINS_HOME", getRootDir().getPath(),
"ITEM_ROOTDIR", item.getRootDir().getPath(),
"ITEM_FULLNAME", item.getFullName())));
}

public String getRawWorkspaceDir() {
return workspaceDir;
}

public String getRawBuildsDir() {
return buildsDir;
}

public FilePath getRootPath() {
@@ -2379,6 +2362,9 @@ public synchronized void doConfigSubmit( StaplerRequest req, StaplerResponse rsp

JSONObject json = req.getSubmittedForm();

workspaceDir = json.getString("rawWorkspaceDir");
buildsDir = json.getString("rawBuildsDir");

// keep using 'useSecurity' field as the main configuration setting
// until we get the new security implementation working
// useSecurity = null;
@@ -1,26 +1,26 @@
# The MIT License
#
# Copyright (c) 2004-2009, Sun Microsystems, Inc., Seiji Sogabe, 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.

Are\ you\ sure\ about\ restarting\ Jenkins?\ Jenkins\ will\ restart\ once\ all\ running\ jobs\ are\ finished.=\
Möchten Sie Jenkins wirklich neu starten? Jenkins wird neu starten, \
sobald alle laufenden Jobs abgeschlossen wurden.
Yes=Ja
# The MIT License
#
# Copyright (c) 2004-2009, Sun Microsystems, Inc., Seiji Sogabe, 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.

Are\ you\ sure\ about\ restarting\ Jenkins?\ Jenkins\ will\ restart\ once\ all\ running\ jobs\ are\ finished.=\
M�chten Sie Jenkins wirklich neu starten? Jenkins wird neu starten, \
sobald alle laufenden Jobs abgeschlossen wurden.
Yes=Ja
@@ -1,27 +1,27 @@
# The MIT License
#
# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe, 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.

Jenkins\ Login=Jenkins Anmeldung
Access\ Denied=Zugriff verweigert
User=Benutzer
Password=Kennwort
login=Anmelden
# The MIT License
#
# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe, 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.

Jenkins\ Login=Jenkins Anmeldung
Access\ Denied=Zugriff verweigert
User=Benutzer
Password=Kennwort
login=Anmelden

0 comments on commit 68d4d22

Please sign in to comment.
You can’t perform that action at this time.