diff --git a/changelog.html b/changelog.html index e768ac7cbf..fb940c63df 100644 --- a/changelog.html +++ b/changelog.html @@ -55,7 +55,14 @@ Upcoming changes
@@ -79,7 +86,7 @@ Upcoming changes Absolute URLs in console output (issue 16368)
* There's normally some delay between when we send HTML that includes the check code,
* until we get the data back, so this variable is used to avoid asking too many browseres
* all at once.
*/
- private transient volatile long lastAttempt = -1;
+ private transient volatile long lastAttempt;
/**
* If the attempt to fetch data fails, we progressively use longer time out before retrying,
@@ -129,14 +131,6 @@ public class UpdateSite {
this.url = url;
}
- /**
- * When read back from XML, initialize them back to -1.
- */
- private Object readResolve() {
- dataTimestamp = lastAttempt = -1;
- return this;
- }
-
/**
* Get ID string.
*/
@@ -147,6 +141,7 @@ public class UpdateSite {
@Exported
public long getDataTimestamp() {
+ assert dataTimestamp >= 0;
return dataTimestamp;
}
@@ -171,7 +166,11 @@ public class UpdateSite {
String uncleanJson = IOUtils.toString(is,"UTF-8");
int jsonStart = uncleanJson.indexOf("{\"");
if (jsonStart >= 0) {
- return updateData(uncleanJson.substring(jsonStart), signatureCheck);
+ uncleanJson = uncleanJson.substring(jsonStart);
+ int end = uncleanJson.lastIndexOf('}');
+ if (end>0)
+ uncleanJson = uncleanJson.substring(0,end+1);
+ return updateData(uncleanJson, signatureCheck);
} else {
throw new IOException("Could not find json in content of " +
"update center from url: "+src.toExternalForm());
@@ -239,7 +238,7 @@ public class UpdateSite {
*/
public boolean isDue() {
if(neverUpdate) return false;
- if(dataTimestamp==-1)
+ if(dataTimestamp == 0)
dataTimestamp = getDataFile().file.lastModified();
long now = System.currentTimeMillis();
diff --git a/core/src/main/java/hudson/security/csrf/CrumbFilter.java b/core/src/main/java/hudson/security/csrf/CrumbFilter.java
index 167f9786f5..788eaa50ca 100644
--- a/core/src/main/java/hudson/security/csrf/CrumbFilter.java
+++ b/core/src/main/java/hudson/security/csrf/CrumbFilter.java
@@ -9,6 +9,7 @@ import jenkins.model.Jenkins;
import java.io.IOException;
import java.util.Enumeration;
+import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.Filter;
@@ -76,15 +77,14 @@ public class CrumbFilter implements Filter {
if (crumbIssuer.validateCrumb(httpRequest, crumbSalt, crumb)) {
valid = true;
} else {
- LOGGER.warning("Found invalid crumb " + crumb +
- ". Will check remaining parameters for a valid one...");
+ LOGGER.log(Level.WARNING, "Found invalid crumb {0}. Will check remaining parameters for a valid one...", crumb);
}
}
// Multipart requests need to be handled by each handler.
if (valid || isMultipart(httpRequest)) {
chain.doFilter(request, response);
} else {
- LOGGER.warning("No valid crumb was included in request for " + httpRequest.getRequestURI() + ". Returning " + HttpServletResponse.SC_FORBIDDEN + ".");
+ LOGGER.log(Level.WARNING, "No valid crumb was included in request for {0}. Returning {1}.", new Object[] {httpRequest.getRequestURI(), HttpServletResponse.SC_FORBIDDEN});
httpResponse.sendError(HttpServletResponse.SC_FORBIDDEN,"No valid crumb was included in the request");
}
} else {
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
index a11dd34845..8ba08f4cae 100755
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
@@ -94,6 +94,7 @@ import hudson.DNSMultiCast;
import hudson.DescriptorExtensionList;
import hudson.Extension;
import hudson.ExtensionList;
+import hudson.ExtensionPoint;
import hudson.FilePath;
import hudson.Functions;
import hudson.Launcher;
@@ -110,6 +111,7 @@ import hudson.UDPBroadcastThread;
import hudson.Util;
import static hudson.Util.fixEmpty;
import static hudson.Util.fixNull;
+import hudson.WebAppMain;
import hudson.XmlFile;
import hudson.cli.CLICommand;
import hudson.cli.CliEntryPoint;
@@ -195,6 +197,7 @@ import jenkins.InitReactorRunner;
import jenkins.model.ProjectNamingStrategy.DefaultProjectNamingStrategy;
import jenkins.security.ConfidentialKey;
import jenkins.security.ConfidentialStore;
+import jenkins.slaves.WorkspaceLocator;
import jenkins.util.io.FileBoolean;
import net.sf.json.JSONObject;
import org.acegisecurity.AccessDeniedException;
@@ -247,6 +250,7 @@ import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
import static hudson.init.InitMilestone.*;
+import hudson.security.BasicAuthenticationFilter;
import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
import java.io.File;
@@ -790,7 +794,7 @@ public class Jenkins extends AbstractCIBase implements ModifiableTopLevelItemGro
// JSON binding needs to be able to see all the classes from all the plugins
WebApp.get(servletContext).setClassLoader(pluginManager.uberClassLoader);
- adjuncts = new AdjunctManager(servletContext, pluginManager.uberClassLoader,"adjuncts/"+SESSION_HASH);
+ adjuncts = new AdjunctManager(servletContext, pluginManager.uberClassLoader,"adjuncts/"+SESSION_HASH, TimeUnit2.DAYS.toMillis(365));
// initialization consists of ...
executeReactor( is,
@@ -1922,6 +1926,13 @@ public class Jenkins extends AbstractCIBase implements ModifiableTopLevelItemGro
}
public FilePath getWorkspaceFor(TopLevelItem item) {
+ for (WorkspaceLocator l : WorkspaceLocator.all()) {
+ FilePath workspace = l.locate(item, this);
+ if (workspace != null) {
+ return workspace;
+ }
+ }
+
return new FilePath(expandVariablesForDirectory(workspaceDir, item));
}
@@ -2702,7 +2713,7 @@ public class Jenkins extends AbstractCIBase implements ModifiableTopLevelItemGro
jdks.addAll(req.bindJSONToList(JDK.class,json.get("jdks")));
boolean result = true;
- for( Descriptor> d : Functions.getSortedDescriptorsForGlobalConfig() )
+ for (Descriptor> d : Functions.getSortedDescriptorsForGlobalConfigUnclassified())
result &= configureDescriptor(req,json,d);
version = VERSION;
@@ -2886,7 +2897,7 @@ public class Jenkins extends AbstractCIBase implements ModifiableTopLevelItemGro
* Check if the given name is suitable as a name
* for job, view, etc.
*
- * @throws ParseException
+ * @throws Failure
* if the given name is not good
*/
public static void checkGoodName(String name) throws Failure {
@@ -2907,7 +2918,7 @@ public class Jenkins extends AbstractCIBase implements ModifiableTopLevelItemGro
/**
* Makes sure that the given name is good as a job name.
- * @return trimmed name if valid; throws ParseException if not
+ * @return trimmed name if valid; throws Failure if not
*/
private String checkJobName(String name) throws Failure {
checkGoodName(name);
diff --git a/core/src/main/java/jenkins/slaves/WorkspaceLocator.java b/core/src/main/java/jenkins/slaves/WorkspaceLocator.java
new file mode 100644
index 0000000000..6fe3c06d76
--- /dev/null
+++ b/core/src/main/java/jenkins/slaves/WorkspaceLocator.java
@@ -0,0 +1,38 @@
+package jenkins.slaves;
+
+import hudson.ExtensionList;
+import hudson.ExtensionPoint;
+import hudson.FilePath;
+import hudson.model.Node;
+import hudson.model.TopLevelItem;
+import jenkins.model.Jenkins;
+
+/**
+ * Allow extensions to override workspace locations
+ * on given slaves or projects.
+ *
+ * @author ryan.campbell@gmail.com
+ * @since 1.501
+ */
+public abstract class WorkspaceLocator implements ExtensionPoint {
+
+ /**
+ * Allows extensions to customize the workspace path. The first non-null response
+ * will determine the path to the workspace on that slave.
+ *
+ * @param item The toplevel item
+ * @param slave The slave
+ * @return The absolute FilePath to the workspace on the slave.
+ * Will be created if it doesn't exist.
+ *
+ */
+ public abstract FilePath locate(TopLevelItem item, Node node);
+
+
+ /**
+ * All registered {@link WorkspaceLocator}s.
+ */
+ public static ExtensionList
- Jenkins 也允許您將單獨的建置標為「永久保存這次建置」,將特定幾次重要建置排除在自動刪除清單外。
+ Jenkins 也允許您將某些建置標為「永久保存」,讓特定幾次重要建置不會被自動刪除。
最後一次穩定建置及最後一次成功建置也會一直保留住。
-jenkins.war (或解開到您 Web Container 裡的複本) 裡的 web.xml。
Jenkins 執行時無法修改這個值。
- 這個項目主要是譹您確認您的設定真的有生效。
+ 這個項目主要是讓您確認設定正確與否。
diff --git a/war/src/main/webapp/help/system-config/master-slave/usage_zh_TW.html b/war/src/main/webapp/help/system-config/master-slave/usage_zh_TW.html
index 71b80b96c5..ca25101e61 100644
--- a/war/src/main/webapp/help/system-config/master-slave/usage_zh_TW.html
+++ b/war/src/main/webapp/help/system-config/master-slave/usage_zh_TW.html
@@ -3,21 +3,22 @@
-
\ No newline at end of file
+
diff --git a/war/src/main/webapp/scripts/hudson-behavior.js b/war/src/main/webapp/scripts/hudson-behavior.js
index 277ed3bba7..5618b51b7f 100644
--- a/war/src/main/webapp/scripts/hudson-behavior.js
+++ b/war/src/main/webapp/scripts/hudson-behavior.js
@@ -100,10 +100,12 @@ var crumb = {
wrap: function(headers) {
if (this.fieldName!=null) {
if (headers instanceof Array)
+ // XXX prototype.js only seems to interpret object
headers.push(this.fieldName, this.value);
else
headers[this.fieldName]=this.value;
}
+ // XXX return value unused
return headers;
},