Under some conditions Jenkins startup could fail because of incorrectly linked extensions; now recovering more gracefully.
- (issue 25440)
+ (issue 25440)
Move periodic task log files from JENKINS_HOME/*.log to JENKINS_HOME/logs/tasks/*.log and rotate them periodically rather than overwrite every execution.
- (issue 33068)
+ (issue 33068)
Fix documentation of proxy configuration.
(pull 2060)
diff --git a/cli/pom.xml b/cli/pom.xml
index a41c23bcba..992b9f05c1 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
org.jenkins-ci.mainpom
- 2.0-alpha-4-SNAPSHOT
+ 2.0-alpha-5-SNAPSHOTcli
diff --git a/core/pom.xml b/core/pom.xml
index 64049e8e31..ac6b04361b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
org.jenkins-ci.mainpom
- 2.0-alpha-4-SNAPSHOT
+ 2.0-alpha-5-SNAPSHOTjenkins-core
@@ -147,7 +147,7 @@ THE SOFTWARE.
org.kohsukewindows-package-checker
- 1.0
+ 1.2org.kohsuke.stapler
diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java
index 3b0f907288..6903addc10 100644
--- a/core/src/main/java/hudson/ClassicPluginStrategy.java
+++ b/core/src/main/java/hudson/ClassicPluginStrategy.java
@@ -241,8 +241,8 @@ public class ClassicPluginStrategy implements PluginStrategy {
}
}
}
- for (DetachedPlugin detached : DETACHED_LIST)
- detached.fix(atts,optionalDependencies);
+
+ fix(atts,optionalDependencies);
// Register global classpath mask. This is useful for hiding JavaEE APIs that you might see from the container,
// such as database plugin for JPA support. The Mask-Classes attribute is insufficient because those classes
@@ -260,6 +260,41 @@ public class ClassicPluginStrategy implements PluginStrategy {
createClassLoader(paths, dependencyLoader, atts), disableFile, dependencies, optionalDependencies);
}
+ private static void fix(Attributes atts, List optionalDependencies) {
+ String pluginName = atts.getValue("Short-Name");
+
+ String jenkinsVersion = atts.getValue("Jenkins-Version");
+ if (jenkinsVersion==null)
+ jenkinsVersion = atts.getValue("Hudson-Version");
+
+ optionalDependencies.addAll(getImpliedDependencies(pluginName, jenkinsVersion));
+ }
+
+ /**
+ * Returns all the plugin dependencies that are implicit based on a particular Jenkins version
+ * @since 2.0
+ */
+ @Nonnull
+ public static List getImpliedDependencies(String pluginName, String jenkinsVersion) {
+ List out = new ArrayList<>();
+ for (DetachedPlugin detached : DETACHED_LIST) {
+ // don't fix the dependency for itself, or else we'll have a cycle
+ if (detached.shortName.equals(pluginName)) {
+ continue;
+ }
+ if (BREAK_CYCLES.contains(pluginName + '/' + detached.shortName)) {
+ LOGGER.log(Level.FINE, "skipping implicit dependency {0} → {1}", new Object[] {pluginName, detached.shortName});
+ continue;
+ }
+ // some earlier versions of maven-hpi-plugin apparently puts "null" as a literal in Hudson-Version. watch out for them.
+ if (jenkinsVersion == null || jenkinsVersion.equals("null") || new VersionNumber(jenkinsVersion).compareTo(detached.splitWhen) <= 0) {
+ out.add(new PluginWrapper.Dependency(detached.shortName + ':' + detached.requireVersion));
+ LOGGER.log(Level.FINE, "adding implicit dependency {0} → {1} because of {2}", new Object[] {pluginName, detached.shortName, jenkinsVersion});
+ }
+ }
+ return out;
+ }
+
@Deprecated
protected ClassLoader createClassLoader(List paths, ClassLoader parent) throws IOException {
return createClassLoader( paths, parent, null );
@@ -377,25 +412,6 @@ public class ClassicPluginStrategy implements PluginStrategy {
public VersionNumber getSplitWhen() {
return splitWhen;
}
-
- private void fix(Attributes atts, List optionalDependencies) {
- // don't fix the dependency for yourself, or else we'll have a cycle
- String yourName = atts.getValue("Short-Name");
- if (shortName.equals(yourName)) return;
- if (BREAK_CYCLES.contains(yourName + '/' + shortName)) {
- LOGGER.log(Level.FINE, "skipping implicit dependency {0} → {1}", new Object[] {yourName, shortName});
- return;
- }
-
- // some earlier versions of maven-hpi-plugin apparently puts "null" as a literal in Hudson-Version. watch out for them.
- String jenkinsVersion = atts.getValue("Jenkins-Version");
- if (jenkinsVersion==null)
- jenkinsVersion = atts.getValue("Hudson-Version");
- if (jenkinsVersion == null || jenkinsVersion.equals("null") || new VersionNumber(jenkinsVersion).compareTo(splitWhen) <= 0) {
- optionalDependencies.add(new PluginWrapper.Dependency(shortName + ':' + requireVersion));
- LOGGER.log(Level.FINE, "adding implicit dependency {0} → {1} because of {2}", new Object[] {yourName, shortName, jenkinsVersion});
- }
- }
}
private static final List DETACHED_LIST = Collections.unmodifiableList(Arrays.asList(
diff --git a/core/src/main/java/hudson/ExtensionList.java b/core/src/main/java/hudson/ExtensionList.java
index 46447fbcda..397f57030d 100644
--- a/core/src/main/java/hudson/ExtensionList.java
+++ b/core/src/main/java/hudson/ExtensionList.java
@@ -390,14 +390,14 @@ public class ExtensionList extends AbstractList {
/**
* Gets the extension list for a given type.
* Normally calls {@link Jenkins#getExtensionList(Class)} but falls back to an empty list
- * in case {@link Jenkins#getInstance} is null.
+ * in case {@link Jenkins#getInstanceOrNull()} is null.
* Thus it is useful to call from {@code all()} methods which need to behave gracefully during startup or shutdown.
* @param type the extension point type
* @return some list
* @since 1.572
*/
public static @Nonnull ExtensionList lookup(Class type) {
- Jenkins j = Jenkins.getInstance();
+ Jenkins j = Jenkins.getInstanceOrNull();
return j == null ? create((Jenkins) null, type) : j.getExtensionList(type);
}
diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java
index adb28461f8..72383256e4 100644
--- a/core/src/main/java/hudson/FilePath.java
+++ b/core/src/main/java/hudson/FilePath.java
@@ -1133,7 +1133,7 @@ public final class FilePath implements Serializable {
* @since 1.571
*/
public @CheckForNull Computer toComputer() {
- Jenkins j = Jenkins.getInstance();
+ Jenkins j = Jenkins.getInstanceOrNull();
if (j != null) {
for (Computer c : j.getComputers()) {
if (getChannel()==c.getChannel()) {
diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java
index fb28418cc6..4142366f42 100644
--- a/core/src/main/java/hudson/Functions.java
+++ b/core/src/main/java/hudson/Functions.java
@@ -74,6 +74,8 @@ import hudson.tasks.Publisher;
import hudson.tasks.UserAvatarResolver;
import hudson.util.Area;
import hudson.util.FormValidation.CheckMethod;
+import hudson.util.HudsonIsLoading;
+import hudson.util.HudsonIsRestarting;
import hudson.util.Iterators;
import hudson.util.jna.GNUCLibrary;
import hudson.util.Secret;
@@ -207,20 +209,28 @@ public class Functions {
/**
* During Jenkins start-up, before {@link InitMilestone#PLUGINS_STARTED} the extensions lists will be empty
- * and they are not guaranteed to be fully populated until after {@link InitMilestone#EXTENSIONS_AUGMENTED}.
+ * and they are not guaranteed to be fully populated until after {@link InitMilestone#EXTENSIONS_AUGMENTED},
+ * similarly, during termination after {@link Jenkins#isTerminating()} is set, it is no longer safe to access
+ * the extensions lists.
* If you attempt to access the extensions list from a UI thread while the extensions are being loaded you will
* hit a big honking great monitor lock that will block until the effective extension list has been determined
* (as if a plugin fails to start, all of the failed plugin's extensions and any dependent plugins' extensions
* will have to be evicted from the list of extensions. In practical terms this only affects the
* "Jenkins is loading" screen, but as that screen uses the generic layouts we provide this utility method
* so that the generic layouts can avoid iterating extension lists while Jenkins is starting up.
+ * If you attempt to access the extensions list from a UI thread while Jenkins is being shut down, the extensions
+ * themselves may no longer be in a valid state and could attempt to revive themselves and block termination.
+ * In actual terms the termination only affects those views required to render {@link HudsonIsRestarting}'s
+ * {@code index.jelly} which is the same set as the {@link HudsonIsLoading} pages so it makes sense to
+ * use both checks here.
*
* @return {@code true} if the extensions lists have been populated.
* @since 1.607
*/
public static boolean isExtensionsAvailable() {
- final Jenkins jenkins = Jenkins.getInstance();
- return jenkins != null && jenkins.getInitLevel().compareTo(InitMilestone.EXTENSIONS_AUGMENTED) >= 0;
+ final Jenkins jenkins = Jenkins.getInstanceOrNull();
+ return jenkins != null && jenkins.getInitLevel().compareTo(InitMilestone.EXTENSIONS_AUGMENTED) >= 0
+ && !jenkins.isTerminating();
}
public static void initPageVariables(JellyContext context) {
@@ -1649,7 +1659,7 @@ public class Functions {
*/
public static List getPageDecorators() {
// this method may be called to render start up errors, at which point Hudson doesn't exist yet. see HUDSON-3608
- if(Jenkins.getInstance()==null) return Collections.emptyList();
+ if(Jenkins.getInstanceOrNull()==null) return Collections.emptyList();
return PageDecorator.all();
}
@@ -1671,13 +1681,13 @@ public class Functions {
}
public static String getCrumb(StaplerRequest req) {
- Jenkins h = Jenkins.getInstance();
+ Jenkins h = Jenkins.getInstanceOrNull();
CrumbIssuer issuer = h != null ? h.getCrumbIssuer() : null;
return issuer != null ? issuer.getCrumb(req) : "";
}
public static String getCrumbRequestField() {
- Jenkins h = Jenkins.getInstance();
+ Jenkins h = Jenkins.getInstanceOrNull();
CrumbIssuer issuer = h != null ? h.getCrumbIssuer() : null;
return issuer != null ? issuer.getDescriptor().getCrumbRequestField() : "";
}
@@ -1907,7 +1917,7 @@ public class Functions {
* discovery of Jenkins.
*/
public static void advertiseHeaders(HttpServletResponse rsp) {
- Jenkins j = Jenkins.getInstance();
+ Jenkins j = Jenkins.getInstanceOrNull();
if (j!=null) {
rsp.setHeader("X-Hudson","1.395");
rsp.setHeader("X-Jenkins", Jenkins.VERSION);
diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java
index 794f7a660c..ae96fc347a 100644
--- a/core/src/main/java/hudson/PluginManager.java
+++ b/core/src/main/java/hudson/PluginManager.java
@@ -1141,7 +1141,9 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
String pluginName = n.substring(0, index);
String siteName = n.substring(index + 1);
UpdateSite.Plugin plugin = getPlugin(pluginName, siteName);
- // TODO: Someone that understands what the following logic is about, please add a comment.
+ // There could be cases like:
+ // 'plugin.ambiguous.updatesite' where both
+ // 'plugin' @ 'ambigiuous.updatesite' and 'plugin.ambiguous' @ 'updatesite' resolve to valid plugins
if (plugin != null) {
if (p != null) {
throw new Failure("Ambiguous plugin: " + n);
@@ -1151,6 +1153,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
index = n.indexOf('.', index + 1);
}
}
+
if (p == null) {
throw new Failure("No such plugin: " + n);
}
diff --git a/core/src/main/java/hudson/ProxyConfiguration.java b/core/src/main/java/hudson/ProxyConfiguration.java
index ae86927729..f841953062 100644
--- a/core/src/main/java/hudson/ProxyConfiguration.java
+++ b/core/src/main/java/hudson/ProxyConfiguration.java
@@ -47,7 +47,9 @@ import java.net.URLConnection;
import java.util.Collections;
import java.util.List;
import java.util.regex.Pattern;
+import javax.annotation.CheckForNull;
import jenkins.model.Jenkins;
+import jenkins.util.JenkinsJVM;
import org.apache.commons.httpclient.Credentials;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.UsernamePasswordCredentials;
@@ -216,8 +218,7 @@ public final class ProxyConfiguration extends AbstractDescribableImpl) {
- for (Run r : ((Job) obj).getBuilds()) {
- odm.data.remove(referTo(r));
- }
+ OldDataMonitor odm = get(j);
+ SecurityContext oldContext = ACL.impersonate(ACL.SYSTEM);
+ try {
+ odm.data.remove(referTo(obj));
+ if (isDelete && obj instanceof Job) {
+ for (Run r : ((Job) obj).getBuilds()) {
+ odm.data.remove(referTo(r));
}
- } finally {
- SecurityContextHolder.setContext(oldContext);
}
+ } finally {
+ SecurityContextHolder.setContext(oldContext);
}
}
@@ -207,8 +205,8 @@ public class OldDataMonitor extends AdministrativeMonitor {
}
}
if (buf.length() == 0) return;
- Jenkins j = Jenkins.getInstance();
- if (j == null) {
+ Jenkins j = Jenkins.getInstanceOrNull();
+ if (j == null) { // Need this path, at least for unit tests, but also in case of very broken startup
// Startup failed, something is very broken, so report what we can.
for (Throwable t : errors) {
LOGGER.log(Level.WARNING, "could not read " + obj + " (and Jenkins did not start up)", t);
diff --git a/core/src/main/java/hudson/diagnosis/ReverseProxySetupMonitor.java b/core/src/main/java/hudson/diagnosis/ReverseProxySetupMonitor.java
index 63f4cb255c..61f6b0fe6e 100644
--- a/core/src/main/java/hudson/diagnosis/ReverseProxySetupMonitor.java
+++ b/core/src/main/java/hudson/diagnosis/ReverseProxySetupMonitor.java
@@ -63,7 +63,6 @@ public class ReverseProxySetupMonitor extends AdministrativeMonitor {
public HttpResponse doTest() {
String referer = Stapler.getCurrentRequest().getReferer();
Jenkins j = Jenkins.getInstance();
- assert j != null;
// May need to send an absolute URL, since handling of HttpRedirect with a relative URL does not currently honor X-Forwarded-Proto/Port at all.
String redirect = j.getRootUrl() + "administrativeMonitor/" + id + "/testForReverseProxySetup/" + (referer != null ? Util.rawEncode(referer) : "NO-REFERER") + "/";
LOGGER.log(Level.FINE, "coming from {0} and redirecting to {1}", new Object[] {referer, redirect});
@@ -72,7 +71,6 @@ public class ReverseProxySetupMonitor extends AdministrativeMonitor {
public void getTestForReverseProxySetup(String rest) {
Jenkins j = Jenkins.getInstance();
- assert j != null;
String inferred = j.getRootUrlFromRequest() + "manage";
// TODO this could also verify that j.getRootUrl() has been properly configured, and send a different message if not
if (rest.startsWith(inferred)) { // not using equals due to JENKINS-24014
diff --git a/core/src/main/java/hudson/init/TaskMethodFinder.java b/core/src/main/java/hudson/init/TaskMethodFinder.java
index 9ced2cb1ab..8fc677f651 100644
--- a/core/src/main/java/hudson/init/TaskMethodFinder.java
+++ b/core/src/main/java/hudson/init/TaskMethodFinder.java
@@ -115,14 +115,13 @@ abstract class TaskMethodFinder extends TaskBuilder {
* Determines the parameter injection of the initialization method.
*/
private Object lookUp(Class type) {
- if (type==Jenkins.class || type==Hudson.class)
- return Jenkins.getInstance();
Jenkins j = Jenkins.getInstance();
- if (j!=null) {
- Injector i = j.getInjector();
- if (i!=null)
- return i.getInstance(type);
- }
+ assert j != null : "This method is only invoked after the Jenkins singleton instance has been set";
+ if (type==Jenkins.class || type==Hudson.class)
+ return j;
+ Injector i = j.getInjector();
+ if (i!=null)
+ return i.getInstance(type);
throw new IllegalArgumentException("Unable to inject "+type);
}
diff --git a/core/src/main/java/hudson/lifecycle/SolarisSMFLifecycle.java b/core/src/main/java/hudson/lifecycle/SolarisSMFLifecycle.java
index 9da1505229..ca90fb83d4 100644
--- a/core/src/main/java/hudson/lifecycle/SolarisSMFLifecycle.java
+++ b/core/src/main/java/hudson/lifecycle/SolarisSMFLifecycle.java
@@ -38,7 +38,7 @@ public class SolarisSMFLifecycle extends Lifecycle {
*/
@Override
public void restart() throws IOException, InterruptedException {
- Jenkins h = Jenkins.getInstance();
+ Jenkins h = Jenkins.getInstanceOrNull(); // guard against repeated concurrent calls to restart
if (h != null)
h.cleanUp();
System.exit(0);
diff --git a/core/src/main/java/hudson/lifecycle/UnixLifecycle.java b/core/src/main/java/hudson/lifecycle/UnixLifecycle.java
index 0e489277e5..5d545a4fe4 100644
--- a/core/src/main/java/hudson/lifecycle/UnixLifecycle.java
+++ b/core/src/main/java/hudson/lifecycle/UnixLifecycle.java
@@ -65,7 +65,7 @@ public class UnixLifecycle extends Lifecycle {
@Override
public void restart() throws IOException, InterruptedException {
- Jenkins h = Jenkins.getInstance();
+ Jenkins h = Jenkins.getInstanceOrNull(); // guard against repeated concurrent calls to restart
if (h != null)
h.cleanUp();
diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java
index f1d4a15d68..d8b4851da9 100644
--- a/core/src/main/java/hudson/model/AbstractProject.java
+++ b/core/src/main/java/hudson/model/AbstractProject.java
@@ -2078,9 +2078,6 @@ public abstract class AbstractProject
,R extends A
Messages.AbstractProject_AssignedLabelString_InvalidBooleanExpression(e.getMessage()));
}
Jenkins j = Jenkins.getInstance();
- if (j == null) {
- return FormValidation.ok(); // ?
- }
Label l = j.getLabel(value);
if (l.isEmpty()) {
for (LabelAtom a : l.listAtoms()) {
diff --git a/core/src/main/java/hudson/model/Cause.java b/core/src/main/java/hudson/model/Cause.java
index 2ee6ba7982..bca7831012 100644
--- a/core/src/main/java/hudson/model/Cause.java
+++ b/core/src/main/java/hudson/model/Cause.java
@@ -37,6 +37,7 @@ import com.thoughtworks.xstream.converters.UnmarshallingContext;
import hudson.Util;
import java.io.IOException;
import java.util.HashSet;
+import java.util.Objects;
import java.util.Set;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
@@ -212,12 +213,10 @@ public abstract class Cause {
final UpstreamCause o = (UpstreamCause) rhs;
- if (upstreamBuild != o.upstreamBuild) return false;
- if (!upstreamCauses.equals(o.upstreamCauses)) return false;
- if (upstreamUrl == null ? o.upstreamUrl != null : !upstreamUrl.equals(o.upstreamUrl)) return false;
- if (upstreamProject == null ? o.upstreamProject != null : !upstreamProject.equals(o.upstreamProject)) return false;
-
- return true;
+ return Objects.equals(upstreamBuild, o.upstreamBuild) &&
+ Objects.equals(upstreamCauses, o.upstreamCauses) &&
+ Objects.equals(upstreamUrl, o.upstreamUrl) &&
+ Objects.equals(upstreamProject, o.upstreamProject);
}
/**
@@ -225,12 +224,7 @@ public abstract class Cause {
*/
@Override
public int hashCode() {
-
- int hashCode = 17;
- hashCode = hashCode * 31 + upstreamCauses.hashCode();
- hashCode = hashCode * 31 + upstreamBuild;
- hashCode = hashCode * 31 + (upstreamUrl == null ? 0 : upstreamUrl.hashCode ());
- return hashCode * 31 + (upstreamProject == null ? 0 : upstreamProject.hashCode ());
+ return Objects.hash(upstreamCauses, upstreamBuild, upstreamUrl, upstreamProject);
}
private @Nonnull Cause trim(@Nonnull Cause c, int depth, Set traversed) {
@@ -430,13 +424,12 @@ public abstract class Cause {
@Override
public boolean equals(Object o) {
- return o instanceof UserIdCause && Arrays.equals(new Object[]{userId},
- new Object[]{((UserIdCause) o).userId});
+ return o instanceof UserIdCause && Objects.equals(userId, ((UserIdCause) o).userId);
}
@Override
public int hashCode() {
- return 295 + (this.userId != null ? this.userId.hashCode() : 0);
+ return Objects.hash(userId);
}
}
@@ -473,16 +466,12 @@ public abstract class Cause {
@Override
public boolean equals(Object o) {
- return o instanceof RemoteCause && Arrays.equals(new Object[] {addr, note},
- new Object[] {((RemoteCause)o).addr, ((RemoteCause)o).note});
+ return o instanceof RemoteCause && Objects.equals(addr, ((RemoteCause) o).addr) && Objects.equals(note, ((RemoteCause) o).note);
}
@Override
public int hashCode() {
- int hash = 5;
- hash = 83 * hash + (this.addr != null ? this.addr.hashCode() : 0);
- hash = 83 * hash + (this.note != null ? this.note.hashCode() : 0);
- return hash;
+ return Objects.hash(addr, note);
}
}
}
diff --git a/core/src/main/java/hudson/model/CauseAction.java b/core/src/main/java/hudson/model/CauseAction.java
index 252c91c722..09e5b03274 100644
--- a/core/src/main/java/hudson/model/CauseAction.java
+++ b/core/src/main/java/hudson/model/CauseAction.java
@@ -34,6 +34,7 @@ import com.thoughtworks.xstream.converters.UnmarshallingContext;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -47,35 +48,55 @@ public class CauseAction implements FoldableAction, RunAction2 {
@Deprecated
// there can be multiple causes, so this is deprecated
private transient Cause cause;
-
- private List causes = new ArrayList();
+
+ /** @deprecated JENKINS-33467 inefficient */
+ @Deprecated
+ private transient List causes;
+
+ private Map causeBag = new LinkedHashMap<>();
public CauseAction(Cause c) {
- this.causes.add(c);
+ this.causeBag.put(c, 1);
}
+ private void addCause(Cause c) {
+ synchronized (causeBag) {
+ Integer cnt = causeBag.get(c);
+ causeBag.put(c, cnt == null ? 1 : cnt + 1);
+ }
+ }
+ private void addCauses(Collection causes) {
+ for (Cause cause : causes) {
+ addCause(cause);
+ }
+ }
+
public CauseAction(Cause... c) {
this(Arrays.asList(c));
}
public CauseAction(Collection causes) {
- this.causes.addAll(causes);
+ addCauses(causes);
}
public CauseAction(CauseAction ca) {
- this.causes.addAll(ca.causes);
+ addCauses(ca.getCauses());
}
@Exported(visibility=2)
public List getCauses() {
- return causes;
+ List r = new ArrayList<>();
+ for (Map.Entry entry : causeBag.entrySet()) {
+ r.addAll(Collections.nCopies(entry.getValue(), entry.getKey()));
+ }
+ return r;
}
/**
* Finds the cause of the specific type.
*/
public T findCause(Class type) {
- for (Cause c : causes)
+ for (Cause c : causeBag.keySet())
if (type.isInstance(c))
return type.cast(c);
return null;
@@ -99,14 +120,7 @@ public class CauseAction implements FoldableAction, RunAction2 {
* @return Map of Cause to number of occurrences of that Cause
*/
public Map getCauseCounts() {
- Map result = new LinkedHashMap();
- for (Cause c : causes) {
- if (c != null) {
- Integer i = result.get(c);
- result.put(c, i == null ? 1 : i.intValue() + 1);
- }
- }
- return result;
+ return Collections.unmodifiableMap(causeBag);
}
/**
@@ -115,12 +129,14 @@ public class CauseAction implements FoldableAction, RunAction2 {
*/
@Deprecated
public String getShortDescription() {
- if(causes.isEmpty()) return "N/A";
- return causes.get(0).getShortDescription();
+ if (causeBag.isEmpty()) {
+ return "N/A";
+ }
+ return causeBag.keySet().iterator().next().getShortDescription();
}
@Override public void onLoad(Run owner) {
- for (Cause c : causes) {
+ for (Cause c : causeBag.keySet()) {
if (c != null) {
c.onLoad(owner);
}
@@ -131,7 +147,7 @@ public class CauseAction implements FoldableAction, RunAction2 {
* When hooked up to build, notify {@link Cause}s.
*/
@Override public void onAttached(Run owner) {
- for (Cause c : causes) {
+ for (Cause c : causeBag.keySet()) {
if (c != null) {
c.onAddedTo(owner);
}
@@ -141,7 +157,7 @@ public class CauseAction implements FoldableAction, RunAction2 {
public void foldIntoExisting(hudson.model.Queue.Item item, Task owner, List otherActions) {
CauseAction existing = item.getAction(CauseAction.class);
if (existing!=null) {
- existing.causes.addAll(this.causes);
+ existing.addCauses(getCauses());
return;
}
// no CauseAction found, so add a copy of this one
@@ -153,9 +169,19 @@ public class CauseAction implements FoldableAction, RunAction2 {
@Override protected void callback(CauseAction ca, UnmarshallingContext context) {
// if we are being read in from an older version
if (ca.cause != null) {
- if (ca.causes == null) ca.causes = new ArrayList();
- ca.causes.add(ca.cause);
+ if (ca.causeBag == null) {
+ ca.causeBag = new LinkedHashMap<>();
+ }
+ ca.addCause(ca.cause);
OldDataMonitor.report(context, "1.288");
+ ca.cause = null;
+ } else if (ca.causes != null) {
+ if (ca.causeBag == null) {
+ ca.causeBag = new LinkedHashMap<>();
+ }
+ ca.addCauses(ca.causes);
+ OldDataMonitor.report(context, "1.653");
+ ca.causes = null;
}
}
}
diff --git a/core/src/main/java/hudson/model/Computer.java b/core/src/main/java/hudson/model/Computer.java
index 3eedf30bd3..eebd99f3a5 100644
--- a/core/src/main/java/hudson/model/Computer.java
+++ b/core/src/main/java/hudson/model/Computer.java
@@ -564,8 +564,9 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
* null if the configuration has changed and the node is removed, yet the corresponding {@link Computer}
* is not yet gone.
*/
- public @CheckForNull Node getNode() {
- Jenkins j = Jenkins.getInstance();
+ @CheckForNull
+ public Node getNode() {
+ Jenkins j = Jenkins.getInstanceOrNull(); // TODO confirm safe to assume non-null and use getInstance()
if (j == null) {
return null;
}
@@ -1011,8 +1012,8 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
executors.remove(e);
addNewExecutorIfNecessary();
if (!isAlive()) {
- AbstractCIBase ciBase = Jenkins.getInstance();
- if (ciBase != null) {
+ AbstractCIBase ciBase = Jenkins.getInstanceOrNull();
+ if (ciBase != null) { // TODO confirm safe to assume non-null and use getInstance()
ciBase.removeComputer(Computer.this);
}
}
@@ -1701,7 +1702,7 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
*/
public static final Permission EXTENDED_READ = new Permission(PERMISSIONS,"ExtendedRead", Messages._Computer_ExtendedReadPermission_Description(), CONFIGURE, Boolean.getBoolean("hudson.security.ExtendedReadPermission"), new PermissionScope[]{PermissionScope.COMPUTER});
public static final Permission DELETE = new Permission(PERMISSIONS,"Delete", Messages._Computer_DeletePermission_Description(), Permission.DELETE, PermissionScope.COMPUTER);
- public static final Permission CREATE = new Permission(PERMISSIONS,"Create", Messages._Computer_CreatePermission_Description(), Permission.CREATE, PermissionScope.COMPUTER);
+ public static final Permission CREATE = new Permission(PERMISSIONS,"Create", Messages._Computer_CreatePermission_Description(), Permission.CREATE, PermissionScope.JENKINS);
public static final Permission DISCONNECT = new Permission(PERMISSIONS,"Disconnect", Messages._Computer_DisconnectPermission_Description(), Jenkins.ADMINISTER, PermissionScope.COMPUTER);
public static final Permission CONNECT = new Permission(PERMISSIONS,"Connect", Messages._Computer_ConnectPermission_Description(), DISCONNECT, PermissionScope.COMPUTER);
public static final Permission BUILD = new Permission(PERMISSIONS, "Build", Messages._Computer_BuildPermission_Description(), Permission.WRITE, PermissionScope.COMPUTER);
diff --git a/core/src/main/java/hudson/model/Executor.java b/core/src/main/java/hudson/model/Executor.java
index 817166c60e..06e9453fd0 100644
--- a/core/src/main/java/hudson/model/Executor.java
+++ b/core/src/main/java/hudson/model/Executor.java
@@ -958,8 +958,9 @@ public class Executor extends Thread implements ModelObject {
* or null if it could not be found (for example because the execution has already completed)
* @since 1.607
*/
- public static @CheckForNull Executor of(Executable executable) {
- Jenkins jenkins = Jenkins.getInstance();
+ @CheckForNull
+ public static Executor of(Executable executable) {
+ Jenkins jenkins = Jenkins.getInstanceOrNull(); // TODO confirm safe to assume non-null and use getInstance()
if (jenkins == null) {
return null;
}
diff --git a/core/src/main/java/hudson/model/Fingerprint.java b/core/src/main/java/hudson/model/Fingerprint.java
index 8cb6347168..9c4a6cf2a3 100644
--- a/core/src/main/java/hudson/model/Fingerprint.java
+++ b/core/src/main/java/hudson/model/Fingerprint.java
@@ -50,6 +50,7 @@ import java.io.EOFException;
import jenkins.model.FingerprintFacet;
import jenkins.model.Jenkins;
import jenkins.model.TransientFingerprintFacetFactory;
+import org.apache.commons.lang.StringUtils;
import org.kohsuke.stapler.export.Exported;
import org.kohsuke.stapler.export.ExportedBean;
@@ -129,7 +130,7 @@ public class Fingerprint implements ModelObject, Saveable {
// We expose the data to Jenkins administrators in order to
// let them manage the data for deleted jobs (also works for SYSTEM)
final Jenkins instance = Jenkins.getInstance();
- if (instance != null && instance.hasPermission(Jenkins.ADMINISTER)) {
+ if (instance.hasPermission(Jenkins.ADMINISTER)) {
return true;
}
@@ -687,21 +688,77 @@ public class Fingerprint implements ModelObject, Saveable {
*/
public static RangeSet fromString(String list, boolean skipError) {
RangeSet rs = new RangeSet();
- for (String s : Util.tokenize(list,",")) {
+
+ // Reject malformed ranges like "1---10", "1,,,,3" etc.
+ if (list.contains("--") || list.contains(",,")) {
+ if (!skipError) {
+ throw new IllegalArgumentException(
+ String.format("Unable to parse '%s', expected correct notation M,N or M-N", list));
+ }
+ // ignore malformed notation
+ return rs;
+ }
+
+ String[] items = Util.tokenize(list,",");
+ if(items.length > 1 && items.length <= StringUtils.countMatches(list, ",")) {
+ if (!skipError) {
+ throw new IllegalArgumentException(
+ String.format("Unable to parse '%s', expected correct notation M,N or M-N", list));
+ }
+ // ignore malformed notation like ",1,2" or "1,2,"
+ return rs;
+ }
+
+ for (String s : items) {
s = s.trim();
// s is either single number or range "x-y".
// note that the end range is inclusive in this notation, but not in the Range class
try {
+ if (s.isEmpty()) {
+ if (!skipError) {
+ throw new IllegalArgumentException(
+ String.format("Unable to parse '%s', expected number", list)); }
+ // ignore "" element
+ continue;
+ }
+
if(s.contains("-")) {
+ if(StringUtils.countMatches(s, "-") > 1) {
+ if (!skipError) {
+ throw new IllegalArgumentException(String.format(
+ "Unable to parse '%s', expected correct notation M,N or M-N", list));
+ }
+ // ignore malformed ranges like "-5-2" or "2-5-"
+ continue;
+ }
String[] tokens = Util.tokenize(s,"-");
if (tokens.length == 2) {
- rs.ranges.add(new Range(Integer.parseInt(tokens[0]), Integer.parseInt(tokens[1]) + 1));
+ int left = Integer.parseInt(tokens[0]);
+ int right = Integer.parseInt(tokens[1]);
+ if(left < 0 || right < 0) {
+ if (!skipError) {
+ throw new IllegalArgumentException(
+ String.format("Unable to parse '%s', expected number above zero", list));
+ }
+ // ignore a range which starts or ends under zero like "-5-3"
+ continue;
+ }
+ if(left > right) {
+ if (!skipError) {
+ throw new IllegalArgumentException(String.format(
+ "Unable to parse '%s', expected string with a range M-N where M _getUsages() {
List r = new ArrayList();
final Jenkins instance = Jenkins.getInstance();
- if (instance == null) {
- return r;
- }
-
for (Entry e : usages.entrySet()) {
final String itemName = e.getKey();
if (instance.hasPermission(Jenkins.ADMINISTER) || canDiscoverItem(itemName)) {
@@ -1369,10 +1422,7 @@ public class Fingerprint implements ModelObject, Saveable {
*/
private static boolean canDiscoverItem(@Nonnull final String fullName) {
final Jenkins jenkins = Jenkins.getInstance();
- if (jenkins == null) {
- return false;
- }
-
+
// Fast check to avoid security context switches
Item item = null;
try {
diff --git a/core/src/main/java/hudson/model/Hudson.java b/core/src/main/java/hudson/model/Hudson.java
index 4234697923..02b9d949a8 100644
--- a/core/src/main/java/hudson/model/Hudson.java
+++ b/core/src/main/java/hudson/model/Hudson.java
@@ -34,6 +34,7 @@ import hudson.model.listeners.ItemListener;
import hudson.slaves.ComputerListener;
import hudson.util.CopyOnWriteList;
import hudson.util.FormValidation;
+import javax.annotation.Nonnull;
import jenkins.model.Jenkins;
import org.jvnet.hudson.reactor.ReactorException;
import org.kohsuke.stapler.QueryParameter;
@@ -71,7 +72,8 @@ public class Hudson extends Jenkins {
/** @deprecated Here only for compatibility. Use {@link Jenkins#getInstance} instead. */
@Deprecated
@CLIResolver
- public static @CheckForNull Hudson getInstance() {
+ @Nonnull
+ public static Hudson getInstance() {
return (Hudson)Jenkins.getInstance();
}
diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java
index d60f144d55..263787ffcb 100644
--- a/core/src/main/java/hudson/model/Job.java
+++ b/core/src/main/java/hudson/model/Job.java
@@ -848,7 +848,10 @@ public abstract class Job, RunT extends Run V withLock(hudson.remoting.Callable callable) throws T {
- final Jenkins jenkins = Jenkins.getInstance();
+ final Jenkins jenkins = Jenkins.getInstanceOrNull();
+ // TODO confirm safe to assume non-null and use getInstance()
final Queue queue = jenkins == null ? null : jenkins.getQueue();
if (queue == null) {
return callable.call();
@@ -1222,7 +1223,8 @@ public class Queue extends ResourceController implements Saveable {
* @since 1.592
*/
public static V withLock(java.util.concurrent.Callable callable) throws Exception {
- final Jenkins jenkins = Jenkins.getInstance();
+ final Jenkins jenkins = Jenkins.getInstanceOrNull();
+ // TODO confirm safe to assume non-null and use getInstance()
final Queue queue = jenkins == null ? null : jenkins.getQueue();
if (queue == null) {
return callable.call();
@@ -1239,7 +1241,8 @@ public class Queue extends ResourceController implements Saveable {
* @since 1.618
*/
public static boolean tryWithLock(Runnable runnable) {
- final Jenkins jenkins = Jenkins.getInstance();
+ final Jenkins jenkins = Jenkins.getInstanceOrNull();
+ // TODO confirm safe to assume non-null and use getInstance()
final Queue queue = jenkins == null ? null : jenkins.getQueue();
if (queue == null) {
runnable.run();
@@ -1255,7 +1258,8 @@ public class Queue extends ResourceController implements Saveable {
* @since 1.618
*/
public static Runnable wrapWithLock(Runnable runnable) {
- final Jenkins jenkins = Jenkins.getInstance();
+ final Jenkins jenkins = Jenkins.getInstanceOrNull();
+ // TODO confirm safe to assume non-null and use getInstance()
final Queue queue = jenkins == null ? null : jenkins.getQueue();
return queue == null ? runnable : new LockedRunnable(runnable);
}
@@ -1267,7 +1271,8 @@ public class Queue extends ResourceController implements Saveable {
* @since 1.618
*/
public static hudson.remoting.Callable wrapWithLock(hudson.remoting.Callable callable) {
- final Jenkins jenkins = Jenkins.getInstance();
+ final Jenkins jenkins = Jenkins.getInstanceOrNull();
+ // TODO confirm safe to assume non-null and use getInstance()
final Queue queue = jenkins == null ? null : jenkins.getQueue();
return queue == null ? callable : new LockedHRCallable<>(callable);
}
@@ -1279,7 +1284,8 @@ public class Queue extends ResourceController implements Saveable {
* @since 1.618
*/
public static java.util.concurrent.Callable wrapWithLock(java.util.concurrent.Callable callable) {
- final Jenkins jenkins = Jenkins.getInstance();
+ final Jenkins jenkins = Jenkins.getInstanceOrNull();
+ // TODO confirm safe to assume non-null and use getInstance()
final Queue queue = jenkins == null ? null : jenkins.getQueue();
return queue == null ? callable : new LockedJUCCallable(callable);
}
diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java
index 229fb82806..7c5aba4be5 100644
--- a/core/src/main/java/hudson/model/Run.java
+++ b/core/src/main/java/hudson/model/Run.java
@@ -2276,9 +2276,6 @@ public abstract class Run ,RunT extends Run job = j.getItemByFullName(jobName, Job.class);
if (job == null) {
return null;
diff --git a/core/src/main/java/hudson/model/UpdateSite.java b/core/src/main/java/hudson/model/UpdateSite.java
index 09c38fb6e7..b6acc6202b 100644
--- a/core/src/main/java/hudson/model/UpdateSite.java
+++ b/core/src/main/java/hudson/model/UpdateSite.java
@@ -25,6 +25,7 @@
package hudson.model;
+import hudson.ClassicPluginStrategy;
import hudson.PluginManager;
import hudson.PluginWrapper;
import hudson.Util;
@@ -467,7 +468,17 @@ public class UpdateSite {
core = null;
}
for(Map.Entry e : (Set>)o.getJSONObject("plugins").entrySet()) {
- plugins.put(e.getKey(),new Plugin(sourceId, e.getValue()));
+ Plugin p = new Plugin(sourceId, e.getValue());
+ // JENKINS-33308 - include implied dependencies for older plugins that may need them
+ List implicitDeps = ClassicPluginStrategy.getImpliedDependencies(p.name, p.requiredCore);
+ if(!implicitDeps.isEmpty()) {
+ for(PluginWrapper.Dependency dep : implicitDeps) {
+ if(!p.dependencies.containsKey(dep.shortName)) {
+ p.dependencies.put(dep.shortName, dep.version);
+ }
+ }
+ }
+ plugins.put(e.getKey(), p);
}
connectionCheckUrl = (String)o.get("connectionCheckUrl");
@@ -612,7 +623,7 @@ public class UpdateSite {
public final String[] categories;
/**
- * Dependencies of this plugin.
+ * Dependencies of this plugin, a name -> version mapping.
*/
@Exported
public final Map dependencies = new HashMap();
@@ -634,10 +645,8 @@ public class UpdateSite {
this.categories = o.has("labels") ? (String[])o.getJSONArray("labels").toArray(new String[0]) : null;
for(Object jo : o.getJSONArray("dependencies")) {
JSONObject depObj = (JSONObject) jo;
- // Make sure there's a name attribute, that that name isn't maven-plugin - we ignore that one -
- // and that the optional value isn't true.
- if (get(depObj,"name")!=null
- && !get(depObj,"name").equals("maven-plugin")) {
+ // Make sure there's a name attribute and that the optional value isn't true.
+ if (get(depObj,"name")!=null) {
if (get(depObj, "optional").equals("false")) {
dependencies.put(get(depObj, "name"), get(depObj, "version"));
} else {
diff --git a/core/src/main/java/hudson/model/UsageStatistics.java b/core/src/main/java/hudson/model/UsageStatistics.java
index b6d2af2496..4d2cde5411 100644
--- a/core/src/main/java/hudson/model/UsageStatistics.java
+++ b/core/src/main/java/hudson/model/UsageStatistics.java
@@ -31,7 +31,6 @@ import hudson.node_monitors.ArchitectureMonitor.DescriptorImpl;
import hudson.util.IOUtils;
import hudson.util.Secret;
import static hudson.util.TimeUnit2.DAYS;
-import static hudson.init.InitMilestone.COMPLETED;
import jenkins.model.Jenkins;
import net.sf.json.JSONObject;
@@ -96,12 +95,9 @@ public class UsageStatistics extends PageDecorator {
* Returns true if it's time for us to check for new version.
*/
public boolean isDue() {
- final Jenkins j = Jenkins.getInstance();
- // user opted out or Jenkins not fully initialized. no data collection.
- if (j == null || j.isUsageStatisticsCollected() || DISABLED || COMPLETED.compareTo(j.getInitLevel()) > 0) {
- return false;
- }
-
+ // user opted out. no data collection.
+ if(!Jenkins.getInstance().isUsageStatisticsCollected() || DISABLED) return false;
+
long now = System.currentTimeMillis();
if(now - lastAttempt > DAY) {
lastAttempt = now;
diff --git a/core/src/main/java/hudson/model/User.java b/core/src/main/java/hudson/model/User.java
index f2ef1d857e..0ff29ea78d 100644
--- a/core/src/main/java/hudson/model/User.java
+++ b/core/src/main/java/hudson/model/User.java
@@ -152,9 +152,6 @@ public class User extends AbstractModelObject implements AccessControlled, Descr
@Nonnull
public static IdStrategy idStrategy() {
Jenkins j = Jenkins.getInstance();
- if (j == null) {
- return IdStrategy.CASE_INSENSITIVE;
- }
SecurityRealm realm = j.getSecurityRealm();
if (realm == null) {
return IdStrategy.CASE_INSENSITIVE;
diff --git a/core/src/main/java/hudson/model/listeners/RunListener.java b/core/src/main/java/hudson/model/listeners/RunListener.java
index e65347bc02..6fd2172ba9 100644
--- a/core/src/main/java/hudson/model/listeners/RunListener.java
+++ b/core/src/main/java/hudson/model/listeners/RunListener.java
@@ -28,6 +28,7 @@ import hudson.ExtensionListView;
import hudson.Extension;
import hudson.ExtensionList;
import hudson.FilePath;
+import hudson.Functions;
import hudson.Launcher;
import hudson.model.AbstractBuild;
import hudson.model.BuildListener;
@@ -223,7 +224,7 @@ public abstract class RunListener implements ExtensionPoint {
* Fires the {@link #onFinalized(Run)} event.
*/
public static void fireFinalized(Run r) {
- if (Jenkins.getInstance() == null) {
+ if (Jenkins.getInstanceOrNull() == null) { // TODO use !Functions.isExtensionsAvailable() once JENKINS-33377
return;
}
for (RunListener l : all()) {
diff --git a/core/src/main/java/hudson/model/listeners/SCMListener.java b/core/src/main/java/hudson/model/listeners/SCMListener.java
index 3f570aa24f..161fb0f603 100644
--- a/core/src/main/java/hudson/model/listeners/SCMListener.java
+++ b/core/src/main/java/hudson/model/listeners/SCMListener.java
@@ -126,8 +126,8 @@ public abstract class SCMListener implements ExtensionPoint {
*/
@SuppressWarnings("deprecation")
public static Collection all() {
- Jenkins j = Jenkins.getInstance();
- if (j == null) {
+ Jenkins j = Jenkins.getInstanceOrNull();
+ if (j == null) { // TODO use !Functions.isExtensionsAvailable() once JENKINS-33377
return Collections.emptySet();
}
List r = new ArrayList(j.getExtensionList(SCMListener.class));
@@ -140,20 +140,12 @@ public abstract class SCMListener implements ExtensionPoint {
/** @deprecated Use {@link Extension} instead. */
@Deprecated
public final void register() {
- Jenkins j = Jenkins.getInstance();
- if (j != null) {
- j.getSCMListeners().add(this);
- }
+ Jenkins.getInstance().getSCMListeners().add(this);
}
/** @deprecated Use {@link Extension} instead. */
@Deprecated
public final boolean unregister() {
- Jenkins j = Jenkins.getInstance();
- if (j != null) {
- return j.getSCMListeners().remove(this);
- } else {
- return false;
- }
+ return Jenkins.getInstance().getSCMListeners().remove(this);
}
}
diff --git a/core/src/main/java/hudson/model/queue/WorkUnit.java b/core/src/main/java/hudson/model/queue/WorkUnit.java
index 58c4ba31ca..68a3d7fce7 100644
--- a/core/src/main/java/hudson/model/queue/WorkUnit.java
+++ b/core/src/main/java/hudson/model/queue/WorkUnit.java
@@ -71,6 +71,9 @@ public final class WorkUnit {
public void setExecutor(@CheckForNull Executor e) {
executor = e;
+ if (e != null) {
+ context.future.addExecutor(e);
+ }
}
/**
diff --git a/core/src/main/java/hudson/model/queue/WorkUnitContext.java b/core/src/main/java/hudson/model/queue/WorkUnitContext.java
index 503a177491..7c030234aa 100644
--- a/core/src/main/java/hudson/model/queue/WorkUnitContext.java
+++ b/core/src/main/java/hudson/model/queue/WorkUnitContext.java
@@ -88,14 +88,9 @@ public final class WorkUnitContext {
}
/**
- * Called by the executor that executes a member {@link SubTask} that belongs to this task
- * to create its {@link WorkUnit}.
+ * Called within the queue maintenance process to create a {@link WorkUnit} for the given {@link SubTask}
*/
public WorkUnit createWorkUnit(SubTask execUnit) {
- Executor executor = Executor.currentExecutor();
- if (executor != null) { // TODO is it legal for this to be called by a non-executor thread?
- future.addExecutor(executor);
- }
WorkUnit wu = new WorkUnit(this, execUnit);
workUnits.add(wu);
return wu;
diff --git a/core/src/main/java/hudson/security/HudsonFilter.java b/core/src/main/java/hudson/security/HudsonFilter.java
index 3a1868344a..b37b2ea4ea 100644
--- a/core/src/main/java/hudson/security/HudsonFilter.java
+++ b/core/src/main/java/hudson/security/HudsonFilter.java
@@ -104,7 +104,7 @@ public class HudsonFilter implements Filter {
// this is how we make us available to the rest of Hudson.
filterConfig.getServletContext().setAttribute(HudsonFilter.class.getName(),this);
try {
- Jenkins hudson = Jenkins.getInstance();
+ Jenkins hudson = Jenkins.getInstanceOrNull();
if (hudson != null) {
// looks like we are initialized after Hudson came into being. initialize it now. See #3069
LOGGER.fine("Security wasn't initialized; Initializing it...");
diff --git a/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java
index fbcc62fcbe..9288ba018f 100644
--- a/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java
+++ b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java
@@ -82,7 +82,6 @@ import java.util.Collections;
import java.util.List;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
-import java.util.logging.Level;
import java.util.logging.Logger;
import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.NoExternalUse;
@@ -359,7 +358,7 @@ public class HudsonPrivateSecurityRealm extends AbstractPasswordBasedSecurityRea
if(si.fullname==null || si.fullname.length()==0)
si.fullname = si.username;
- if(si.email==null || !si.email.contains("@"))
+ if(isMailerPluginPresent() && (si.email==null || !si.email.contains("@")))
si.errorMessage = Messages.HudsonPrivateSecurityRealm_CreateAccount_InvalidEmailAddress();
if (! User.isIdOrFullnameAllowed(si.username)) {
@@ -380,19 +379,30 @@ public class HudsonPrivateSecurityRealm extends AbstractPasswordBasedSecurityRea
// register the user
User user = createAccount(si.username,si.password1);
user.setFullName(si.fullname);
- try {
- // legacy hack. mail support has moved out to a separate plugin
- Class up = Jenkins.getInstance().pluginManager.uberClassLoader.loadClass("hudson.tasks.Mailer$UserProperty");
- Constructor c = up.getDeclaredConstructor(String.class);
- user.addProperty((UserProperty)c.newInstance(si.email));
- } catch (RuntimeException e) {
- throw e;
- } catch (Exception e) {
- LOGGER.log(Level.WARNING, "Failed to set the e-mail address",e);
+ if(isMailerPluginPresent()) {
+ try {
+ // legacy hack. mail support has moved out to a separate plugin
+ Class up = Jenkins.getInstance().pluginManager.uberClassLoader.loadClass("hudson.tasks.Mailer$UserProperty");
+ Constructor c = up.getDeclaredConstructor(String.class);
+ user.addProperty((UserProperty)c.newInstance(si.email));
+ } catch (ReflectiveOperationException e) {
+ throw new RuntimeException(e);
+ }
}
user.save();
return user;
}
+
+ @Restricted(NoExternalUse.class)
+ public boolean isMailerPluginPresent() {
+ try {
+ // mail support has moved to a separate plugin
+ return null != Jenkins.getInstance().pluginManager.uberClassLoader.loadClass("hudson.tasks.Mailer$UserProperty");
+ } catch (ClassNotFoundException e) {
+ LOGGER.finer("Mailer plugin not present");
+ }
+ return false;
+ }
/**
* Creates a new user account by registering a password to the user.
diff --git a/core/src/main/java/hudson/security/PermissionScope.java b/core/src/main/java/hudson/security/PermissionScope.java
index c647b33e2c..cf258d62ea 100644
--- a/core/src/main/java/hudson/security/PermissionScope.java
+++ b/core/src/main/java/hudson/security/PermissionScope.java
@@ -29,6 +29,8 @@ import hudson.model.Computer;
import hudson.model.Item;
import hudson.model.ItemGroup;
import hudson.model.Job;
+import hudson.model.ModelObject;
+import hudson.model.Node;
import hudson.model.Run;
import jenkins.model.Jenkins;
@@ -56,7 +58,7 @@ public final class PermissionScope {
/**
* Domain model type that approximates this scope.
*/
- public final Class modelClass;
+ public final Class modelClass;
/**
* Other bigger scopes that this scope divides. For example, permissions scoped to {@link ItemGroup}
@@ -65,7 +67,7 @@ public final class PermissionScope {
*/
private final Set containers;
- public PermissionScope(Class modelClass, PermissionScope... containers) {
+ public PermissionScope(Class modelClass, PermissionScope... containers) {
this.modelClass = modelClass;
this.containers = ImmutableSet.copyOf(containers);
}
@@ -110,7 +112,7 @@ public final class PermissionScope {
public static final PermissionScope RUN = new PermissionScope(Run.class,ITEM);
/**
- * Permissions scoped to current instances of {@link Computer}s.
+ * Permissions scoped to {@link Node}s or {@link Computer}s (generally interchangeably).
*/
public static final PermissionScope COMPUTER = new PermissionScope(Computer.class,JENKINS);
}
diff --git a/core/src/main/java/hudson/security/TokenBasedRememberMeServices2.java b/core/src/main/java/hudson/security/TokenBasedRememberMeServices2.java
index 6ae4d1c426..9b81ae5b19 100644
--- a/core/src/main/java/hudson/security/TokenBasedRememberMeServices2.java
+++ b/core/src/main/java/hudson/security/TokenBasedRememberMeServices2.java
@@ -93,7 +93,7 @@ public class TokenBasedRememberMeServices2 extends TokenBasedRememberMeServices
return;
}
- Jenkins j = Jenkins.getInstance();
+ Jenkins j = Jenkins.getInstanceOrNull();
if (j != null && j.isDisableRememberMe()) {
if (logger.isDebugEnabled()) {
logger.debug("Did not send remember-me cookie because 'Remember Me' is disabled in " +
diff --git a/core/src/main/java/hudson/security/csrf/CrumbFilter.java b/core/src/main/java/hudson/security/csrf/CrumbFilter.java
index 8e0fe64cb6..9080a54692 100644
--- a/core/src/main/java/hudson/security/csrf/CrumbFilter.java
+++ b/core/src/main/java/hudson/security/csrf/CrumbFilter.java
@@ -35,7 +35,7 @@ public class CrumbFilter implements Filter {
* we cannot use Hudson to the CrumbIssuer into CrumbFilter eagerly.
*/
public CrumbIssuer getCrumbIssuer() {
- Jenkins h = Jenkins.getInstance();
+ Jenkins h = Jenkins.getInstanceOrNull();
if(h==null) return null; // before Jenkins is initialized?
return h.getCrumbIssuer();
}
diff --git a/core/src/main/java/hudson/slaves/SlaveComputer.java b/core/src/main/java/hudson/slaves/SlaveComputer.java
index 23d4a6e872..ed846e66de 100644
--- a/core/src/main/java/hudson/slaves/SlaveComputer.java
+++ b/core/src/main/java/hudson/slaves/SlaveComputer.java
@@ -835,7 +835,7 @@ public class SlaveComputer extends Computer {
* @since 1.362
*/
public static VirtualChannel getChannelToMaster() {
- if (Jenkins.getInstance()!=null)
+ if (Jenkins.getInstanceOrNull()!=null) // check if calling thread is on master or on slave
return FilePath.localChannel;
// if this method is called from within the agent computation thread, this should work
diff --git a/core/src/main/java/hudson/tools/JDKInstaller.java b/core/src/main/java/hudson/tools/JDKInstaller.java
index d89c217875..8a42e7e1ca 100644
--- a/core/src/main/java/hudson/tools/JDKInstaller.java
+++ b/core/src/main/java/hudson/tools/JDKInstaller.java
@@ -449,8 +449,7 @@ public class JDKInstaller extends ToolInstaller {
HttpClient hc = new HttpClient();
hc.getParams().setParameter("http.useragent","Mozilla/5.0 (Windows; U; MSIE 9.0; Windows NT 9.0; en-US)");
- Jenkins j = Jenkins.getInstance();
- ProxyConfiguration jpc = j!=null ? j.proxy : null;
+ ProxyConfiguration jpc = Jenkins.getInstance().proxy;
if(jpc != null) {
hc.getHostConfiguration().setProxy(jpc.name, jpc.port);
if(jpc.getUserName() != null)
diff --git a/core/src/main/java/hudson/util/ArgumentListBuilder.java b/core/src/main/java/hudson/util/ArgumentListBuilder.java
index e9edd17b1e..255208737a 100644
--- a/core/src/main/java/hudson/util/ArgumentListBuilder.java
+++ b/core/src/main/java/hudson/util/ArgumentListBuilder.java
@@ -314,42 +314,46 @@ public class ArgumentListBuilder implements Serializable, Cloneable {
* @since 1.386
*/
public ArgumentListBuilder toWindowsCommand(boolean escapeVars) {
- StringBuilder quotedArgs = new StringBuilder();
+ ArgumentListBuilder windowsCommand = new ArgumentListBuilder().add("cmd.exe", "/C");
boolean quoted, percent;
- for (String arg : args) {
+ for (int i = 0; i < args.size(); i++) {
+ StringBuilder quotedArgs = new StringBuilder();
+ String arg = args.get(i);
quoted = percent = false;
- for (int i = 0; i < arg.length(); i++) {
- char c = arg.charAt(i);
+ for (int j = 0; j < arg.length(); j++) {
+ char c = arg.charAt(j);
if (!quoted && (c == ' ' || c == '*' || c == '?' || c == ',' || c == ';')) {
- quoted = startQuoting(quotedArgs, arg, i);
+ quoted = startQuoting(quotedArgs, arg, j);
}
else if (c == '^' || c == '&' || c == '<' || c == '>' || c == '|') {
- if (!quoted) quoted = startQuoting(quotedArgs, arg, i);
+ if (!quoted) quoted = startQuoting(quotedArgs, arg, j);
// quotedArgs.append('^'); See note in javadoc above
}
else if (c == '"') {
- if (!quoted) quoted = startQuoting(quotedArgs, arg, i);
+ if (!quoted) quoted = startQuoting(quotedArgs, arg, j);
quotedArgs.append('"');
}
else if (percent && escapeVars
&& ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z'))) {
- if (!quoted) quoted = startQuoting(quotedArgs, arg, i);
+ if (!quoted) quoted = startQuoting(quotedArgs, arg, j);
quotedArgs.append('"').append(c);
c = '"';
}
percent = (c == '%');
if (quoted) quotedArgs.append(c);
}
+ if(i == 0 && quoted) quotedArgs.insert(0, '"'); else if (i == 0 && !quoted) quotedArgs.append('"');
if (quoted) quotedArgs.append('"'); else quotedArgs.append(arg);
- quotedArgs.append(' ');
+
+ windowsCommand.add(quotedArgs, mask.get(i));
}
// (comment copied from old code in hudson.tasks.Ant)
// on Windows, executing batch file can't return the correct error code,
// so we need to wrap it into cmd.exe.
// double %% is needed because we want ERRORLEVEL to be expanded after
// batch file executed, not before. This alone shows how broken Windows is...
- quotedArgs.append("&& exit %%ERRORLEVEL%%");
- return new ArgumentListBuilder().add("cmd.exe", "/C").addQuoted(quotedArgs.toString());
+ windowsCommand.add("&&").add("exit").add("%%ERRORLEVEL%%\"");
+ return windowsCommand;
}
/**
diff --git a/core/src/main/java/hudson/util/ConcurrentHashMapConverter.java b/core/src/main/java/hudson/util/ConcurrentHashMapConverter.java
deleted file mode 100644
index ae917d4996..0000000000
--- a/core/src/main/java/hudson/util/ConcurrentHashMapConverter.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * The MIT License
- *
- * Copyright (c) 2010, InfraDNA, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package hudson.util;
-
-import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.converters.UnmarshallingContext;
-import com.thoughtworks.xstream.converters.collections.MapConverter;
-import com.thoughtworks.xstream.converters.reflection.ReflectionProvider;
-import com.thoughtworks.xstream.converters.reflection.SerializableConverter;
-import com.thoughtworks.xstream.io.HierarchicalStreamReader;
-import com.thoughtworks.xstream.mapper.Mapper;
-
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * {@link ConcurrentHashMap} should convert like a map, instead of via serialization.
- *
- * @author Kohsuke Kawaguchi
- */
-public class ConcurrentHashMapConverter extends MapConverter {
- private final SerializableConverter sc;
-
- public ConcurrentHashMapConverter(XStream xs) {
- this(xs.getMapper(),xs.getReflectionProvider());
- }
-
- public ConcurrentHashMapConverter(Mapper mapper, ReflectionProvider reflectionProvider) {
- super(mapper);
- sc = new SerializableConverter(mapper,reflectionProvider);
- }
-
- @Override
- public boolean canConvert(Class type) {
- return type==ConcurrentHashMap.class;
- }
-
- @Override
- public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
- // ConcurrentHashMap used to serialize as custom serialization,
- // so read it in a compatible fashion.
- String s = reader.getAttribute("serialization");
- if(s!=null && s.equals("custom")) {
- return sc.unmarshal(reader,context);
- } else {
- return super.unmarshal(reader, context);
- }
- }
-}
diff --git a/core/src/main/java/hudson/util/PluginServletFilter.java b/core/src/main/java/hudson/util/PluginServletFilter.java
index 41d83899a5..06fd67a925 100644
--- a/core/src/main/java/hudson/util/PluginServletFilter.java
+++ b/core/src/main/java/hudson/util/PluginServletFilter.java
@@ -42,6 +42,8 @@ import java.util.Vector;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
/**
* Servlet {@link Filter} that chains multiple {@link Filter}s, provided by plugins
@@ -93,7 +95,7 @@ public class PluginServletFilter implements Filter, ExtensionPoint {
}
public static void addFilter(Filter filter) throws ServletException {
- Jenkins j = Jenkins.getInstance();
+ Jenkins j = Jenkins.getInstanceOrNull();
PluginServletFilter container = null;
if(j != null) {
@@ -111,7 +113,7 @@ public class PluginServletFilter implements Filter, ExtensionPoint {
}
public static void removeFilter(Filter filter) throws ServletException {
- Jenkins j = Jenkins.getInstance();
+ Jenkins j = Jenkins.getInstanceOrNull();
if (j==null || getInstance(j.servletContext) == null) {
LEGACY.remove(filter);
} else {
@@ -142,5 +144,25 @@ public class PluginServletFilter implements Filter, ExtensionPoint {
list.clear();
}
+ @Restricted(NoExternalUse.class)
+ public static void cleanUp() {
+ PluginServletFilter instance = getInstance(Jenkins.getInstance().servletContext);
+ if (instance != null) {
+ for (Iterator iterator = instance.list.iterator(); iterator.hasNext(); ) {
+ Filter f = iterator.next();
+ try {
+ f.destroy();
+ } catch (RuntimeException e) {
+ LOGGER.log(Level.WARNING, "Filter " + f + " propagated an exception from its destroy method", e);
+ } catch (Error e) {
+ throw e; // we are not supposed to catch errors, don't log as could be an OOM
+ } catch (Throwable e) {
+ LOGGER.log(Level.SEVERE, "Filter " + f + " propagated an exception from its destroy method", e);
+ }
+ iterator.remove();
+ }
+ }
+ }
+
private static final Logger LOGGER = Logger.getLogger(PluginServletFilter.class.getName());
}
diff --git a/core/src/main/java/hudson/util/ProcessKillingVeto.java b/core/src/main/java/hudson/util/ProcessKillingVeto.java
index a410a610fd..0235494032 100644
--- a/core/src/main/java/hudson/util/ProcessKillingVeto.java
+++ b/core/src/main/java/hudson/util/ProcessKillingVeto.java
@@ -74,9 +74,10 @@ public abstract class ProcessKillingVeto implements ExtensionPoint {
* list if Jenkins is not available, never null.
*/
public static List all() {
- Jenkins jenkins = Jenkins.getInstance();
+ // check if we are a thread running on the master JVM or a thread running in a remote JVM
+ Jenkins jenkins = Jenkins.getInstanceOrNull();
if (jenkins == null)
- return Collections.emptyList();
+ return Collections.emptyList(); // we are remote, no body gets to veto
return jenkins.getExtensionList(ProcessKillingVeto.class);
}
diff --git a/core/src/main/java/hudson/util/SubClassGenerator.java b/core/src/main/java/hudson/util/SubClassGenerator.java
index f6076ddda1..0dbb8d6dec 100644
--- a/core/src/main/java/hudson/util/SubClassGenerator.java
+++ b/core/src/main/java/hudson/util/SubClassGenerator.java
@@ -76,7 +76,7 @@ public class SubClassGenerator extends ClassLoader {
Class c = defineClass(name, image, 0, image.length).asSubclass(base);
- Jenkins h = Jenkins.getInstance();
+ Jenkins h = Jenkins.getInstanceOrNull();
if (h!=null) // null only during tests.
((UberClassLoader)h.pluginManager.uberClassLoader).addNamedClass(name,c); // can't change the field type as it breaks binary compatibility
diff --git a/core/src/main/java/hudson/util/XStream2.java b/core/src/main/java/hudson/util/XStream2.java
index bfe924e70a..4f3c7ba613 100644
--- a/core/src/main/java/hudson/util/XStream2.java
+++ b/core/src/main/java/hudson/util/XStream2.java
@@ -106,7 +106,7 @@ public class XStream2 extends XStream {
public Object unmarshal(HierarchicalStreamReader reader, Object root, DataHolder dataHolder) {
// init() is too early to do this
// defensive because some use of XStream happens before plugins are initialized.
- Jenkins h = Jenkins.getInstance();
+ Jenkins h = Jenkins.getInstanceOrNull();
if(h!=null && h.pluginManager!=null && h.pluginManager.uberClassLoader!=null) {
setClassLoader(h.pluginManager.uberClassLoader);
}
@@ -151,7 +151,6 @@ public class XStream2 extends XStream {
registerConverter(new ImmutableSortedSetConverter(getMapper(),getReflectionProvider()),10);
registerConverter(new ImmutableSetConverter(getMapper(),getReflectionProvider()),10);
registerConverter(new ImmutableListConverter(getMapper(),getReflectionProvider()),10);
- registerConverter(new ConcurrentHashMapConverter(getMapper(),getReflectionProvider()),10);
registerConverter(new CopyOnWriteMap.Tree.ConverterImpl(getMapper()),10); // needs to override MapConverter
registerConverter(new DescribableList.ConverterImpl(getMapper()),10); // explicitly added to handle subtypes
registerConverter(new Label.ConverterImpl(),10);
@@ -422,7 +421,7 @@ public class XStream2 extends XStream {
return classOwnership.ownerOf(clazz);
}
if (pm == null) {
- Jenkins j = Jenkins.getInstance();
+ Jenkins j = Jenkins.getInstanceOrNull();
if (j != null) {
pm = j.getPluginManager();
}
diff --git a/core/src/main/java/hudson/util/io/ParserConfigurator.java b/core/src/main/java/hudson/util/io/ParserConfigurator.java
index bac60c7e79..878fba535b 100644
--- a/core/src/main/java/hudson/util/io/ParserConfigurator.java
+++ b/core/src/main/java/hudson/util/io/ParserConfigurator.java
@@ -75,7 +75,7 @@ public abstract class ParserConfigurator implements ExtensionPoint, Serializable
public static void applyConfiguration(SAXReader reader, Object context) throws IOException, InterruptedException {
Collection all = Collections.emptyList();
- if (Jenkins.getInstance()==null) {
+ if (Jenkins.getInstanceOrNull()==null) {
Channel ch = Channel.current();
if (ch!=null)
all = ch.call(new SlaveToMasterCallable, IOException>() {
diff --git a/core/src/main/java/jenkins/install/SetupWizard.java b/core/src/main/java/jenkins/install/SetupWizard.java
index b7e3f13a95..ea9a2e885f 100644
--- a/core/src/main/java/jenkins/install/SetupWizard.java
+++ b/core/src/main/java/jenkins/install/SetupWizard.java
@@ -1,7 +1,9 @@
package jenkins.install;
import java.io.IOException;
+import java.util.Iterator;
import java.util.Locale;
+import java.util.Map;
import java.util.UUID;
import java.util.logging.Logger;
@@ -14,27 +16,43 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
+import hudson.util.VersionNumber;
import org.kohsuke.stapler.HttpResponse;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerResponse;
import hudson.BulkChange;
-import hudson.ExtensionList;
-import hudson.model.User;
-import hudson.model.UserProperty;
+import hudson.FilePath;
import hudson.security.FullControlOnceLoggedInAuthorizationStrategy;
import hudson.security.HudsonPrivateSecurityRealm;
-import hudson.security.PermissionAdder;
import hudson.security.SecurityRealm;
import hudson.security.csrf.DefaultCrumbIssuer;
import hudson.util.HttpResponses;
import hudson.util.PluginServletFilter;
import jenkins.model.Jenkins;
import jenkins.security.s2m.AdminWhitelistRule;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
+import org.kohsuke.stapler.HttpResponse;
+
+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 javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+import java.io.IOException;
+import java.util.Locale;
+import java.util.UUID;
+import java.util.logging.Logger;
/**
* A Jenkins instance used during first-run to provide a limited set of services while
* initial installation is in progress
+ *
+ * @since 2.0
*/
public class SetupWizard {
/**
@@ -44,62 +62,68 @@ public class SetupWizard {
private final Logger LOGGER = Logger.getLogger(SetupWizard.class.getName());
- public SetupWizard(Jenkins j) throws IOException {
- User admin;
+ private final Jenkins jenkins;
+
+ public SetupWizard(Jenkins j) throws IOException, InterruptedException {
+ this.jenkins = j;
// Create an admin user by default with a
// difficult password
+ FilePath iapf = getInitialAdminPasswordFile();
if(j.getSecurityRealm() == null || j.getSecurityRealm() == SecurityRealm.NO_AUTHENTICATION) { // this seems very fragile
BulkChange bc = new BulkChange(j);
-
- HudsonPrivateSecurityRealm securityRealm = new HudsonPrivateSecurityRealm(false, false, null);
- j.setSecurityRealm(securityRealm);
- String randomUUID = UUID.randomUUID().toString().replace("-", "").toLowerCase(Locale.ENGLISH);
- admin = securityRealm.createAccount(SetupWizard.initialSetupAdminUserName, randomUUID);
- admin.addProperty(new SetupWizard.AuthenticationKey(randomUUID));
-
- // Lock Jenkins down:
- FullControlOnceLoggedInAuthorizationStrategy authStrategy = new FullControlOnceLoggedInAuthorizationStrategy();
- authStrategy.setAllowAnonymousRead(false);
- j.setAuthorizationStrategy(authStrategy);
-
- // Shut down all the ports we can by default:
- j.setSlaveAgentPort(-1); // -1 to disable
-
- // require a crumb issuer
- j.setCrumbIssuer(new DefaultCrumbIssuer(false));
-
- // set master -> slave security:
- j.getInjector().getInstance(AdminWhitelistRule.class)
- .setMasterKillSwitch(false);
-
try{
+ HudsonPrivateSecurityRealm securityRealm = new HudsonPrivateSecurityRealm(false, false, null);
+ j.setSecurityRealm(securityRealm);
+ String randomUUID = UUID.randomUUID().toString().replace("-", "").toLowerCase(Locale.ENGLISH);
+
+ // create an admin user
+ securityRealm.createAccount(SetupWizard.initialSetupAdminUserName, randomUUID);
+
+ // JENKINS-33599 - write to a file in the jenkins home directory
+ // most native packages of Jenkins creates a machine user account 'jenkins' to run Jenkins,
+ // and use group 'jenkins' for admins. So we allo groups to read this file
+ iapf.write(randomUUID, "UTF-8");
+ iapf.chmod(0640);
+
+ // Lock Jenkins down:
+ FullControlOnceLoggedInAuthorizationStrategy authStrategy = new FullControlOnceLoggedInAuthorizationStrategy();
+ authStrategy.setAllowAnonymousRead(false);
+ j.setAuthorizationStrategy(authStrategy);
+
+ // Shut down all the ports we can by default:
+ j.setSlaveAgentPort(-1); // -1 to disable
+
+ // require a crumb issuer
+ j.setCrumbIssuer(new DefaultCrumbIssuer(false));
+
+ // set master -> slave security:
+ j.getInjector().getInstance(AdminWhitelistRule.class)
+ .setMasterKillSwitch(false);
+
j.save(); // !!
- } finally {
bc.commit();
+ } finally {
+ bc.abort();
}
}
- else {
- admin = j.getUser(SetupWizard.initialSetupAdminUserName);
- }
- String setupKey = null;
- if(admin != null && admin.getProperty(SetupWizard.AuthenticationKey.class) != null) {
- setupKey = admin.getProperty(SetupWizard.AuthenticationKey.class).getKey();
- }
- if(setupKey != null) {
- LOGGER.info("\n\n*************************************************************\n"
- + "*************************************************************\n"
- + "*************************************************************\n"
- + "\n"
- + "Jenkins initial setup is required. A security token is required to proceed. \n"
- + "Please use the following security token to proceed to installation: \n"
- + "\n"
- + "" + setupKey + "\n"
- + "\n"
- + "*************************************************************\n"
- + "*************************************************************\n"
- + "*************************************************************\n");
- }
+ String setupKey = iapf.readToString().trim();
+
+ LOGGER.info("\n\n*************************************************************\n"
+ + "*************************************************************\n"
+ + "*************************************************************\n"
+ + "\n"
+ + "Jenkins initial setup is required. An admin user has been created and"
+ + "a password generated. \n"
+ + "Please use the following password to proceed to installation: \n"
+ + "\n"
+ + "" + setupKey + "\n"
+ + "\n"
+ + "This may also be found at: " + iapf.getRemote() + "\n"
+ + "\n"
+ + "*************************************************************\n"
+ + "*************************************************************\n"
+ + "*************************************************************\n");
try {
PluginServletFilter.addFilter(FORCE_SETUP_WIZARD_FILTER);
@@ -108,37 +132,29 @@ public class SetupWizard {
}
}
+ /**
+ * Gets the file used to store the initial admin password
+ */
+ @Restricted(NoExternalUse.class) // use by Jelly
+ public FilePath getInitialAdminPasswordFile() {
+ return jenkins.getRootPath().child("secrets/initialAdminPassword");
+ }
+
/**
* Remove the setupWizard filter, ensure all updates are written to disk, etc
*/
- public HttpResponse doCompleteInstall(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
- Jenkins j = Jenkins.getActiveInstance();
- j.setInstallState(InstallState.INITIAL_SETUP_COMPLETED);
+ public HttpResponse doCompleteInstall() throws IOException, ServletException {
+ jenkins.setInstallState(InstallState.INITIAL_SETUP_COMPLETED);
InstallUtil.saveLastExecVersion();
PluginServletFilter.removeFilter(FORCE_SETUP_WIZARD_FILTER);
// Also, clean up the setup wizard if it's completed
- j.setSetupWizard(null);
- return HttpResponses.okJSON();
- }
+ jenkins.setSetupWizard(null);
- // Stores a user property for the authentication key, which is really the auto-generated user's password
- public static class AuthenticationKey extends UserProperty {
- String key;
-
- public AuthenticationKey() {
- }
-
- public AuthenticationKey(String key) {
- this.key = key;
- }
-
- public String getKey() {
- return key;
- }
-
- public void setKey(String key) {
- this.key = key;
- }
+ UpgradeWizard uw = jenkins.getInjector().getInstance(UpgradeWizard.class);
+ if (uw!=null)
+ uw.setCurrentLevel(new VersionNumber("2.0"));
+
+ return HttpResponses.okJSON();
}
/**
diff --git a/core/src/main/java/jenkins/install/UpgradeWizard.java b/core/src/main/java/jenkins/install/UpgradeWizard.java
new file mode 100644
index 0000000000..dd15d04ac9
--- /dev/null
+++ b/core/src/main/java/jenkins/install/UpgradeWizard.java
@@ -0,0 +1,147 @@
+package jenkins.install;
+
+import hudson.Extension;
+import hudson.model.PageDecorator;
+import hudson.model.UpdateSite.Plugin;
+import hudson.util.HttpResponses;
+import hudson.util.VersionNumber;
+import jenkins.model.Jenkins;
+import org.apache.commons.io.FileUtils;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
+import org.kohsuke.stapler.HttpResponse;
+import org.kohsuke.stapler.interceptor.RequirePOST;
+
+import javax.inject.Inject;
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Logger;
+
+import static java.util.logging.Level.*;
+import static org.apache.commons.io.FileUtils.*;
+import static org.apache.commons.lang.StringUtils.*;
+
+/**
+ * This is a stop-gap measure until JENKINS-33663 comes in.
+ * This call may go away. Please don't use it from outside.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+@Restricted(NoExternalUse.class)
+@Extension
+public class UpgradeWizard extends PageDecorator {
+ @Inject
+ private Jenkins jenkins;
+
+ /**
+ * Is this instance fully upgraded?
+ */
+ private volatile boolean upToDate;
+
+ /**
+ * File that captures the state of upgrade.
+ *
+ * This file records the vesrion number that the installation has upgraded to.
+ */
+ /*package*/ File getStateFile() {
+ return new File(Jenkins.getInstance().getRootDir(),"upgraded");
+ }
+
+ public UpgradeWizard() throws IOException {
+ updateUpToDate();
+ }
+
+ private void updateUpToDate() throws IOException {
+ upToDate = new VersionNumber("2.0").compareTo(getCurrentLevel()) <= 0;
+ }
+
+ /**
+ * What is the version the upgrade wizard has run the last time and upgraded to?
+ */
+ private VersionNumber getCurrentLevel() throws IOException {
+ VersionNumber from = new VersionNumber("1.0");
+ File state = getStateFile();
+ if (state.exists()) {
+ from = new VersionNumber(defaultIfBlank(readFileToString(state), "1.0").trim());
+ }
+ return from;
+ }
+
+ /*package*/
+ public void setCurrentLevel(VersionNumber v) throws IOException {
+ FileUtils.writeStringToFile(getStateFile(), v.toString());
+ updateUpToDate();
+ }
+
+ /**
+ * Do we need to show the upgrade wizard prompt?
+ */
+ public boolean isDue() {
+ if (upToDate)
+ return false;
+
+ // only admin users should see this
+ if (!jenkins.hasPermission(Jenkins.ADMINISTER))
+ return false;
+
+ return System.currentTimeMillis() > getStateFile().lastModified();
+ }
+
+ /**
+ * Snooze the upgrade wizard notice.
+ */
+ @RequirePOST
+ public HttpResponse doSnooze() throws IOException {
+ jenkins.checkPermission(Jenkins.ADMINISTER);
+ File f = getStateFile();
+ FileUtils.touch(f);
+ f.setLastModified(System.currentTimeMillis() + TimeUnit.DAYS.toMillis(1));
+ LOGGER.log(FINE, "Snoozed the upgrade wizard notice");
+ return HttpResponses.redirectToContextRoot();
+ }
+
+ /**
+ * Performs the upgrade activity.
+ */
+ @RequirePOST
+ public HttpResponse doUpgrade() throws IOException {
+ jenkins.checkPermission(Jenkins.ADMINISTER);
+ try {
+ if (new VersionNumber("2.0").compareTo(getCurrentLevel())>0) {
+ // 1.0 -> 2.0 upgrade
+ LOGGER.log(WARNING, "Performing 1.0 to 2.0 upgrade");
+
+ for (String shortName : Arrays.asList("workflow-aggregator", "pipeline-stage-view", "github-organization-folder")) {
+ Plugin p = jenkins.getUpdateCenter().getPlugin(shortName);
+ if (p==null) {
+ LOGGER.warning("Plugin not found in the update center: " + shortName);
+ } else {
+ p.deploy(true);
+ }
+ }
+
+ // upgrade to 2.0 complete (if plugin installations fail, that's too bad)
+ FileUtils.writeStringToFile(getStateFile(),"2.0");
+
+ // send the user to the update center so that people can see the installation & restart if need be.
+ return HttpResponses.redirectViaContextPath("updateCenter/");
+ }
+
+// in the future...
+// if (new VersionNumber("3.0").compareTo(getCurrentLevel())>0) {
+//
+// }
+
+ return NOOP;
+ } finally {
+ updateUpToDate();
+ }
+ }
+
+ /*package*/ static final HttpResponse NOOP = HttpResponses.redirectToContextRoot();
+
+
+ private static final Logger LOGGER = Logger.getLogger(UpgradeWizard.class.getName());
+}
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
index 0db1c5a2e0..2b315da5d6 100644
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
@@ -59,6 +59,7 @@ import hudson.cli.declarative.CLIMethod;
import hudson.cli.declarative.CLIResolver;
import hudson.init.InitMilestone;
import hudson.init.InitStrategy;
+import hudson.init.TermMilestone;
import hudson.init.TerminatorFinder;
import hudson.lifecycle.Lifecycle;
import hudson.lifecycle.RestartNotSupportedException;
@@ -178,6 +179,7 @@ import hudson.util.JenkinsReloadFailed;
import hudson.util.Memoizer;
import hudson.util.MultipartFormDataParser;
import hudson.util.NamingThreadFactory;
+import hudson.util.PluginServletFilter;
import hudson.util.RemotingDiagnostics;
import hudson.util.RemotingDiagnostics.HeapDump;
import hudson.util.TextFile;
@@ -189,6 +191,8 @@ import hudson.views.DefaultViewsTabBar;
import hudson.views.MyViewsTabBar;
import hudson.views.ViewsTabBar;
import hudson.widgets.Widget;
+import java.util.TimerTask;
+import java.util.concurrent.CountDownLatch;
import jenkins.ExtensionComponentSet;
import jenkins.ExtensionRefreshException;
import jenkins.InitReactorRunner;
@@ -201,8 +205,10 @@ import jenkins.security.ConfidentialStore;
import jenkins.security.SecurityListener;
import jenkins.security.MasterToSlaveCallable;
import jenkins.slaves.WorkspaceLocator;
+import jenkins.util.JenkinsJVM;
import jenkins.util.Timer;
import jenkins.util.io.FileBoolean;
+import net.jcip.annotations.GuardedBy;
import net.sf.json.JSONObject;
import org.acegisecurity.AccessDeniedException;
import org.acegisecurity.AcegiSecurityException;
@@ -216,8 +222,10 @@ import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.Script;
import org.apache.commons.logging.LogFactory;
import org.jvnet.hudson.reactor.Executable;
+import org.jvnet.hudson.reactor.Milestone;
import org.jvnet.hudson.reactor.Reactor;
import org.jvnet.hudson.reactor.ReactorException;
+import org.jvnet.hudson.reactor.ReactorListener;
import org.jvnet.hudson.reactor.Task;
import org.jvnet.hudson.reactor.TaskBuilder;
import org.jvnet.hudson.reactor.TaskGraphBuilder;
@@ -445,6 +453,8 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
private transient volatile boolean isQuietingDown;
private transient volatile boolean terminating;
+ @GuardedBy("Jenkins.class")
+ private transient boolean cleanUpStarted;
private volatile List jdks = new ArrayList();
@@ -703,12 +713,15 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
/**
* Gets the {@link Jenkins} singleton.
- * {@link #getInstance()} provides the unchecked versions of the method.
+ * {@link #getInstanceOrNull()} provides the unchecked versions of the method.
* @return {@link Jenkins} instance
* @throws IllegalStateException {@link Jenkins} has not been started, or was already shut down
* @since 1.590
+ * @deprecated use {@link #getInstance()}
*/
- public static @Nonnull Jenkins getActiveInstance() throws IllegalStateException {
+ @Deprecated
+ @Nonnull
+ public static Jenkins getActiveInstance() throws IllegalStateException {
Jenkins instance = HOLDER.getInstance();
if (instance == null) {
throw new IllegalStateException("Jenkins has not been started, or was already shut down");
@@ -721,10 +734,27 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
* {@link #getActiveInstance()} provides the checked versions of the method.
* @return The instance. Null if the {@link Jenkins} instance has not been started,
* or was already shut down
+ * @since 1.653
+ */
+ @CheckForNull
+ public static Jenkins getInstanceOrNull() {
+ return HOLDER.getInstance();
+ }
+
+ /**
+ * Gets the {@link Jenkins} singleton. In certain rare cases you may have code that is intended to run before
+ * Jenkins starts or while Jenkins is being shut-down. For those rare cases use {@link #getInstanceOrNull()}.
+ * In other cases you may have code that might end up running on a remote JVM and not on the Jenkins master,
+ * for those cases you really should rewrite your code so that when the {@link Callable} is sent over the remoting
+ * channel it uses a {@code writeReplace} method or similar to ensure that the {@link Jenkins} class is not being
+ * loaded into the remote class loader
+ * @return The instance.
+ * @throws IllegalStateException {@link Jenkins} has not been started, or was already shut down
*/
@CLIResolver
- @CheckForNull
+ @Nullable // TODO replace with non-null once Jenkins 2.0+
public static Jenkins getInstance() {
+ // TODO throw an IllegalStateException in Jenkins 2.0+
return HOLDER.getInstance();
}
@@ -752,6 +782,8 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
*/
private transient final LogRecorderManager log = new LogRecorderManager();
+ private transient final boolean oldJenkinsJVM;
+
protected Jenkins(File root, ServletContext context) throws IOException, InterruptedException, ReactorException {
this(root, context, null);
}
@@ -765,6 +797,8 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
"ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD" // Trigger.timer
})
protected Jenkins(File root, ServletContext context, PluginManager pluginManager) throws IOException, InterruptedException, ReactorException {
+ oldJenkinsJVM = JenkinsJVM.isJenkinsJVM(); // capture to restore in cleanUp()
+ JenkinsJVMAccess._setJenkinsJVM(true); // set it for unit tests as they will not have gone through WebAppMain
long start = System.currentTimeMillis();
// As Jenkins is starting, grant this process full control
@@ -1039,9 +1073,10 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
}
}
} catch (BindException e) {
+ LOGGER.log(Level.WARNING, String.format("Failed to listen to incoming agent connections through JNLP port %s. Change the JNLP port number", slaveAgentPort), e);
new AdministrativeError(administrativeMonitorId,
- "Failed to listen to incoming agent connection",
- "Failed to listen to incoming agent connection. Change the port number to solve the problem.", e);
+ "Failed to listen to incoming agent connections through JNLP",
+ "Failed to listen to incoming agent connections through JNLP. Change the JNLP port number to solve the problem.", e);
}
}
}
@@ -2883,9 +2918,99 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
*/
@edu.umd.cs.findbugs.annotations.SuppressWarnings("ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD")
public void cleanUp() {
- for (ItemListener l : ItemListener.all())
- l.onBeforeShutdown();
+ if (theInstance != this && theInstance != null) {
+ LOGGER.log(Level.WARNING, "This instance is no longer the singleton, ignoring cleanUp()");
+ return;
+ }
+ synchronized (Jenkins.class) {
+ if (cleanUpStarted) {
+ LOGGER.log(Level.WARNING, "Jenkins.cleanUp() already started, ignoring repeated cleanUp()");
+ return;
+ }
+ cleanUpStarted = true;
+ }
+ try {
+ LOGGER.log(Level.INFO, "Stopping Jenkins");
+ final List errors = new ArrayList<>();
+
+ fireBeforeShutdown(errors);
+
+ _cleanUpRunTerminators(errors);
+
+ terminating = true;
+
+ final Set> pending = _cleanUpDisconnectComputers(errors);
+
+ _cleanUpShutdownUDPBroadcast(errors);
+
+ _cleanUpCloseDNSMulticast(errors);
+
+ _cleanUpInterruptReloadThread(errors);
+
+ _cleanUpShutdownTriggers(errors);
+
+ _cleanUpShutdownTimer(errors);
+
+ _cleanUpShutdownTcpSlaveAgent(errors);
+
+ _cleanUpShutdownPluginManager(errors);
+
+ _cleanUpPersistQueue(errors);
+
+ _cleanUpShutdownThreadPoolForLoad(errors);
+
+ _cleanUpAwaitDisconnects(errors, pending);
+
+ _cleanUpPluginServletFilters(errors);
+
+ _cleanUpReleaseAllLoggers(errors);
+
+ LOGGER.log(Level.INFO, "Jenkins stopped");
+
+ if (!errors.isEmpty()) {
+ StringBuilder message = new StringBuilder("Unexpected issues encountered during cleanUp: ");
+ Iterator iterator = errors.iterator();
+ message.append(iterator.next().getMessage());
+ while (iterator.hasNext()) {
+ message.append("; ");
+ message.append(iterator.next().getMessage());
+ }
+ iterator = errors.iterator();
+ RuntimeException exception = new RuntimeException(message.toString(), iterator.next());
+ while (iterator.hasNext()) {
+ exception.addSuppressed(iterator.next());
+ }
+ throw exception;
+ }
+ } finally {
+ theInstance = null;
+ if (JenkinsJVM.isJenkinsJVM()) {
+ JenkinsJVMAccess._setJenkinsJVM(oldJenkinsJVM);
+ }
+ }
+ }
+
+ private void fireBeforeShutdown(List errors) {
+ LOGGER.log(Level.FINE, "Notifying termination");
+ for (ItemListener l : ItemListener.all()) {
+ try {
+ l.onBeforeShutdown();
+ } catch (OutOfMemoryError e) {
+ // we should just propagate this, no point trying to log
+ throw e;
+ } catch (LinkageError e) {
+ LOGGER.log(Level.WARNING, "ItemListener " + l + ": " + e.getMessage(), e);
+ // safe to ignore and continue for this one
+ } catch (Throwable e) {
+ LOGGER.log(Level.WARNING, "ItemListener " + l + ": " + e.getMessage(), e);
+ // save for later
+ errors.add(e);
+ }
+ }
+ }
+
+ private void _cleanUpRunTerminators(List errors) {
try {
final TerminatorFinder tf = new TerminatorFinder(
pluginManager != null ? pluginManager.uberClassLoader : Thread.currentThread().getContextClassLoader());
@@ -2894,71 +3019,325 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
public void execute(Runnable command) {
command.run();
}
- });
- } catch (InterruptedException e) {
- LOGGER.log(SEVERE, "Failed to execute termination",e);
- e.printStackTrace();
- } catch (ReactorException e) {
- LOGGER.log(SEVERE, "Failed to execute termination",e);
- } catch (IOException e) {
- LOGGER.log(SEVERE, "Failed to execute termination",e);
- }
+ }, new ReactorListener() {
+ final Level level = Level.parse(Configuration.getStringConfigParameter("termLogLevel", "FINE"));
+ public void onTaskStarted(Task t) {
+ LOGGER.log(level, "Started " + t.getDisplayName());
+ }
+
+ public void onTaskCompleted(Task t) {
+ LOGGER.log(level, "Completed " + t.getDisplayName());
+ }
+
+ public void onTaskFailed(Task t, Throwable err, boolean fatal) {
+ LOGGER.log(SEVERE, "Failed " + t.getDisplayName(), err);
+ }
+
+ public void onAttained(Milestone milestone) {
+ Level lv = level;
+ String s = "Attained " + milestone.toString();
+ if (milestone instanceof TermMilestone) {
+ lv = Level.INFO; // noteworthy milestones --- at least while we debug problems further
+ s = milestone.toString();
+ }
+ LOGGER.log(lv, s);
+ }
+ });
+ } catch (InterruptedException | ReactorException | IOException e) {
+ LOGGER.log(SEVERE, "Failed to execute termination",e);
+ errors.add(e);
+ } catch (OutOfMemoryError e) {
+ // we should just propagate this, no point trying to log
+ throw e;
+ } catch (LinkageError e) {
+ LOGGER.log(SEVERE, "Failed to execute termination", e);
+ // safe to ignore and continue for this one
+ } catch (Throwable e) {
+ LOGGER.log(SEVERE, "Failed to execute termination", e);
+ // save for later
+ errors.add(e);
+ }
+ }
+
+ private Set> _cleanUpDisconnectComputers(final List errors) {
+ LOGGER.log(Level.INFO, "Starting node disconnection");
final Set> pending = new HashSet>();
- terminating = true;
// JENKINS-28840 we know we will be interrupting all the Computers so get the Queue lock once for all
Queue.withLock(new Runnable() {
@Override
public void run() {
for( Computer c : computers.values() ) {
- c.interrupt();
- killComputer(c);
- pending.add(c.disconnect(null));
+ try {
+ c.interrupt();
+ killComputer(c);
+ pending.add(c.disconnect(null));
+ } catch (OutOfMemoryError e) {
+ // we should just propagate this, no point trying to log
+ throw e;
+ } catch (LinkageError e) {
+ LOGGER.log(Level.WARNING, "Could not disconnect " + c + ": " + e.getMessage(), e);
+ // safe to ignore and continue for this one
+ } catch (Throwable e) {
+ LOGGER.log(Level.WARNING, "Could not disconnect " + c + ": " + e.getMessage(), e);
+ // save for later
+ errors.add(e);
+ }
}
}
});
- if(udpBroadcastThread!=null)
- udpBroadcastThread.shutdown();
- if(dnsMultiCast!=null)
- dnsMultiCast.close();
- interruptReloadThread();
+ return pending;
+ }
- java.util.Timer timer = Trigger.timer;
- if (timer != null) {
- timer.cancel();
+ private void _cleanUpShutdownUDPBroadcast(List errors) {
+ if(udpBroadcastThread!=null) {
+ LOGGER.log(Level.FINE, "Shutting down {0}", udpBroadcastThread.getName());
+ try {
+ udpBroadcastThread.shutdown();
+ } catch (OutOfMemoryError e) {
+ // we should just propagate this, no point trying to log
+ throw e;
+ } catch (LinkageError e) {
+ LOGGER.log(SEVERE, "Failed to shutdown UDP Broadcast Thread", e);
+ // safe to ignore and continue for this one
+ } catch (Throwable e) {
+ LOGGER.log(SEVERE, "Failed to shutdown UDP Broadcast Thread", e);
+ // save for later
+ errors.add(e);
+ }
}
- // TODO: how to wait for the completion of the last job?
- Trigger.timer = null;
+ }
- Timer.shutdown();
+ private void _cleanUpCloseDNSMulticast(List errors) {
+ if(dnsMultiCast!=null) {
+ LOGGER.log(Level.FINE, "Closing DNS Multicast service");
+ try {
+ dnsMultiCast.close();
+ } catch (OutOfMemoryError e) {
+ // we should just propagate this, no point trying to log
+ throw e;
+ } catch (LinkageError e) {
+ LOGGER.log(SEVERE, "Failed to close DNS Multicast service", e);
+ // safe to ignore and continue for this one
+ } catch (Throwable e) {
+ LOGGER.log(SEVERE, "Failed to close DNS Multicast service", e);
+ // save for later
+ errors.add(e);
+ }
+ }
+ }
- if(tcpSlaveAgentListener!=null)
- tcpSlaveAgentListener.shutdown();
+ private void _cleanUpInterruptReloadThread(List errors) {
+ LOGGER.log(Level.FINE, "Interrupting reload thread");
+ try {
+ interruptReloadThread();
+ } catch (SecurityException e) {
+ LOGGER.log(WARNING, "Not permitted to interrupt reload thread", e);
+ errors.add(e);
+ } catch (OutOfMemoryError e) {
+ // we should just propagate this, no point trying to log
+ throw e;
+ } catch (LinkageError e) {
+ LOGGER.log(SEVERE, "Failed to interrupt reload thread", e);
+ // safe to ignore and continue for this one
+ } catch (Throwable e) {
+ LOGGER.log(SEVERE, "Failed to interrupt reload thread", e);
+ // save for later
+ errors.add(e);
+ }
+ }
- if(pluginManager!=null) // be defensive. there could be some ugly timing related issues
- pluginManager.stop();
+ private void _cleanUpShutdownTriggers(List errors) {
+ LOGGER.log(Level.FINE, "Shutting down triggers");
+ try {
+ final java.util.Timer timer = Trigger.timer;
+ if (timer != null) {
+ final CountDownLatch latch = new CountDownLatch(1);
+ timer.schedule(new TimerTask() {
+ @Override
+ public void run() {
+ timer.cancel();
+ latch.countDown();
+ }
+ }, 0);
+ if (latch.await(10, TimeUnit.SECONDS)) {
+ LOGGER.log(Level.FINE, "Triggers shut down successfully");
+ } else {
+ timer.cancel();
+ LOGGER.log(Level.INFO, "Gave up waiting for triggers to finish running");
+ }
+ }
+ Trigger.timer = null;
+ } catch (OutOfMemoryError e) {
+ // we should just propagate this, no point trying to log
+ throw e;
+ } catch (LinkageError e) {
+ LOGGER.log(SEVERE, "Failed to shut down triggers", e);
+ // safe to ignore and continue for this one
+ } catch (Throwable e) {
+ LOGGER.log(SEVERE, "Failed to shut down triggers", e);
+ // save for later
+ errors.add(e);
+ }
+ }
- if(getRootDir().exists())
+ private void _cleanUpShutdownTimer(List errors) {
+ LOGGER.log(Level.FINE, "Shutting down timer");
+ try {
+ Timer.shutdown();
+ } catch (SecurityException e) {
+ LOGGER.log(WARNING, "Not permitted to shut down Timer", e);
+ errors.add(e);
+ } catch (OutOfMemoryError e) {
+ // we should just propagate this, no point trying to log
+ throw e;
+ } catch (LinkageError e) {
+ LOGGER.log(SEVERE, "Failed to shut down Timer", e);
+ // safe to ignore and continue for this one
+ } catch (Throwable e) {
+ LOGGER.log(SEVERE, "Failed to shut down Timer", e);
+ // save for later
+ errors.add(e);
+ }
+ }
+
+ private void _cleanUpShutdownTcpSlaveAgent(List errors) {
+ if(tcpSlaveAgentListener!=null) {
+ LOGGER.log(FINE, "Shutting down TCP/IP slave agent listener");
+ try {
+ tcpSlaveAgentListener.shutdown();
+ } catch (OutOfMemoryError e) {
+ // we should just propagate this, no point trying to log
+ throw e;
+ } catch (LinkageError e) {
+ LOGGER.log(SEVERE, "Failed to shut down TCP/IP slave agent listener", e);
+ // safe to ignore and continue for this one
+ } catch (Throwable e) {
+ LOGGER.log(SEVERE, "Failed to shut down TCP/IP slave agent listener", e);
+ // save for later
+ errors.add(e);
+ }
+ }
+ }
+
+ private void _cleanUpShutdownPluginManager(List errors) {
+ if(pluginManager!=null) {// be defensive. there could be some ugly timing related issues
+ LOGGER.log(Level.INFO, "Stopping plugin manager");
+ try {
+ pluginManager.stop();
+ } catch (OutOfMemoryError e) {
+ // we should just propagate this, no point trying to log
+ throw e;
+ } catch (LinkageError e) {
+ LOGGER.log(SEVERE, "Failed to stop plugin manager", e);
+ // safe to ignore and continue for this one
+ } catch (Throwable e) {
+ LOGGER.log(SEVERE, "Failed to stop plugin manager", e);
+ // save for later
+ errors.add(e);
+ }
+ }
+ }
+
+ private void _cleanUpPersistQueue(List errors) {
+ if(getRootDir().exists()) {
// if we are aborting because we failed to create JENKINS_HOME,
// don't try to save. Issue #536
- getQueue().save();
+ LOGGER.log(Level.INFO, "Persisting build queue");
+ try {
+ getQueue().save();
+ } catch (OutOfMemoryError e) {
+ // we should just propagate this, no point trying to log
+ throw e;
+ } catch (LinkageError e) {
+ LOGGER.log(SEVERE, "Failed to persist build queue", e);
+ // safe to ignore and continue for this one
+ } catch (Throwable e) {
+ LOGGER.log(SEVERE, "Failed to persist build queue", e);
+ // save for later
+ errors.add(e);
+ }
+ }
+ }
- threadPoolForLoad.shutdown();
- for (Future f : pending)
+ private void _cleanUpShutdownThreadPoolForLoad(List errors) {
+ LOGGER.log(FINE, "Shuting down Jenkins load thread pool");
+ try {
+ threadPoolForLoad.shutdown();
+ } catch (SecurityException e) {
+ LOGGER.log(WARNING, "Not permitted to shut down Jenkins load thread pool", e);
+ errors.add(e);
+ } catch (OutOfMemoryError e) {
+ // we should just propagate this, no point trying to log
+ throw e;
+ } catch (LinkageError e) {
+ LOGGER.log(SEVERE, "Failed to shut down Jenkins load thread pool", e);
+ // safe to ignore and continue for this one
+ } catch (Throwable e) {
+ LOGGER.log(SEVERE, "Failed to shut down Jenkins load thread pool", e);
+ // save for later
+ errors.add(e);
+ }
+ }
+
+ private void _cleanUpAwaitDisconnects(List errors, Set> pending) {
+ if (!pending.isEmpty()) {
+ LOGGER.log(Level.INFO, "Waiting for node disconnection completion");
+ }
+ for (Future f : pending) {
try {
f.get(10, TimeUnit.SECONDS); // if clean up operation didn't complete in time, we fail the test
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
break; // someone wants us to die now. quick!
} catch (ExecutionException e) {
- LOGGER.log(Level.WARNING, "Failed to shut down properly",e);
+ LOGGER.log(Level.WARNING, "Failed to shut down remote computer connection cleanly", e);
} catch (TimeoutException e) {
- LOGGER.log(Level.WARNING, "Failed to shut down properly",e);
+ LOGGER.log(Level.WARNING, "Failed to shut down remote computer connection within 10 seconds", e);
+ } catch (OutOfMemoryError e) {
+ // we should just propagate this, no point trying to log
+ throw e;
+ } catch (LinkageError e) {
+ LOGGER.log(Level.WARNING, "Failed to shut down remote computer connection", e);
+ } catch (Throwable e) {
+ LOGGER.log(Level.SEVERE, "Unexpected error while waiting for remote computer connection disconnect", e);
+ errors.add(e);
}
+ }
+ }
- LogFactory.releaseAll();
+ private void _cleanUpPluginServletFilters(List errors) {
+ LOGGER.log(Level.FINE, "Stopping filters");
+ try {
+ PluginServletFilter.cleanUp();
+ } catch (OutOfMemoryError e) {
+ // we should just propagate this, no point trying to log
+ throw e;
+ } catch (LinkageError e) {
+ LOGGER.log(SEVERE, "Failed to stop filters", e);
+ // safe to ignore and continue for this one
+ } catch (Throwable e) {
+ LOGGER.log(SEVERE, "Failed to stop filters", e);
+ // save for later
+ errors.add(e);
+ }
+ }
- theInstance = null;
+ private void _cleanUpReleaseAllLoggers(List errors) {
+ LOGGER.log(Level.FINE, "Releasing all loggers");
+ try {
+ LogFactory.releaseAll();
+ } catch (OutOfMemoryError e) {
+ // we should just propagate this, no point trying to log
+ throw e;
+ } catch (LinkageError e) {
+ LOGGER.log(SEVERE, "Failed to release all loggers", e);
+ // safe to ignore and continue for this one
+ } catch (Throwable e) {
+ LOGGER.log(SEVERE, "Failed to release all loggers", e);
+ // save for later
+ errors.add(e);
+ }
}
public Object getDynamic(String token) {
@@ -4200,10 +4579,10 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
}
/**
- * Shortcut for {@code Jenkins.getInstance().lookup.get(type)}
+ * Shortcut for {@code Jenkins.getInstanceOrNull()?.lookup.get(type)}
*/
public static @CheckForNull T lookup(Class type) {
- Jenkins j = Jenkins.getInstance();
+ Jenkins j = Jenkins.getInstanceOrNull();
return j != null ? j.lookup.get(type) : null;
}
@@ -4453,4 +4832,10 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
}
}
+ private static final class JenkinsJVMAccess extends JenkinsJVM {
+ private static void _setJenkinsJVM(boolean jenkinsJVM) {
+ JenkinsJVM.setJenkinsJVM(jenkinsJVM);
+ }
+ }
+
}
diff --git a/core/src/main/java/jenkins/model/UnlabeledLoadStatistics.java b/core/src/main/java/jenkins/model/UnlabeledLoadStatistics.java
index cf4abda281..158316f00f 100644
--- a/core/src/main/java/jenkins/model/UnlabeledLoadStatistics.java
+++ b/core/src/main/java/jenkins/model/UnlabeledLoadStatistics.java
@@ -78,11 +78,7 @@ public class UnlabeledLoadStatistics extends LoadStatistics {
@Override
public int computeQueueLength() {
- final Jenkins j = Jenkins.getInstance();
- if (j == null) { // Consider queue as empty when Jenkins is inactive
- return 0;
- }
- return j.getQueue().strictCountBuildableItemsFor(null);
+ return Jenkins.getInstance().getQueue().strictCountBuildableItemsFor(null);
}
@Override
diff --git a/core/src/main/java/jenkins/security/ApiTokenProperty.java b/core/src/main/java/jenkins/security/ApiTokenProperty.java
index 10214177bd..36e0b205a2 100644
--- a/core/src/main/java/jenkins/security/ApiTokenProperty.java
+++ b/core/src/main/java/jenkins/security/ApiTokenProperty.java
@@ -120,10 +120,7 @@ public class ApiTokenProperty extends UserProperty {
private boolean hasPermissionToSeeToken() {
final Jenkins jenkins = Jenkins.getInstance();
- if (jenkins == null) {
- return false; // Should not happen - we don't display UIs in this stage
- }
-
+
// Administrators can do whatever they want
if (SHOW_TOKEN_TO_ADMINS && jenkins.hasPermission(Jenkins.ADMINISTER)) {
return true;
diff --git a/core/src/main/java/jenkins/security/ConfidentialStore.java b/core/src/main/java/jenkins/security/ConfidentialStore.java
index 1c747b32c8..9434035d2a 100644
--- a/core/src/main/java/jenkins/security/ConfidentialStore.java
+++ b/core/src/main/java/jenkins/security/ConfidentialStore.java
@@ -62,9 +62,6 @@ public abstract class ConfidentialStore {
if (TEST!=null) return TEST.get();
Jenkins j = Jenkins.getInstance();
- if (j == null) {
- throw new IllegalStateException("cannot initialize confidential key store until Jenkins has started");
- }
Lookup lookup = j.lookup;
ConfidentialStore cs = lookup.get(ConfidentialStore.class);
if (cs==null) {
diff --git a/core/src/main/java/jenkins/security/QueueItemAuthenticatorProvider.java b/core/src/main/java/jenkins/security/QueueItemAuthenticatorProvider.java
index bb43c58f8a..2b6529ddea 100644
--- a/core/src/main/java/jenkins/security/QueueItemAuthenticatorProvider.java
+++ b/core/src/main/java/jenkins/security/QueueItemAuthenticatorProvider.java
@@ -2,6 +2,7 @@ package jenkins.security;
import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
+import hudson.ExtensionList;
import hudson.ExtensionPoint;
import jenkins.model.Jenkins;
@@ -32,10 +33,7 @@ public abstract class QueueItemAuthenticatorProvider implements ExtensionPoint {
private Iterator delegate = null;
private IteratorImpl() {
- final Jenkins jenkins = Jenkins.getInstance();
- providers = new ArrayList(jenkins == null
- ? Collections.emptyList()
- : jenkins.getExtensionList(QueueItemAuthenticatorProvider.class)).iterator();
+ providers = ExtensionList.lookup(QueueItemAuthenticatorProvider.class).iterator();
}
@Override
diff --git a/core/src/main/java/jenkins/slaves/DefaultJnlpSlaveReceiver.java b/core/src/main/java/jenkins/slaves/DefaultJnlpSlaveReceiver.java
index 7733f27c02..f82ad9ca18 100644
--- a/core/src/main/java/jenkins/slaves/DefaultJnlpSlaveReceiver.java
+++ b/core/src/main/java/jenkins/slaves/DefaultJnlpSlaveReceiver.java
@@ -7,6 +7,7 @@ import hudson.model.Slave;
import hudson.remoting.Channel;
import hudson.slaves.SlaveComputer;
import jenkins.model.Jenkins;
+import org.jenkinsci.remoting.engine.JnlpServerHandshake;
import java.io.IOException;
import java.security.SecureRandom;
@@ -27,7 +28,7 @@ import java.util.logging.Logger;
@Extension
public class DefaultJnlpSlaveReceiver extends JnlpAgentReceiver {
@Override
- public boolean handle(String nodeName, JnlpSlaveHandshake handshake) throws IOException, InterruptedException {
+ public boolean handle(String nodeName, JnlpServerHandshake handshake) throws IOException, InterruptedException {
SlaveComputer computer = (SlaveComputer) Jenkins.getInstance().getComputer(nodeName);
if (computer==null) {
@@ -43,9 +44,7 @@ public class DefaultJnlpSlaveReceiver extends JnlpAgentReceiver {
LOGGER.info("Disconnecting "+nodeName+" as we are reconnected from the current peer");
try {
computer.disconnect(new ConnectionFromCurrentPeer()).get(15, TimeUnit.SECONDS);
- } catch (ExecutionException e) {
- throw new IOException("Failed to disconnect the current client",e);
- } catch (TimeoutException e) {
+ } catch (ExecutionException | TimeoutException e) {
throw new IOException("Failed to disconnect the current client",e);
}
} else {
@@ -87,7 +86,7 @@ public class DefaultJnlpSlaveReceiver extends JnlpAgentReceiver {
* @return
* true if the agent secret matches the handshake secret, false otherwise.
*/
- private boolean matchesSecret(String nodeName, JnlpSlaveHandshake handshake){
+ private boolean matchesSecret(String nodeName, JnlpServerHandshake handshake){
SlaveComputer computer = (SlaveComputer) Jenkins.getInstance().getComputer(nodeName);
String handshakeSecret = handshake.getRequestProperty("Secret-Key");
// Verify that the agent secret matches the handshake secret.
diff --git a/core/src/main/java/jenkins/slaves/JnlpAgentReceiver.java b/core/src/main/java/jenkins/slaves/JnlpAgentReceiver.java
index 3526c4a73c..7865c88526 100644
--- a/core/src/main/java/jenkins/slaves/JnlpAgentReceiver.java
+++ b/core/src/main/java/jenkins/slaves/JnlpAgentReceiver.java
@@ -3,6 +3,8 @@ package jenkins.slaves;
import hudson.ExtensionList;
import hudson.ExtensionPoint;
import hudson.model.Slave;
+import jenkins.model.Jenkins;
+import org.jenkinsci.remoting.engine.JnlpServerHandshake;
import java.io.IOException;
import java.util.Properties;
@@ -55,7 +57,16 @@ public abstract class JnlpAgentReceiver implements ExtensionPoint {
* @throws Exception
* Any exception thrown from this method will fatally terminate the connection.
*/
- public abstract boolean handle(String name, JnlpSlaveHandshake handshake) throws IOException, InterruptedException;
+ public abstract boolean handle(String name, JnlpServerHandshake handshake) throws IOException, InterruptedException;
+
+ /**
+ * @deprecated
+ * Use {@link #handle(String, JnlpServerHandshake)}
+ */
+ public boolean handle(String name, JnlpSlaveHandshake handshake) throws IOException, InterruptedException {
+ return handle(name,(JnlpServerHandshake)handshake);
+ }
+
public static ExtensionList all() {
return ExtensionList.lookup(JnlpAgentReceiver.class);
diff --git a/core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol.java b/core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol.java
index 753449375a..36ebaf2969 100644
--- a/core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol.java
+++ b/core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol.java
@@ -2,6 +2,7 @@ package jenkins.slaves;
import hudson.AbortException;
import hudson.Extension;
+import hudson.model.Computer;
import hudson.remoting.Channel;
import hudson.remoting.Channel.Listener;
import hudson.remoting.ChannelBuilder;
@@ -12,6 +13,7 @@ import jenkins.model.Jenkins;
import jenkins.security.ChannelConfigurator;
import jenkins.security.HMACConfidentialKey;
import org.jenkinsci.Symbol;
+import org.jenkinsci.remoting.engine.JnlpServerHandshake;
import org.jenkinsci.remoting.nio.NioChannelHub;
import javax.inject.Inject;
@@ -68,7 +70,7 @@ public class JnlpSlaveAgentProtocol extends AgentProtocol {
new Handler(hub.getHub(),socket).run();
}
- protected static class Handler extends JnlpSlaveHandshake {
+ protected static class Handler extends JnlpServerHandshake {
/**
* @deprecated as of 1.559
@@ -80,9 +82,7 @@ public class JnlpSlaveAgentProtocol extends AgentProtocol {
}
public Handler(NioChannelHub hub, Socket socket) throws IOException {
- super(hub,socket,
- new DataInputStream(socket.getInputStream()),
- new PrintWriter(new BufferedWriter(new OutputStreamWriter(socket.getOutputStream(),"UTF-8")),true));
+ super(hub, Computer.threadPoolForRemoting, socket);
}
protected void run() throws IOException, InterruptedException {
diff --git a/core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol2.java b/core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol2.java
index 124e3bd1bf..ff9ce64c1a 100644
--- a/core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol2.java
+++ b/core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol2.java
@@ -2,6 +2,7 @@ package jenkins.slaves;
import hudson.Extension;
import org.jenkinsci.Symbol;
+import org.jenkinsci.remoting.engine.JnlpServerHandshake;
import org.jenkinsci.remoting.nio.NioChannelHub;
import java.io.ByteArrayInputStream;
@@ -55,8 +56,13 @@ public class JnlpSlaveAgentProtocol2 extends JnlpSlaveAgentProtocol {
final String nodeName = request.getProperty("Node-Name");
for (JnlpAgentReceiver recv : JnlpAgentReceiver.all()) {
- if (recv.handle(nodeName,this))
- return;
+ try {
+ if (recv.handle(nodeName,this))
+ return;
+ } catch (AbstractMethodError e) {
+ if (recv.handle(nodeName,new JnlpSlaveHandshake(this)))
+ return;
+ }
}
error("JNLP2-connect: rejected connection for node: " + nodeName);
diff --git a/core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol3.java b/core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol3.java
new file mode 100644
index 0000000000..8b6b3df129
--- /dev/null
+++ b/core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol3.java
@@ -0,0 +1,137 @@
+package jenkins.slaves;
+
+import hudson.AbortException;
+import hudson.Extension;
+import hudson.Util;
+import hudson.model.Computer;
+import hudson.remoting.Channel;
+import hudson.remoting.ChannelBuilder;
+import hudson.slaves.SlaveComputer;
+import jenkins.AgentProtocol;
+import jenkins.model.Jenkins;
+import jenkins.security.ChannelConfigurator;
+import org.jenkinsci.remoting.engine.JnlpServer3Handshake;
+import org.jenkinsci.remoting.nio.NioChannelHub;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
+
+import javax.inject.Inject;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.net.Socket;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Master-side implementation for JNLP3-connect protocol.
+ *
+ *
@see {@link org.jenkinsci.remoting.engine.JnlpProtocol3} for more details.
+ *
+ * @author Akshay Dayal
+ * @since 1.XXX
+ */
+@Extension
+public class JnlpSlaveAgentProtocol3 extends AgentProtocol {
+ @Inject
+ NioChannelSelector hub;
+
+ @Override
+ public String getName() {
+ if (ENABLED) return "JNLP3-connect";
+ else return "JNLP3-disabled";
+ }
+
+ @Override
+ public void handle(Socket socket) throws IOException, InterruptedException {
+ new Handler(hub.getHub(), socket).run();
+ }
+
+ static class Handler extends JnlpServer3Handshake {
+ private SlaveComputer computer;
+ private PrintWriter logw;
+ private OutputStream log;
+
+ public Handler(NioChannelHub hub, Socket socket) throws IOException {
+ super(hub, Computer.threadPoolForRemoting, socket);
+ }
+
+ protected void run() throws IOException, InterruptedException {
+ try {
+ Channel channel = connect();
+
+ computer.setChannel(channel, log,
+ new Channel.Listener() {
+ @Override
+ public void onClosed(Channel channel, IOException cause) {
+ if (cause != null)
+ LOGGER.log(Level.WARNING,
+ Thread.currentThread().getName() + " for + " +
+ getNodeName() + " terminated", cause);
+ try {
+ socket.close();
+ } catch (IOException e) {
+ // Do nothing.
+ }
+ }
+ });
+ } catch (AbortException e) {
+ logw.println(e.getMessage());
+ logw.println("Failed to establish the connection with the agent");
+ throw e;
+ } catch (IOException e) {
+ logw.println("Failed to establish the connection with the agent " + getNodeName());
+ e.printStackTrace(logw);
+ throw e;
+ }
+ }
+
+ @Override
+ public ChannelBuilder createChannelBuilder(String nodeName) {
+ log = computer.openLogFile();
+ logw = new PrintWriter(log,true);
+ logw.println("JNLP agent connected from " + socket.getInetAddress());
+
+ ChannelBuilder cb = super.createChannelBuilder(nodeName).withHeaderStream(log);
+
+ for (ChannelConfigurator cc : ChannelConfigurator.all()) {
+ cc.onChannelBuilding(cb, computer);
+ }
+
+ return cb;
+ }
+
+ @Override
+ protected String getNodeSecret(String nodeName) throws Failure {
+ computer = (SlaveComputer) Jenkins.getInstance().getComputer(nodeName);
+ if (computer == null) {
+ throw new Failure("Agent trying to register for invalid node: " + nodeName);
+ }
+ return computer.getJnlpMac();
+ }
+
+ }
+
+ private static final Logger LOGGER = Logger.getLogger(JnlpSlaveAgentProtocol3.class.getName());
+
+ /**
+ * Flag to control the activation of JNLP3 protocol.
+ * This feature is being A/B tested right now.
+ *
+ *
+ * Once this will be on by default, the flag and this field will disappear. The system property is
+ * an escape hatch for those who hit any issues and those who are trying this out.
+ */
+ @Restricted(NoExternalUse.class)
+ public static boolean ENABLED;
+
+ static {
+ String propName = JnlpSlaveAgentProtocol3.class.getName() + ".enabled";
+ if (System.getProperties().containsKey(propName))
+ ENABLED = Boolean.getBoolean(propName);
+ else {
+ byte hash = Util.fromHexString(Jenkins.getActiveInstance().getLegacyInstanceId())[0];
+ ENABLED = (hash%10)==0;
+ }
+ }
+}
diff --git a/core/src/main/java/jenkins/slaves/JnlpSlaveHandshake.java b/core/src/main/java/jenkins/slaves/JnlpSlaveHandshake.java
index 341d8c0881..1b67b98ecf 100644
--- a/core/src/main/java/jenkins/slaves/JnlpSlaveHandshake.java
+++ b/core/src/main/java/jenkins/slaves/JnlpSlaveHandshake.java
@@ -1,118 +1,22 @@
package jenkins.slaves;
-import hudson.model.Computer;
-import hudson.remoting.Channel;
-import hudson.remoting.ChannelBuilder;
-import hudson.remoting.Engine;
+import org.jenkinsci.remoting.engine.JnlpServerHandshake;
import org.jenkinsci.remoting.nio.NioChannelHub;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
import java.io.IOException;
-import java.io.PrintWriter;
import java.net.Socket;
-import java.util.Map.Entry;
-import java.util.Properties;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import java.util.concurrent.ExecutorService;
/**
* Palette of objects to talk to the incoming JNLP agent connection.
*
* @author Kohsuke Kawaguchi
* @since 1.561
+ * @deprecated as of 1.609
+ * Use {@link JnlpServerHandshake}
*/
-public class JnlpSlaveHandshake {
- /**
- * Useful for creating a {@link Channel} with NIO as the underlying transport.
- */
- /*package*/ final NioChannelHub hub;
-
- /**
- * Socket connection to the agent.
- */
- /*package*/ final Socket socket;
-
- /**
- * Wrapping Socket input stream.
- */
- /*package*/ final DataInputStream in;
-
- /**
- * For writing handshaking response.
- *
- * This is a poor design choice that we just carry forward for compatibility.
- * For better protocol design, {@link DataOutputStream} is preferred for newer
- * protocols.
- */
- /*package*/ final PrintWriter out;
-
- /**
- * Bag of properties the JNLP agent have sent us during the hand-shake.
- */
- /*package*/ final Properties request = new Properties();
-
-
- /*package*/ JnlpSlaveHandshake(NioChannelHub hub, Socket socket, DataInputStream in, PrintWriter out) {
- this.hub = hub;
- this.socket = socket;
- this.in = in;
- this.out = out;
+public class JnlpSlaveHandshake extends JnlpServerHandshake {
+ /*package*/ JnlpSlaveHandshake(JnlpServerHandshake rhs) {
+ super(rhs);
}
-
- public NioChannelHub getHub() {
- return hub;
- }
-
- public Socket getSocket() {
- return socket;
- }
-
- public DataInputStream getIn() {
- return in;
- }
-
- public PrintWriter getOut() {
- return out;
- }
-
- public Properties getRequestProperties() {
- return request;
- }
-
- public String getRequestProperty(String name) {
- return request.getProperty(name);
- }
-
-
- /**
- * Sends the error output and bail out.
- */
- public void error(String msg) throws IOException {
- out.println(msg);
- LOGGER.log(Level.WARNING,Thread.currentThread().getName()+" is aborted: "+msg);
- socket.close();
- }
-
- /**
- * {@link JnlpAgentReceiver} calls this method to tell the client that the server
- * is happy with the handshaking and is ready to move on to build a channel.
- */
- public void success(Properties response) {
- out.println(Engine.GREETING_SUCCESS);
- for (Entry e : response.entrySet()) {
- out.println(e.getKey()+": "+e.getValue());
- }
- out.println(); // empty line to conclude the response header
- }
-
- public ChannelBuilder createChannelBuilder(String nodeName) {
- if (hub==null)
- return new ChannelBuilder(nodeName, Computer.threadPoolForRemoting);
- else
- return hub.newChannelBuilder(nodeName, Computer.threadPoolForRemoting);
- }
-
-
- private static final Logger LOGGER = Logger.getLogger(JnlpSlaveHandshake.class.getName());
}
diff --git a/core/src/main/java/jenkins/triggers/ReverseBuildTrigger.java b/core/src/main/java/jenkins/triggers/ReverseBuildTrigger.java
index 05bc2f32a5..c4a1d5f57f 100644
--- a/core/src/main/java/jenkins/triggers/ReverseBuildTrigger.java
+++ b/core/src/main/java/jenkins/triggers/ReverseBuildTrigger.java
@@ -108,7 +108,7 @@ public final class ReverseBuildTrigger extends Trigger implements Dependenc
private boolean shouldTrigger(Run upstreamBuild, TaskListener listener) {
Jenkins jenkins = Jenkins.getInstance();
- if (jenkins == null || job == null) {
+ if (job == null) {
return false;
}
// This checks Item.READ also on parent folders; note we are checking as the upstream auth currently:
@@ -204,11 +204,7 @@ public final class ReverseBuildTrigger extends Trigger implements Dependenc
while(tokens.hasMoreTokens()) {
String projectName = tokens.nextToken().trim();
if (StringUtils.isNotBlank(projectName)) {
- Jenkins jenkins = Jenkins.getInstance();
- if (jenkins == null) {
- return FormValidation.ok();
- }
- Job item = jenkins.getItem(projectName, project, Job.class);
+ Job item = Jenkins.getInstance().getItem(projectName, project, Job.class);
if (item == null) {
Job nearest = Items.findNearest(Job.class, projectName, project.getParent());
String alternative = nearest != null ? nearest.getRelativeNameFrom(project) : "?";
@@ -255,11 +251,7 @@ public final class ReverseBuildTrigger extends Trigger implements Dependenc
@Extension public static class ItemListenerImpl extends ItemListener {
@Override public void onLocationChanged(Item item, String oldFullName, String newFullName) {
- Jenkins jenkins = Jenkins.getInstance();
- if (jenkins == null) {
- return;
- }
- for (Job p : jenkins.getAllItems(Job.class)) {
+ for (Job p : Jenkins.getInstance().getAllItems(Job.class)) {
ReverseBuildTrigger t = ParameterizedJobMixIn.getTrigger(p, ReverseBuildTrigger.class);
if (t != null) {
String revised = Items.computeRelativeNamesAfterRenaming(oldFullName, newFullName, t.upstreamProjects, p.getParent());
diff --git a/core/src/main/java/jenkins/util/JSONSignatureValidator.java b/core/src/main/java/jenkins/util/JSONSignatureValidator.java
index 76d422cd90..b36f4e399f 100644
--- a/core/src/main/java/jenkins/util/JSONSignatureValidator.java
+++ b/core/src/main/java/jenkins/util/JSONSignatureValidator.java
@@ -135,9 +135,6 @@ public class JSONSignatureValidator {
// which isn't useful at all
Set anchors = new HashSet(); // CertificateUtil.getDefaultRootCAs();
Jenkins j = Jenkins.getInstance();
- if (j == null) {
- return anchors;
- }
for (String cert : (Set) j.servletContext.getResourcePaths("/WEB-INF/update-center-rootCAs")) {
if (cert.endsWith("/") || cert.endsWith(".txt")) {
continue; // skip directories also any text files that are meant to be documentation
diff --git a/core/src/main/java/jenkins/util/JenkinsJVM.java b/core/src/main/java/jenkins/util/JenkinsJVM.java
new file mode 100644
index 0000000000..dce80915f3
--- /dev/null
+++ b/core/src/main/java/jenkins/util/JenkinsJVM.java
@@ -0,0 +1,73 @@
+package jenkins.util;
+
+import hudson.WebAppMain;
+import javax.servlet.ServletContextEvent;
+import jenkins.model.Jenkins;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
+
+/**
+ * A utility class to identify if the current JVM is the one that is running {@link Jenkins}
+ *
+ * @since TODO
+ */
+public class JenkinsJVM {
+ /**
+ * Flag to identify the JVM running {@link Jenkins}.
+ */
+ private static boolean jenkinsJVM;
+
+ /**
+ * Protect against people instantiating this class.
+ */
+ @Restricted(NoExternalUse.class)
+ protected JenkinsJVM() {
+ throw new IllegalAccessError("Utility class");
+ }
+
+ /**
+ * Identify whether the classloader that loaded this class is the classloader from which {@link Jenkins} has been
+ * started.
+ *
+ * @return {@code true} if this is the classloader on the JVM that started {@link Jenkins} otherwise {@code false}
+ */
+ public static boolean isJenkinsJVM() {
+ return jenkinsJVM;
+ }
+
+ /**
+ * Verify that the classloader that loaded this class is the classloader from which {@link Jenkins} has been
+ * started.
+ *
+ * @throws IllegalStateException if this is not the classloader on the JVM that started {@link Jenkins}.
+ */
+ public static void checkJenkinsJVM() {
+ if (!isJenkinsJVM()) {
+ throw new IllegalStateException("Not running on the Jenkins master JVM");
+ }
+ }
+
+ /**
+ * Verify that the classloader that loaded this class is not the classloader from which {@link Jenkins} has been
+ * started.
+ *
+ * @throws IllegalStateException if this is the classloader on the JVM that started {@link Jenkins}.
+ */
+ public static void checkNotJenkinsJVM() {
+ if (isJenkinsJVM()) {
+ throw new IllegalStateException("Running on the Jenkins master JVM");
+ }
+ }
+
+ /**
+ * Used by {@link WebAppMain#contextInitialized(ServletContextEvent)} and
+ * {@link WebAppMain#contextDestroyed(ServletContextEvent)} to identify the classloader and JVM which started
+ * {@link Jenkins}
+ *
+ * @param jenkinsJVM {@code true} if and only if this is the classloader and JVM that started {@link Jenkins}.
+ */
+ @Restricted(NoExternalUse.class)
+ protected static void setJenkinsJVM(boolean jenkinsJVM) {
+ JenkinsJVM.jenkinsJVM = jenkinsJVM;
+ }
+}
diff --git a/core/src/main/resources/hudson/ProxyConfiguration/help-name_pl.html b/core/src/main/resources/hudson/ProxyConfiguration/help-name_pl.html
new file mode 100644
index 0000000000..d98aae0116
--- /dev/null
+++ b/core/src/main/resources/hudson/ProxyConfiguration/help-name_pl.html
@@ -0,0 +1,13 @@
+
+ Jeœli Jenkins znajduje siê za zapor¹ sieciow¹ i nie ma bezpoœredniego dostêpu do Internetu,
+ a JVM nie jest skonfigurowana odpowiednio
+ (sprawdŸ ustawienia sieciowe),
+ mo¿esz udostêpniæ Internet ustawiaj¹c serwer proxy, aby Jenkins samodzielnie pobra³ i zainstalowa³ wtyczki.
+ Pamiêtaj, ¿e Jenkins u¿ywa po³¹czenia https, aby pobraæ wtyczki z centrum aktualizacji.
+
+
+ Pozostaw to pole puste, aby Jenkins korzysta³ z bezpoœredniego po³¹czenia z Internetem.
+
+
+ Jeœli nie jesteœ pewny ustawieñ, sprawdŸ ustawienia serwerów proxy w przegl¹darce.
+
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/ProxyConfiguration/help-name_pt_BR.html b/core/src/main/resources/hudson/ProxyConfiguration/help-name_pt_BR.html
index 2b4882af53..41f744e143 100644
--- a/core/src/main/resources/hudson/ProxyConfiguration/help-name_pt_BR.html
+++ b/core/src/main/resources/hudson/ProxyConfiguration/help-name_pt_BR.html
@@ -6,8 +6,8 @@
instalar plugins para você. Note que o Jenkins usa HTTPS para se comunicar com o centro de atualização para baixar os plugins.
- O valor que você colocar aqui será atribuído a propriedade de sistema http.proxyHost. Deixar este campo vazio
- deixa esta propriedade sem atribuição, o que significa que o Jenkins tentará conectar ao host externo diretamente.
+ Deixar este campo vazio
+ faz com que o Jenkins tente conectar à internet diretamente.
Se você não está certo sobre o valor, cheque a configuração de proxy de seu browser.
diff --git a/core/src/main/resources/hudson/cli/Messages.properties b/core/src/main/resources/hudson/cli/Messages.properties
index 3f73403341..a7a7f656a5 100644
--- a/core/src/main/resources/hudson/cli/Messages.properties
+++ b/core/src/main/resources/hudson/cli/Messages.properties
@@ -86,3 +86,6 @@ DeleteNodeCommand.ShortDescription=Deletes node(s)
ReloadJobCommand.ShortDescription=Reload job(s)
OnlineNodeCommand.ShortDescription=Resume using a node for performing builds, to cancel out the earlier "offline-node" command.
+
+ClearQueueCommand.ShortDescription=Clears the build queue.
+
diff --git a/core/src/main/resources/hudson/cli/Messages_bg.properties b/core/src/main/resources/hudson/cli/Messages_bg.properties
index c218a653cf..9a44c3b966 100644
--- a/core/src/main/resources/hudson/cli/Messages_bg.properties
+++ b/core/src/main/resources/hudson/cli/Messages_bg.properties
@@ -122,3 +122,6 @@ BuildCommand.CLICause.CannotBuildConfigNotSaved=\
\u0417\u0430\u0434\u0430\u0447\u0430\u0442\u0430 \u201e{0}\u201c \u043d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u0441\u0435 \u0438\u0437\u0433\u0440\u0430\u0434\u0438, \u0437\u0430\u0449\u043e\u0442\u043e \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438\u0442\u0435 \u045d \u043d\u0435 \u0441\u0430 \u0437\u0430\u043f\u0430\u0437\u0435\u043d\u0438.
BuildCommand.CLICause.CannotBuildUnknownReasons=\
\u0417\u0430\u0434\u0430\u0447\u0430\u0442\u0430 \u201e{0}\u201c \u043d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u0441\u0435 \u0438\u0437\u0433\u0440\u0430\u0434\u0438 \u043f\u043e \u043d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0438 \u043f\u0440\u0438\u0447\u0438\u043d\u0438.
+
+ClearQueueCommand.ShortDescription=\
+ \u0418\u0437\u0447\u0438\u0441\u0442\u0432\u0430\u043d\u0435 \u043d\u0430 \u043e\u043f\u0430\u0448\u043a\u0430\u0442\u0430 \u0441\u044a\u0441 \u0437\u0430\u0434\u0430\u0447\u0438.
diff --git a/core/src/main/resources/hudson/cli/Messages_da.properties b/core/src/main/resources/hudson/cli/Messages_da.properties
index 1bee62f87b..66ed157450 100644
--- a/core/src/main/resources/hudson/cli/Messages_da.properties
+++ b/core/src/main/resources/hudson/cli/Messages_da.properties
@@ -2,3 +2,6 @@ DeleteNodeCommand.ShortDescription=Sletter en node
DeleteJobCommand.ShortDescription=Sletter et job
OnlineNodeCommand.ShortDescription=Genoptag brugen af en byggenode, for at annullere en tidligere udstedt "offline-node" kommando.
+
+ClearQueueCommand.ShortDescription=Ryd byggek\u00f8en
+
diff --git a/core/src/main/resources/hudson/cli/Messages_de.properties b/core/src/main/resources/hudson/cli/Messages_de.properties
index 4df178a57b..366dcfb5e5 100644
--- a/core/src/main/resources/hudson/cli/Messages_de.properties
+++ b/core/src/main/resources/hudson/cli/Messages_de.properties
@@ -2,3 +2,6 @@ DeleteNodeCommand.ShortDescription=Knoten l\u00f6schen.
DeleteJobCommand.ShortDescription=Job l\u00f6schen.
OnlineNodeCommand.ShortDescription=Knoten wird wieder f\u00fcr neue Builds verwendet. Hebt ein vorausgegangenes "offline-node"-Kommando auf.
+
+ClearQueueCommand.ShortDescription=Build-Warteschlange l\u00f6schen.
+
diff --git a/core/src/main/resources/hudson/cli/Messages_es.properties b/core/src/main/resources/hudson/cli/Messages_es.properties
index b0f51daa04..bb3e82e01a 100644
--- a/core/src/main/resources/hudson/cli/Messages_es.properties
+++ b/core/src/main/resources/hudson/cli/Messages_es.properties
@@ -52,3 +52,6 @@ DeleteJobCommand.ShortDescription=Borrar una tarea
DeleteNodeCommand.ShortDescription=Borrar un nodo
OnlineNodeCommand.ShortDescription=Continuar usando un nodo y candelar el comando "offline-node" mas reciente.
+
+ClearQueueCommand.ShortDescription=Limpiar la cola de trabajos
+
diff --git a/core/src/main/resources/hudson/cli/Messages_it.properties b/core/src/main/resources/hudson/cli/Messages_it.properties
index c5010ed77a..20b07b0c7a 100644
--- a/core/src/main/resources/hudson/cli/Messages_it.properties
+++ b/core/src/main/resources/hudson/cli/Messages_it.properties
@@ -2,3 +2,6 @@ DeleteNodeCommand.ShortDescription=Cancella un nodo
DeleteJobCommand.ShortDescription=Cancella un job
OnlineNodeCommand.ShortDescription=Resume using a node for performing builds, to cancel out the earlier "offline-node" command.
+
+ClearQueueCommand.ShortDescription=Pulisce la coda di lavoro
+
diff --git a/core/src/main/resources/hudson/cli/Messages_ja.properties b/core/src/main/resources/hudson/cli/Messages_ja.properties
index 908949a71c..83944936c1 100644
--- a/core/src/main/resources/hudson/cli/Messages_ja.properties
+++ b/core/src/main/resources/hudson/cli/Messages_ja.properties
@@ -74,3 +74,6 @@ DeleteNodeCommand.ShortDescription=\u30ce\u30fc\u30c9\u3092\u524a\u9664\u3057\u3
DeleteJobCommand.ShortDescription=\u30b8\u30e7\u30d6\u3092\u524a\u9664\u3057\u307e\u3059\u3002
OnlineNodeCommand.ShortDescription=\u76f4\u524d\u306b\u5b9f\u884c\u3057\u305f"online-node"\u30b3\u30de\u30f3\u30c9\u3092\u53d6\u308a\u6d88\u3057\u3001\u30d3\u30eb\u30c9\u3092\u5b9f\u884c\u3059\u308b\u30ce\u30fc\u30c9\u306e\u4f7f\u7528\u3092\u518d\u958b\u3057\u307e\u3059\u3002
+
+ClearQueueCommand.ShortDescription=\u30d3\u30eb\u30c9\u30ad\u30e5\u30fc\u3092\u30af\u30ea\u30a2\u3057\u307e\u3059\u3002
+
diff --git a/core/src/main/resources/hudson/cli/Messages_pt_BR.properties b/core/src/main/resources/hudson/cli/Messages_pt_BR.properties
index 6b924aa8de..5ba26b1c5f 100644
--- a/core/src/main/resources/hudson/cli/Messages_pt_BR.properties
+++ b/core/src/main/resources/hudson/cli/Messages_pt_BR.properties
@@ -120,3 +120,6 @@ ReloadJobCommand.ShortDescription=\
Recarrega job(s) do disco.
OnlineNodeCommand.ShortDescription=Continuar usando um n\u00f3 para realizar os builds
+
+ClearQueueCommand.ShortDescription=Limpa a fila de builds
+
diff --git a/core/src/main/resources/hudson/cli/Messages_zh_CN.properties b/core/src/main/resources/hudson/cli/Messages_zh_CN.properties
index 62e09b7612..111ff92e1a 100644
--- a/core/src/main/resources/hudson/cli/Messages_zh_CN.properties
+++ b/core/src/main/resources/hudson/cli/Messages_zh_CN.properties
@@ -1,2 +1,4 @@
DeleteNodeCommand.ShortDescription=Deletes a node
DeleteJobCommand.ShortDescription=Deletes a job
+
+ClearQueueCommand.ShortDescription=Clears the build queue
diff --git a/core/src/main/resources/hudson/cli/Messages_zh_TW.properties b/core/src/main/resources/hudson/cli/Messages_zh_TW.properties
index 7921933ce6..5bc2801193 100644
--- a/core/src/main/resources/hudson/cli/Messages_zh_TW.properties
+++ b/core/src/main/resources/hudson/cli/Messages_zh_TW.properties
@@ -75,3 +75,5 @@ BuildCommand.CLICause.ShortDescription=\u7531 {0} \u7684\u547d\u4ee4\u5217\u4ecb
DeleteNodeCommand.ShortDescription=\u522a\u9664\u6307\u5b9a\u7bc0\u9ede\u3002
DeleteJobCommand.ShortDescription=\u522a\u9664\u4f5c\u696d\u3002
+
+ClearQueueCommand.ShortDescription=\u6e05\u9664\u5efa\u7f6e\u4f47\u5217\u3002
diff --git a/core/src/main/resources/hudson/model/Job/configure.jelly b/core/src/main/resources/hudson/model/Job/configure.jelly
index e309b2ee0e..81c7e86031 100644
--- a/core/src/main/resources/hudson/model/Job/configure.jelly
+++ b/core/src/main/resources/hudson/model/Job/configure.jelly
@@ -27,14 +27,13 @@ THE SOFTWARE.
-->
-
-
-
+
-
-
-
${%loading}
-
+
+
+
+
${%LOADING}
+
diff --git a/core/src/main/resources/hudson/model/Messages_bg.properties b/core/src/main/resources/hudson/model/Messages_bg.properties
index 939ad26c85..160995ca8b 100644
--- a/core/src/main/resources/hudson/model/Messages_bg.properties
+++ b/core/src/main/resources/hudson/model/Messages_bg.properties
@@ -135,8 +135,6 @@ BallColor.Unstable=\
Build.post_build_steps_failed=\
\u0421\u0442\u044a\u043f\u043a\u0438\u0442\u0435 \u0441\u043b\u0435\u0434 \u0438\u0437\u0433\u0440\u0430\u0436\u0434\u0430\u043d\u0435\u0442\u043e \u0441\u0430 \u043d\u0435\u0443\u0441\u043f\u0435\u0448\u043d\u0438
-CLI.clear-queue.shortDescription=\
- \u0418\u0437\u0447\u0438\u0441\u0442\u0432\u0430\u043d\u0435 \u043d\u0430 \u043e\u043f\u0430\u0448\u043a\u0430\u0442\u0430 \u0441\u044a\u0441 \u0437\u0430\u0434\u0430\u0447\u0438.
CLI.delete-job.shortDescription=\
\u0418\u0437\u0442\u0440\u0438\u0432\u0430\u043d\u0435 \u043d\u0430 \u0437\u0430\u0434\u0430\u0447\u0430.
CLI.reload-job.shortDescription=\
diff --git a/core/src/main/resources/hudson/model/Messages_da.properties b/core/src/main/resources/hudson/model/Messages_da.properties
index 94ccc2dbea..7787a8a44c 100644
--- a/core/src/main/resources/hudson/model/Messages_da.properties
+++ b/core/src/main/resources/hudson/model/Messages_da.properties
@@ -101,7 +101,6 @@ MyView.DisplayName=Min visning
Hudson.USER_CONTENT_README=Filer i dette direktorie vil blive serveret under http://server/hudson/userContent/
UpdateCenter.PluginCategory.scm-related=Kildekodestyring (SCM) relateret
CLI.cancel-quiet-down.shortDescription=Sl\u00e5 effekten af "quite-down" kommandoen fra.
-CLI.clear-queue.shortDescription=Ryd byggek\u00f8en
Api.NoXPathMatch=XPath {0} matcher ikke
Run.MarkedExplicitly=Eksplicit markeret til at blive gemt
Hudson.Permissions.Title=Overordnet
diff --git a/core/src/main/resources/hudson/model/Messages_de.properties b/core/src/main/resources/hudson/model/Messages_de.properties
index 91fb24e694..e7e002b2ff 100644
--- a/core/src/main/resources/hudson/model/Messages_de.properties
+++ b/core/src/main/resources/hudson/model/Messages_de.properties
@@ -77,7 +77,6 @@ CLI.keep-build.shortDescription=Build f\u00fcr immer aufbewahren.
CLI.quiet-down.shortDescription=Jenkins' Aktivit\u00e4t reduzieren, z.B. zur Vorbereitung eines Neustarts. Es werden keine neuen Builds mehr gestartet.
CLI.cancel-quiet-down.shortDescription=Wirkung des Befehls "quiet-down" wieder aufheben.
CLI.reload-configuration.shortDescription=Alle Daten im Speicher verwerfen und Konfiguration neu von Festplatte laden. Dies ist n\u00fctzlich, wenn Sie \u00c4nderungen direkt im Dateisystem vorgenommen haben.
-CLI.clear-queue.shortDescription=Build-Warteschlange l\u00f6schen.
CLI.disable-job.shortDescription=Job deaktivieren.
CLI.enable-job.shortDescription=Job aktivieren.
CLI.connect-node.shortDescription=Erneut mit Knoten verbinden.
diff --git a/core/src/main/resources/hudson/model/Messages_es.properties b/core/src/main/resources/hudson/model/Messages_es.properties
index 6d34cc004d..0fcdb186d2 100644
--- a/core/src/main/resources/hudson/model/Messages_es.properties
+++ b/core/src/main/resources/hudson/model/Messages_es.properties
@@ -56,7 +56,6 @@ BallColor.Pending=Pendiente
BallColor.Success=Correcto
BallColor.Unstable=Inestable
-CLI.clear-queue.shortDescription=Limpiar la cola de trabajos
CLI.disable-job.shortDescription=Desactivar una tarea
CLI.enable-job.shortDescription=Activar una tarea
CLI.disconnect-node.shortDescription=Desconectarse de un nodo
diff --git a/core/src/main/resources/hudson/model/Messages_it.properties b/core/src/main/resources/hudson/model/Messages_it.properties
index 100fae6c7a..539734bc50 100644
--- a/core/src/main/resources/hudson/model/Messages_it.properties
+++ b/core/src/main/resources/hudson/model/Messages_it.properties
@@ -70,7 +70,6 @@ BallColor.Pending=In attesa
BallColor.Success=Successo
BallColor.Unstable=Instabile
-CLI.clear-queue.shortDescription=Pulisce la coda di lavoro
CLI.disable-job.shortDescription=Disabilita un job
CLI.enable-job.shortDescription=Abilita un job
CLI.disconnect-node.shortDescription=Disconnects from a node
diff --git a/core/src/main/resources/hudson/model/Messages_ja.properties b/core/src/main/resources/hudson/model/Messages_ja.properties
index 29b8a249b9..aa0f5a1a1e 100644
--- a/core/src/main/resources/hudson/model/Messages_ja.properties
+++ b/core/src/main/resources/hudson/model/Messages_ja.properties
@@ -289,7 +289,6 @@ CLI.keep-build.shortDescription=\u30d3\u30eb\u30c9\u3092\u4fdd\u5b58\u3059\u308b
CLI.quiet-down.shortDescription=Jenkins\u306f\u518d\u8d77\u52d5\u306b\u5411\u3051\u3066\u7d42\u4e86\u51e6\u7406\u3092\u5b9f\u65bd\u4e2d\u3067\u3059\u3002\u30d3\u30eb\u30c9\u3092\u958b\u59cb\u3057\u306a\u3044\u3067\u304f\u3060\u3055\u3044\u3002
CLI.cancel-quiet-down.shortDescription="quite-down"\u30b3\u30de\u30f3\u30c9\u306e\u51e6\u7406\u3092\u30ad\u30e3\u30f3\u30bb\u30eb\u3057\u307e\u3059\u3002
CLI.reload-configuration.shortDescription=\u30e1\u30e2\u30ea\u306b\u3042\u308b\u3059\u3079\u3066\u306e\u30c7\u30fc\u30bf\u3092\u7834\u68c4\u3057\u3066\u3001\u30d5\u30a1\u30a4\u30eb\u304b\u3089\u518d\u30ed\u30fc\u30c9\u3057\u307e\u3059\u3002\u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb\u3092\u76f4\u63a5\u4fee\u6b63\u3057\u305f\u5834\u5408\u306b\u5f79\u306b\u7acb\u3061\u307e\u3059\u3002
-CLI.clear-queue.shortDescription=\u30d3\u30eb\u30c9\u30ad\u30e5\u30fc\u3092\u30af\u30ea\u30a2\u3057\u307e\u3059\u3002
CLI.disable-job.shortDescription=\u30b8\u30e7\u30d6\u3092\u7121\u52b9\u5316\u3057\u307e\u3059\u3002
CLI.enable-job.shortDescription=\u30b8\u30e7\u30d6\u3092\u6709\u52b9\u5316\u3057\u307e\u3059\u3002
CLI.disconnect-node.shortDescription=\u30ce\u30fc\u30c9\u3068\u306e\u63a5\u7d9a\u3092\u5207\u65ad\u3057\u307e\u3059\u3002
diff --git a/core/src/main/resources/hudson/model/Messages_pt_BR.properties b/core/src/main/resources/hudson/model/Messages_pt_BR.properties
index 4c6becc49f..6ab7c43fd6 100644
--- a/core/src/main/resources/hudson/model/Messages_pt_BR.properties
+++ b/core/src/main/resources/hudson/model/Messages_pt_BR.properties
@@ -213,8 +213,6 @@ Hudson.USER_CONTENT_README=Arquivos que ser\u00e3o disponibilizados no seu ender
UpdateCenter.PluginCategory.scm-related=Gerenciamento de c\u00f3digo fonte
# Cancel the effect of the "quiet-down" command.
CLI.cancel-quiet-down.shortDescription=Cancela o comando "quiet-down"
-# Clears the build queue
-CLI.clear-queue.shortDescription=Limpa a fila de builds
# Upstream project {0} is already building.
AbstractProject.UpstreamBuildInProgress=Projeto {0} j\u00e1 esta em builds
# A view with name {0} does not exist
diff --git a/core/src/main/resources/hudson/model/Messages_zh_CN.properties b/core/src/main/resources/hudson/model/Messages_zh_CN.properties
index 1e1584d4d5..19b53a673c 100644
--- a/core/src/main/resources/hudson/model/Messages_zh_CN.properties
+++ b/core/src/main/resources/hudson/model/Messages_zh_CN.properties
@@ -60,7 +60,6 @@ BallColor.Pending=Pending
BallColor.Success=Success
BallColor.Unstable=Unstable
-CLI.clear-queue.shortDescription=Clears the build queue
CLI.disable-job.shortDescription=Disables a job
CLI.enable-job.shortDescription=Enables a job
CLI.disconnect-node.shortDescription=Disconnects from a node
diff --git a/core/src/main/resources/hudson/model/Messages_zh_TW.properties b/core/src/main/resources/hudson/model/Messages_zh_TW.properties
index 4a20545359..1ad674b42e 100644
--- a/core/src/main/resources/hudson/model/Messages_zh_TW.properties
+++ b/core/src/main/resources/hudson/model/Messages_zh_TW.properties
@@ -76,7 +76,6 @@ BallColor.Pending=\u64f1\u7f6e
BallColor.Success=\u6210\u529f
BallColor.Unstable=\u4e0d\u7a69\u5b9a
-CLI.clear-queue.shortDescription=\u6e05\u9664\u5efa\u7f6e\u4f47\u5217\u3002
CLI.disable-job.shortDescription=\u505c\u7528\u4f5c\u696d\u3002
CLI.enable-job.shortDescription=\u555f\u7528\u4f5c\u696d\u3002
CLI.disconnect-node.shortDescription=\u4e2d\u65b7\u8207\u6307\u5b9a\u7bc0\u9ede\u7684\u9023\u7dda\u3002
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 5c5f0d1219..b60a6877c4 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
@@ -26,4 +26,4 @@ Delete\ View=Ta bort vy
Edit\ View=Redigera vy
NewJob=Skapa nytt {0}
People=Anv\u00E4ndare
-Project\ Relationship=Jobbberoenden
+Project\ Relationship=Jobberoenden
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm.jelly
index 346d8c4d53..a4e2f822f2 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm.jelly
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm.jelly
@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-->
-
+
${title}
@@ -49,10 +49,12 @@ THE SOFTWARE.
${%Full name}:
+
${%E-mail address}:
+
${%Enter text as shown}:
diff --git a/core/src/main/resources/hudson/util/AWTProblem/index.jelly b/core/src/main/resources/hudson/util/AWTProblem/index.jelly
index c5acf32c36..ec8df8e329 100644
--- a/core/src/main/resources/hudson/util/AWTProblem/index.jelly
+++ b/core/src/main/resources/hudson/util/AWTProblem/index.jelly
@@ -24,6 +24,7 @@ THE SOFTWARE.
+
diff --git a/core/src/main/resources/hudson/util/HudsonFailedToLoad/index.jelly b/core/src/main/resources/hudson/util/HudsonFailedToLoad/index.jelly
index a69eb1d4db..3c868da831 100644
--- a/core/src/main/resources/hudson/util/HudsonFailedToLoad/index.jelly
+++ b/core/src/main/resources/hudson/util/HudsonFailedToLoad/index.jelly
@@ -24,6 +24,7 @@ THE SOFTWARE.
+
diff --git a/core/src/main/resources/hudson/util/IncompatibleAntVersionDetected/index.jelly b/core/src/main/resources/hudson/util/IncompatibleAntVersionDetected/index.jelly
index 6c88a89b90..e516ea8025 100644
--- a/core/src/main/resources/hudson/util/IncompatibleAntVersionDetected/index.jelly
+++ b/core/src/main/resources/hudson/util/IncompatibleAntVersionDetected/index.jelly
@@ -24,6 +24,7 @@ THE SOFTWARE.
+
diff --git a/core/src/main/resources/hudson/util/IncompatibleServletVersionDetected/index.jelly b/core/src/main/resources/hudson/util/IncompatibleServletVersionDetected/index.jelly
index 76407ab939..926a5cfd79 100644
--- a/core/src/main/resources/hudson/util/IncompatibleServletVersionDetected/index.jelly
+++ b/core/src/main/resources/hudson/util/IncompatibleServletVersionDetected/index.jelly
@@ -24,6 +24,7 @@ THE SOFTWARE.
+
diff --git a/core/src/main/resources/hudson/util/IncompatibleVMDetected/index.jelly b/core/src/main/resources/hudson/util/IncompatibleVMDetected/index.jelly
index ee1d8a0797..c9baaa5ce2 100644
--- a/core/src/main/resources/hudson/util/IncompatibleVMDetected/index.jelly
+++ b/core/src/main/resources/hudson/util/IncompatibleVMDetected/index.jelly
@@ -24,6 +24,7 @@ THE SOFTWARE.
+
diff --git a/core/src/main/resources/hudson/util/InsufficientPermissionDetected/index.jelly b/core/src/main/resources/hudson/util/InsufficientPermissionDetected/index.jelly
index e3ef38d31b..0dc65cfc28 100644
--- a/core/src/main/resources/hudson/util/InsufficientPermissionDetected/index.jelly
+++ b/core/src/main/resources/hudson/util/InsufficientPermissionDetected/index.jelly
@@ -24,6 +24,7 @@ THE SOFTWARE.
+
diff --git a/core/src/main/resources/hudson/util/JenkinsReloadFailed/index.groovy b/core/src/main/resources/hudson/util/JenkinsReloadFailed/index.groovy
index 761ec1c4e0..9405ab55c6 100644
--- a/core/src/main/resources/hudson/util/JenkinsReloadFailed/index.groovy
+++ b/core/src/main/resources/hudson/util/JenkinsReloadFailed/index.groovy
@@ -1,6 +1,9 @@
import hudson.Functions
def l = namespace(lib.LayoutTagLib)
+def st = namespace("jelly:stapler")
+
+st.statusCode(value: 500)
l.layout {
l.header(title:"Jenkins")
diff --git a/core/src/main/resources/hudson/util/NoHomeDir/index.jelly b/core/src/main/resources/hudson/util/NoHomeDir/index.jelly
index a75b653e04..0476004a78 100644
--- a/core/src/main/resources/hudson/util/NoHomeDir/index.jelly
+++ b/core/src/main/resources/hudson/util/NoHomeDir/index.jelly
@@ -24,6 +24,7 @@ THE SOFTWARE.
+
diff --git a/core/src/main/resources/hudson/util/NoTempDir/index.jelly b/core/src/main/resources/hudson/util/NoTempDir/index.jelly
index c78d70f11c..f6b27dcef0 100644
--- a/core/src/main/resources/hudson/util/NoTempDir/index.jelly
+++ b/core/src/main/resources/hudson/util/NoTempDir/index.jelly
@@ -24,6 +24,7 @@ THE SOFTWARE.
+
diff --git a/core/src/main/resources/jenkins/install/SetupWizard/authenticate-security-token.jelly b/core/src/main/resources/jenkins/install/SetupWizard/authenticate-security-token.jelly
index e6c5fb75df..79893ea018 100644
--- a/core/src/main/resources/jenkins/install/SetupWizard/authenticate-security-token.jelly
+++ b/core/src/main/resources/jenkins/install/SetupWizard/authenticate-security-token.jelly
@@ -16,24 +16,19 @@
${%Unlock Jenkins}
- ${%To ensure Jenkins is securely set up by the administrator, a setup security token has been printed to the logs.}
-
-
- ${%Not sure where to find the logs?}
-
-
+ ${%jenkins.install.findSecurityTokenMessage(it.initialAdminPasswordFile)}
-
${%Please copy the token and paste it below.}
+
${%Please copy the password and paste it below.}
${%ERROR:}
- ${%There is a problem with the security token, please check the logs for the correct token}
+ ${%The password entered is incorrect, please check the file for the correct password}
-
+
-
+
diff --git a/core/src/main/resources/jenkins/install/SetupWizard/authenticate-security-token.properties b/core/src/main/resources/jenkins/install/SetupWizard/authenticate-security-token.properties
new file mode 100644
index 0000000000..01003193ab
--- /dev/null
+++ b/core/src/main/resources/jenkins/install/SetupWizard/authenticate-security-token.properties
@@ -0,0 +1,2 @@
+jenkins.install.findSecurityTokenMessage=To ensure Jenkins is securely set up by the administrator, \
+a password has been generated and written to the file on the Jenkins server here: {0}
diff --git a/core/src/main/resources/jenkins/install/UpgradeWizard/footer.jelly b/core/src/main/resources/jenkins/install/UpgradeWizard/footer.jelly
new file mode 100644
index 0000000000..2d06c5db91
--- /dev/null
+++ b/core/src/main/resources/jenkins/install/UpgradeWizard/footer.jelly
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+
+
diff --git a/core/src/main/resources/jenkins/install/UpgradeWizard/footer.properties b/core/src/main/resources/jenkins/install/UpgradeWizard/footer.properties
new file mode 100644
index 0000000000..105fce0c99
--- /dev/null
+++ b/core/src/main/resources/jenkins/install/UpgradeWizard/footer.properties
@@ -0,0 +1,3 @@
+msg.before=Welcome to Jenkins v2!\u0020
+msg.link=Click here to install the rest of v2 functionalities
+msg.after=\u0020and finish the upgrade process
\ No newline at end of file
diff --git a/core/src/main/resources/jenkins/install/pluginSetupWizard.properties b/core/src/main/resources/jenkins/install/pluginSetupWizard.properties
index 71130d75f3..6073936136 100644
--- a/core/src/main/resources/jenkins/install/pluginSetupWizard.properties
+++ b/core/src/main/resources/jenkins/install/pluginSetupWizard.properties
@@ -15,7 +15,7 @@ You may choose to continue by configuring a proxy or skipping plugin installatio
installWizard_error_header=An error occurred
installWizard_error_message=An error occurred during installation:
installWizard_error_connection=Unable to connect to Jenkins
-installWizard_installCustom_title=Plugin Selection
+installWizard_installCustom_title=Getting Started
installWizard_installCustom_selectAll=All
installWizard_installCustom_selectNone=None
installWizard_installCustom_selectRecommended=Recommended
@@ -24,9 +24,9 @@ installWizard_installCustom_dependenciesPrefix=Dependencies
installWizard_installCustom_pluginListDesc=Note that the full list of plugins is not shown here. Additional plugins can be installed in the Plugin Manager once the initial setup is complete. See the Wiki for more information.
installWizard_goBack=Back
installWizard_goInstall=Install
-installWizard_installing_title=Installing...
+installWizard_installing_title=Getting Started
installWizard_installing_detailsLink=Details...
-installWizard_installComplete_title=Installed
+installWizard_installComplete_title=Getting Started
installWizard_installComplete_banner=Jenkins is ready!
installWizard_pluginsInstalled_message=Your plugin installations are complete.
installWizard_installComplete_message=Your Jenkins setup is complete.
@@ -43,7 +43,7 @@ installWizard_firstUserSkippedMessage=
\
You've skipped creating an admin user. To log in, use the username: 'admin' and \
the security token you used to access the setup wizard.\
-installWizard_addFirstUser_title=Create an Admin User
+installWizard_addFirstUser_title=Getting Started
installWizard_configureProxy_label=Configure Proxy
installWizard_configureProxy_save=Save and Continue
installWizard_skipPluginInstallations=Skip Plugin Installations
diff --git a/core/src/main/resources/lib/form/select/select.js b/core/src/main/resources/lib/form/select/select.js
index 5d1262efb1..0f87d0bbf6 100644
--- a/core/src/main/resources/lib/form/select/select.js
+++ b/core/src/main/resources/lib/form/select/select.js
@@ -44,8 +44,7 @@ Behaviour.specify("SELECT.select", 'select', 1000, function(e) {
function hasChanged(selectEl, originalValue) {
// seems like a race condition allows this to fire before the 'selectEl' is defined. If that happens, exit..
-
- if(!selectEl || !selectEl.options || !selectEl.options[0])
+ if(!selectEl || !selectEl.options || !selectEl.options.length > 0)
return false;
var firstValue = selectEl.options[0].value;
var selectedValue = selectEl.value;
@@ -83,4 +82,4 @@ Behaviour.specify("SELECT.select", 'select', 1000, function(e) {
}
});
});
-});
+});
\ No newline at end of file
diff --git a/core/src/main/resources/lib/hudson/executors_sv_SE.properties b/core/src/main/resources/lib/hudson/executors_sv_SE.properties
index 28c939ae10..ff930c402c 100644
--- a/core/src/main/resources/lib/hudson/executors_sv_SE.properties
+++ b/core/src/main/resources/lib/hudson/executors_sv_SE.properties
@@ -24,6 +24,6 @@ Build\ Executor\ Status=Status f\u00F6r Byggare
Building=Bygger
Idle=V\u00E4ntande
Offline=Offline
-Unknown\ Task=\u00D6kand uppgift
+Unknown\ Task=Ok\u00E4nd uppgift
offline=ej tillg\u00E4nglig
terminate\ this\ build=avbryt detta bygge
diff --git a/core/src/main/resources/lib/hudson/queue_sv_SE.properties b/core/src/main/resources/lib/hudson/queue_sv_SE.properties
index ee4967d15d..55c9f582a4 100644
--- a/core/src/main/resources/lib/hudson/queue_sv_SE.properties
+++ b/core/src/main/resources/lib/hudson/queue_sv_SE.properties
@@ -23,7 +23,7 @@
Build\ Queue=Jobbk\u00F6{0,choice,0#|0< ({0,number})}
Jenkins\ is\ going\ to\ shut\ down.\ No\ further\ builds\ will\ be\ performed.=Jenkins h\u00E5ller p\u00E5 att avslutas. Inga nya byggen kommer att utf\u00F6ras.
No\ builds\ in\ the\ queue.=Inga k\u00F6ade byggen.
-Unknown\ Task=\u00D6kand uppgift
+Unknown\ Task=Ok\u00E4nd uppgift
WaitingFor=V\u00E4ntar p\u00E5 {0}
WaitingSince=V\u00E4ntar {0}
cancel=avbryt
diff --git a/core/src/main/resources/lib/layout/layout.jelly b/core/src/main/resources/lib/layout/layout.jelly
index 9375552614..3752fa10d1 100644
--- a/core/src/main/resources/lib/layout/layout.jelly
+++ b/core/src/main/resources/lib/layout/layout.jelly
@@ -38,7 +38,7 @@ THE SOFTWARE.
This is necessary for pages that include forms.
- specify a css class name to include in the top level of this layout dom.
+ A css class name to include in the body element.
specify path that starts from "/" for loading additional CSS stylesheet.
@@ -99,13 +99,7 @@ ${h.initPageVariables(context)}
-
-
-
-
+
@@ -174,7 +168,7 @@ ${h.initPageVariables(context)}
-
+
Skip to content
diff --git a/core/src/main/resources/windows-service/jenkins.exe.config b/core/src/main/resources/windows-service/jenkins.exe.config
index 1b2af154e3..b82788e9ac 100644
--- a/core/src/main/resources/windows-service/jenkins.exe.config
+++ b/core/src/main/resources/windows-service/jenkins.exe.config
@@ -1,6 +1,11 @@
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/core/src/test/java/hudson/model/FingerprintTest.java b/core/src/test/java/hudson/model/FingerprintTest.java
index fa77da0364..6f0d117847 100644
--- a/core/src/test/java/hudson/model/FingerprintTest.java
+++ b/core/src/test/java/hudson/model/FingerprintTest.java
@@ -27,6 +27,9 @@ import hudson.Util;
import hudson.model.Fingerprint.RangeSet;
import java.io.File;
import jenkins.model.FingerprintFacet;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.*;
import org.junit.Rule;
import org.junit.Test;
@@ -259,4 +262,274 @@ public class FingerprintTest {
}
}
+ @Test public void fromString() throws Exception {
+ //
+ // Single
+ //
+ // Numbers
+ assertThat(RangeSet.fromString("1", true).toString(), equalTo("[1,2)"));
+ assertThat(RangeSet.fromString("1", false).toString(), equalTo("[1,2)"));
+ assertThat(RangeSet.fromString("+1", true).toString(), equalTo("[1,2)"));
+ assertThat(RangeSet.fromString("+1", false).toString(), equalTo("[1,2)"));
+ // Zero
+ assertThat(RangeSet.fromString("0", true).toString(), equalTo("[0,1)"));
+ assertThat(RangeSet.fromString("0", false).toString(), equalTo("[0,1)"));
+ assertThat(RangeSet.fromString("+0", true).toString(), equalTo("[0,1)"));
+ assertThat(RangeSet.fromString("+0", false).toString(), equalTo("[0,1)"));
+ // Negative number
+ assertThat(RangeSet.fromString("-1", true).toString(), equalTo(""));
+ assertThat(expectIAE("-1", "Unable to parse '-1', expected string with a range M-N"), is(true));
+ // Exceeded int number
+ assertThat(RangeSet.fromString("2147483648", true).toString(), equalTo(""));
+ assertThat(expectIAE("2147483648", "Unable to parse '2147483648', expected number"), is(true));
+ // Invalid number
+ assertThat(RangeSet.fromString("1a", true).toString(), equalTo(""));
+ assertThat(expectIAE("1a", "Unable to parse '1a', expected number"), is(true));
+ assertThat(RangeSet.fromString("aa", true).toString(), equalTo(""));
+ assertThat(expectIAE("aa", "Unable to parse 'aa', expected number"), is(true));
+ //Empty
+ assertThat(RangeSet.fromString("", true).toString(), equalTo(""));
+ assertThat(RangeSet.fromString("", false).toString(), equalTo(""));
+ //Space
+ assertThat(RangeSet.fromString(" ", true).toString(), equalTo(""));
+ assertThat(expectIAE(" ", "Unable to parse ' ', expected number"), is(true));
+ // Comma
+ assertThat(RangeSet.fromString(",", true).toString(), equalTo(""));
+ assertThat(RangeSet.fromString(",", false).toString(), equalTo(""));
+ // Hyphen
+ assertThat(RangeSet.fromString("-", true).toString(), equalTo(""));
+ assertThat(expectIAE("-", "Unable to parse '-', expected string with a range M-N"), is(true));
+
+ //
+ // Multiple numbers
+ //
+ // Numbers
+ assertThat(RangeSet.fromString("1,2", true).toString(), equalTo("[1,2),[2,3)"));
+ assertThat(RangeSet.fromString("1,2", false).toString(), equalTo("[1,2),[2,3)"));
+ assertThat(RangeSet.fromString("1,+2,5", true).toString(), equalTo("[1,2),[2,3),[5,6)"));
+ assertThat(RangeSet.fromString("1,+2,5", false).toString(), equalTo("[1,2),[2,3),[5,6)"));
+ assertThat(RangeSet.fromString("1,1", true).toString(), equalTo("[1,2),[1,2)"));
+ assertThat(RangeSet.fromString("1,1", false).toString(), equalTo("[1,2),[1,2)"));
+ // Zero
+ assertThat(RangeSet.fromString("0,1,2", true).toString(), equalTo("[0,1),[1,2),[2,3)"));
+ assertThat(RangeSet.fromString("0,1,2", false).toString(), equalTo("[0,1),[1,2),[2,3)"));
+ assertThat(RangeSet.fromString("1,0,2", true).toString(), equalTo("[1,2),[0,1),[2,3)"));
+ assertThat(RangeSet.fromString("1,0,2", false).toString(), equalTo("[1,2),[0,1),[2,3)"));
+ assertThat(RangeSet.fromString("1,2,0", true).toString(), equalTo("[1,2),[2,3),[0,1)"));
+ assertThat(RangeSet.fromString("1,2,0", false).toString(), equalTo("[1,2),[2,3),[0,1)"));
+ // Negative number
+ assertThat(RangeSet.fromString("-1,2,3", true).toString(), equalTo("[2,3),[3,4)"));
+ assertThat(expectIAE("-1,2,3", "Unable to parse '-1,2,3', expected string with a range M-N"), is(true));
+ assertThat(RangeSet.fromString("1,-2,3", true).toString(), equalTo("[1,2),[3,4)"));
+ assertThat(expectIAE("1,-2,3", "Unable to parse '1,-2,3', expected string with a range M-N"), is(true));
+ assertThat(RangeSet.fromString("1,2,-3", true).toString(), equalTo("[1,2),[2,3)"));
+ assertThat(expectIAE("1,2,-3", "Unable to parse '1,2,-3', expected string with a range M-N"), is(true));
+ // Exceeded int number
+ assertThat(RangeSet.fromString("2147483648,2,3", true).toString(), equalTo("[2,3),[3,4)"));
+ assertThat(expectIAE("2147483648,1,2", "Unable to parse '2147483648,1,2', expected number"), is(true));
+ assertThat(RangeSet.fromString("1,2147483648,3", true).toString(), equalTo("[1,2),[3,4)"));
+ assertThat(expectIAE("1,2147483648,2", "Unable to parse '1,2147483648,2', expected number"), is(true));
+ assertThat(RangeSet.fromString("1,2,2147483648", true).toString(), equalTo("[1,2),[2,3)"));
+ assertThat(expectIAE("1,2,2147483648", "Unable to parse '1,2,2147483648', expected number"), is(true));
+ // Invalid number
+ assertThat(RangeSet.fromString("1a,2,3", true).toString(), equalTo("[2,3),[3,4)"));
+ assertThat(expectIAE("1a,1,2", "Unable to parse '1a,1,2', expected number"), is(true));
+ assertThat(RangeSet.fromString("1,2a,3", true).toString(), equalTo("[1,2),[3,4)"));
+ assertThat(expectIAE("1,2a,2", "Unable to parse '1,2a,2', expected number"), is(true));
+ assertThat(RangeSet.fromString("1,2,3a", true).toString(), equalTo("[1,2),[2,3)"));
+ assertThat(expectIAE("1,2,3a", "Unable to parse '1,2,3a', expected number"), is(true));
+ assertThat(RangeSet.fromString("aa,2,3", true).toString(), equalTo("[2,3),[3,4)"));
+ assertThat(expectIAE("aa,1,2", "Unable to parse 'aa,1,2', expected number"), is(true));
+ assertThat(RangeSet.fromString("1,aa,3", true).toString(), equalTo("[1,2),[3,4)"));
+ assertThat(expectIAE("1,aa,2", "Unable to parse '1,aa,2', expected number"), is(true));
+ assertThat(RangeSet.fromString("1,2,aa", true).toString(), equalTo("[1,2),[2,3)"));
+ assertThat(expectIAE("1,2,aa", "Unable to parse '1,2,aa', expected number"), is(true));
+ //Empty
+ assertThat(RangeSet.fromString(",1,2", true).toString(), equalTo(""));
+ assertThat(expectIAE(",1,2", "Unable to parse ',1,2', expected correct notation M,N or M-N"), is(true));
+ assertThat(RangeSet.fromString("1,,2", true).toString(), equalTo(""));
+ assertThat(expectIAE("1,,2", "Unable to parse '1,,2', expected correct notation M,N or M-N"), is(true));
+ assertThat(RangeSet.fromString("1,2,", true).toString(), equalTo(""));
+ assertThat(expectIAE("1,2,", "Unable to parse '1,2,', expected correct notation M,N or M-N"), is(true));
+ // Space
+ assertThat(RangeSet.fromString(" ,1,2", true).toString(), equalTo("[1,2),[2,3)"));
+ assertThat(expectIAE(" ,1,2", "Unable to parse ' ,1,2', expected number"), is(true));
+ assertThat(RangeSet.fromString("1, ,2", true).toString(), equalTo("[1,2),[2,3)"));
+ assertThat(expectIAE("1, ,2", "Unable to parse '1, ,2', expected number"), is(true));
+ assertThat(RangeSet.fromString("1,2, ", true).toString(), equalTo("[1,2),[2,3)"));
+ assertThat(expectIAE("1,2, ", "Unable to parse '1,2, ', expected number"), is(true));
+ // Comma
+ assertThat(RangeSet.fromString(",,1,2", true).toString(), equalTo(""));
+ assertThat(expectIAE(",,1,2", "Unable to parse ',,1,2', expected correct notation M,N or M-N"), is(true));
+ assertThat(RangeSet.fromString("1,,,2", true).toString(), equalTo(""));
+ assertThat(expectIAE("1,,,2", "Unable to parse '1,,,2', expected correct notation M,N or M-N"), is(true));
+ assertThat(RangeSet.fromString("1,2,,", true).toString(), equalTo(""));
+ assertThat(expectIAE("1,2,,", "Unable to parse '1,2,,', expected correct notation M,N or M-N"), is(true));
+ // Hyphen
+ assertThat(RangeSet.fromString("-,1,2", true).toString(), equalTo("[1,2),[2,3)"));
+ assertThat(expectIAE("-,1,2", "Unable to parse '-,1,2', expected string with a range M-N"), is(true));
+ assertThat(RangeSet.fromString("1,-,2", true).toString(), equalTo("[1,2),[2,3)"));
+ assertThat(expectIAE("1,-,2", "Unable to parse '1,-,2', expected string with a range M-N"), is(true));
+ assertThat(RangeSet.fromString("1,2,-", true).toString(), equalTo("[1,2),[2,3)"));
+ assertThat(expectIAE("1,2,-", "Unable to parse '1,2,-', expected string with a range M-N"), is(true));
+
+ //
+ // Single range
+ //
+ // Numbers
+ assertThat(RangeSet.fromString("1-2", true).toString(), equalTo("[1,3)"));
+ assertThat(RangeSet.fromString("1-2", false).toString(), equalTo("[1,3)"));
+ assertThat(RangeSet.fromString("+1-+2", true).toString(), equalTo("[1,3)"));
+ assertThat(RangeSet.fromString("+1-+2", false).toString(), equalTo("[1,3)"));
+ assertThat(RangeSet.fromString("1-1", true).toString(), equalTo("[1,2)"));
+ assertThat(RangeSet.fromString("1-1", false).toString(), equalTo("[1,2)"));
+ assertThat(RangeSet.fromString("+1-+1", true).toString(), equalTo("[1,2)"));
+ assertThat(RangeSet.fromString("+1-+1", false).toString(), equalTo("[1,2)"));
+ assertThat(RangeSet.fromString("1-4", true).toString(), equalTo("[1,5)"));
+ assertThat(RangeSet.fromString("1-4", false).toString(), equalTo("[1,5)"));
+ assertThat(RangeSet.fromString("+1-+4", true).toString(), equalTo("[1,5)"));
+ assertThat(RangeSet.fromString("+1-+4", false).toString(), equalTo("[1,5)"));
+ //Zero
+ assertThat(RangeSet.fromString("0-1", true).toString(), equalTo("[0,2)"));
+ assertThat(RangeSet.fromString("0-1", false).toString(), equalTo("[0,2)"));
+ assertThat(RangeSet.fromString("+0-+1", true).toString(), equalTo("[0,2)"));
+ assertThat(RangeSet.fromString("+0-+1", false).toString(), equalTo("[0,2)"));
+ assertThat(RangeSet.fromString("0-2", true).toString(), equalTo("[0,3)"));
+ assertThat(RangeSet.fromString("0-2", false).toString(), equalTo("[0,3)"));
+ assertThat(RangeSet.fromString("+0-+2", true).toString(), equalTo("[0,3)"));
+ assertThat(RangeSet.fromString("+0-+2", false).toString(), equalTo("[0,3)"));
+ assertThat(RangeSet.fromString("0--1", true).toString(), equalTo(""));
+ assertThat(expectIAE("0--1", "Unable to parse '0--1', expected correct notation M,N or M-N"), is(true));
+ assertThat(RangeSet.fromString("+0--1", true).toString(), equalTo(""));
+ assertThat(expectIAE("+0--1", "Unable to parse '+0--1', expected correct notation M,N or M-N"), is(true));
+ assertThat(RangeSet.fromString("0--2", true).toString(), equalTo(""));
+ assertThat(expectIAE("0--2", "Unable to parse '0--2', expected correct notation M,N or M-N"), is(true));
+ assertThat(RangeSet.fromString("+0--2", true).toString(), equalTo(""));
+ assertThat(expectIAE("+0--2", "Unable to parse '+0--2', expected correct notation M,N or M-N"), is(true));
+ assertThat(RangeSet.fromString("1-0", true).toString(), equalTo(""));
+ assertThat(expectIAE("1-0", "Unable to parse '1-0', expected string with a range M-N where M&here;", // add quotes
- "-Dfoo7=foo|bar\"baz", // add quotes and "" for "
- "-Dfoo8=% %QED% %comspec% %-%(%.%", // add quotes, and extra quotes for %Q and %c
- "-Dfoo9=%'''%%@%"); // no quotes as none of the % are followed by a letter
+ ArgumentListBuilder builder = new ArgumentListBuilder().
+ add("ant.bat").add("-Dfoo1=abc"). // nothing special, no quotes
+ add("-Dfoo2=foo bar").add("-Dfoo3=/u*r").add("-Dfoo4=/us?"). // add quotes
+ add("-Dfoo10=bar,baz").
+ add("-Dfoo5=foo;bar^baz").add("-Dfoo6=&here;"). // add quotes
+ add("-Dfoo7=foo|bar\"baz"). // add quotes and "" for "
+ add("-Dfoo8=% %QED% %comspec% %-%(%.%"). // add quotes, and extra quotes for %Q and %c
+ add("-Dfoo9=%'''%%@%"); // no quotes as none of the % are followed by a letter
// By default, does not escape %VAR%
assertThat(builder.toWindowsCommand().toCommandArray(), is(new String[] { "cmd.exe", "/C",
- "\"ant.bat -Dfoo1=abc \"-Dfoo2=foo bar\""
- + " \"-Dfoo3=/u*r\" \"-Dfoo4=/us?\" \"-Dfoo10=bar,baz\" \"-Dfoo5=foo;bar^baz\""
- + " \"-Dfoo6=&here;\" \"-Dfoo7=foo|bar\"\"baz\""
- + " \"-Dfoo8=% %QED% %comspec% %-%(%.%\""
- + " -Dfoo9=%'''%%@% && exit %%ERRORLEVEL%%\"" }));
+ "\"ant.bat", "-Dfoo1=abc", "\"-Dfoo2=foo bar\"", "\"-Dfoo3=/u*r\"", "\"-Dfoo4=/us?\"",
+ "\"-Dfoo10=bar,baz\"", "\"-Dfoo5=foo;bar^baz\"", "\"-Dfoo6=&here;\"",
+ "\"-Dfoo7=foo|bar\"\"baz\"", "\"-Dfoo8=% %QED% %comspec% %-%(%.%\"",
+ "-Dfoo9=%'''%%@%", "&&", "exit", "%%ERRORLEVEL%%\"" }));
// Pass flag to escape %VAR%
assertThat(builder.toWindowsCommand(true).toCommandArray(), is(new String[] { "cmd.exe", "/C",
- "\"ant.bat -Dfoo1=abc \"-Dfoo2=foo bar\""
- + " \"-Dfoo3=/u*r\" \"-Dfoo4=/us?\" \"-Dfoo10=bar,baz\" \"-Dfoo5=foo;bar^baz\""
- + " \"-Dfoo6=&here;\" \"-Dfoo7=foo|bar\"\"baz\""
- + " \"-Dfoo8=% %\"Q\"ED% %\"c\"omspec% %-%(%.%\""
- + " -Dfoo9=%'''%%@% && exit %%ERRORLEVEL%%\"" }));
+ "\"ant.bat", "-Dfoo1=abc", "\"-Dfoo2=foo bar\"", "\"-Dfoo3=/u*r\"", "\"-Dfoo4=/us?\"",
+ "\"-Dfoo10=bar,baz\"", "\"-Dfoo5=foo;bar^baz\"", "\"-Dfoo6=&here;\"",
+ "\"-Dfoo7=foo|bar\"\"baz\"", "\"-Dfoo8=% %\"Q\"ED% %\"c\"omspec% %-%(%.%\"",
+ "-Dfoo9=%'''%%@%", "&&", "exit", "%%ERRORLEVEL%%\"" }));
+ // Try to hide password
+ builder.add("-Dpassword=hidden", true);
+ // By default, does not escape %VAR%
+ assertThat(builder.toWindowsCommand().toString(), is("cmd.exe /C \"ant.bat -Dfoo1=abc \"\"-Dfoo2=foo bar\"\" \"-Dfoo3=/u*r\" \"-Dfoo4=/us?\" \"-Dfoo10=bar,baz\" \"-Dfoo5=foo;bar^baz\" \"-Dfoo6=&here;\" \"-Dfoo7=foo|bar\"\"baz\" \"\"-Dfoo8=% %QED% %comspec% %-%(%.%\"\" -Dfoo9=%'''%%@% ****** && exit %%ERRORLEVEL%%\"" ));
+ // Pass flag to escape %VAR%
+ assertThat(builder.toWindowsCommand(true).toString(), is("cmd.exe /C \"ant.bat -Dfoo1=abc \"\"-Dfoo2=foo bar\"\" \"-Dfoo3=/u*r\" \"-Dfoo4=/us?\" \"-Dfoo10=bar,baz\" \"-Dfoo5=foo;bar^baz\" \"-Dfoo6=&here;\" \"-Dfoo7=foo|bar\"\"baz\" \"\"-Dfoo8=% %\"Q\"ED% %\"c\"omspec% %-%(%.%\"\" -Dfoo9=%'''%%@% ****** && exit %%ERRORLEVEL%%\""));
+ }
+
+ @Test
+ @Ignore("It's only for reproduce JENKINS-28790 issue. It's added to testToWindowsCommand")
+ @Issue("JENKINS-28790")
+ public void testToWindowsCommandMasked() {
+ ArgumentListBuilder builder = new ArgumentListBuilder().
+ add("ant.bat").add("-Dfoo1=abc"). // nothing special, no quotes
+ add("-Dfoo2=foo bar").add("-Dfoo3=/u*r").add("-Dfoo4=/us?"). // add quotes
+ add("-Dfoo10=bar,baz").
+ add("-Dfoo5=foo;bar^baz").add("-Dfoo6=&here;"). // add quotes
+ add("-Dfoo7=foo|bar\"baz"). // add quotes and "" for "
+ add("-Dfoo8=% %QED% %comspec% %-%(%.%"). // add quotes, and extra quotes for %Q and %c
+ add("-Dfoo9=%'''%%@%"). // no quotes as none of the % are followed by a letter
+ add("-Dpassword=hidden", true);
+ // By default, does not escape %VAR%
+ assertThat(builder.toWindowsCommand().toString(), is("cmd.exe /C \"ant.bat -Dfoo1=abc \"\"-Dfoo2=foo bar\"\" \"-Dfoo3=/u*r\" \"-Dfoo4=/us?\" \"-Dfoo10=bar,baz\" \"-Dfoo5=foo;bar^baz\" \"-Dfoo6=&here;\" \"-Dfoo7=foo|bar\"\"baz\" \"\"-Dfoo8=% %QED% %comspec% %-%(%.%\"\" -Dfoo9=%'''%%@% ****** && exit %%ERRORLEVEL%%\"" ));
+ // Pass flag to escape %VAR%
+ assertThat(builder.toWindowsCommand(true).toString(), is("cmd.exe /C \"ant.bat -Dfoo1=abc \"\"-Dfoo2=foo bar\"\" \"-Dfoo3=/u*r\" \"-Dfoo4=/us?\" \"-Dfoo10=bar,baz\" \"-Dfoo5=foo;bar^baz\" \"-Dfoo6=&here;\" \"-Dfoo7=foo|bar\"\"baz\" \"\"-Dfoo8=% %\"Q\"ED% %\"c\"omspec% %-%(%.%\"\" -Dfoo9=%'''%%@% ****** && exit %%ERRORLEVEL%%\""));
}
@Test
diff --git a/core/src/test/java/hudson/util/XStream2Test.java b/core/src/test/java/hudson/util/XStream2Test.java
index ed29c8c8f2..aeb781f672 100644
--- a/core/src/test/java/hudson/util/XStream2Test.java
+++ b/core/src/test/java/hudson/util/XStream2Test.java
@@ -272,37 +272,6 @@ public class XStream2Test {
ConcurrentHashMap m = new ConcurrentHashMap();
}
- /**
- * Tests that ConcurrentHashMap is serialized into a more compact format,
- * but still can deserialize to older, verbose format.
- */
- @Test
- public void concurrentHashMapSerialization() throws Exception {
- Foo2 foo = new Foo2();
- foo.m.put("abc","def");
- foo.m.put("ghi","jkl");
- File v = File.createTempFile("hashmap", "xml");
- try {
- new XmlFile(v).write(foo);
-
- // should serialize like map
- String xml = FileUtils.readFileToString(v);
- assertFalse(xml.contains("java.util.concurrent"));
- //System.out.println(xml);
- Foo2 deserialized = (Foo2) new XStream2().fromXML(xml);
- assertEquals(2,deserialized.m.size());
- assertEquals("def", deserialized.m.get("abc"));
- assertEquals("jkl", deserialized.m.get("ghi"));
- } finally {
- v.delete();
- }
-
- // should be able to read in old data just fine
- Foo2 map = (Foo2) new XStream2().fromXML(getClass().getResourceAsStream("old-concurrentHashMap.xml"));
- assertEquals(1,map.m.size());
- assertEquals("def",map.m.get("abc"));
- }
-
@Issue("SECURITY-105")
@Test
public void dynamicProxyBlocked() {
diff --git a/core/src/test/java/jenkins/util/JenkinsJVMTest.java b/core/src/test/java/jenkins/util/JenkinsJVMTest.java
new file mode 100644
index 0000000000..8921deb661
--- /dev/null
+++ b/core/src/test/java/jenkins/util/JenkinsJVMTest.java
@@ -0,0 +1,36 @@
+package jenkins.util;
+
+import org.junit.Test;
+
+public class JenkinsJVMTest {
+
+ @Test
+ public void checkNotJenkinsJVM_WhenNotInAJenkinsJVM() {
+ JenkinsJVM.checkNotJenkinsJVM();
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void checkJenkinsJVM_WhenNotInAJenkinsJVM() {
+ JenkinsJVM.checkJenkinsJVM();
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void checkNotJenkinsJVM_WhenInAJenkinsJVM() {
+ JenkinsJVM.setJenkinsJVM(true);
+ try {
+ JenkinsJVM.checkNotJenkinsJVM();
+ } finally {
+ JenkinsJVM.setJenkinsJVM(false);
+ }
+ }
+
+ @Test
+ public void checkJenkinsJVM_WhenInAJenkinsJVM() {
+ JenkinsJVM.setJenkinsJVM(true);
+ try {
+ JenkinsJVM.checkJenkinsJVM();
+ } finally {
+ JenkinsJVM.setJenkinsJVM(false);
+ }
+ }
+}
diff --git a/core/src/test/resources/hudson/util/old-concurrentHashMap.xml b/core/src/test/resources/hudson/util/old-concurrentHashMap.xml
deleted file mode 100644
index 14b7ef152c..0000000000
--- a/core/src/test/resources/hudson/util/old-concurrentHashMap.xml
+++ /dev/null
@@ -1,225 +0,0 @@
-
-
-
-
-
- 15
- 28
-
-
-
-
-
- 0
-
-
-
-
-
-
- 0.75
-
-
-
-
-
- 0
-
-
-
-
-
-
- 0.75
-
-
-
-
-
- 0
-
-
-
-
-
-
- 0.75
-
-
-
-
-
- 0
-
-
-
-
-
-
- 0.75
-
-
-
-
-
- 0
-
-
-
-
-
-
- 0.75
-
-
-
-
-
- 0
-
-
-
-
-
-
- 0.75
-
-
-
-
-
- 0
-
-
-
-
-
-
- 0.75
-
-
-
-
-
- 0
-
-
-
-
-
-
- 0.75
-
-
-
-
-
- 0
-
-
-
-
-
-
- 0.75
-
-
-
-
-
- 0
-
-
-
-
-
-
- 0.75
-
-
-
-
-
- 0
-
-
-
-
-
-
- 0.75
-
-
-
-
-
- 0
-
-
-
-
-
-
- 0.75
-
-
-
-
-
- 0
-
-
-
-
-
-
- 0.75
-
-
-
-
-
- 0
-
-
-
-
-
-
- 0.75
-
-
-
-
-
- 0
-
-
-
-
-
-
- 0.75
-
-
-
-
-
- 0
-
-
-
-
-
-
- 0.75
-
-
-
- abc
- def
-
-
-
-
-
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 8360d6f16d..445366c191 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@ THE SOFTWARE.
org.jenkins-ci.mainpom
- 2.0-alpha-4-SNAPSHOT
+ 2.0-alpha-5-SNAPSHOTpomJenkins main module
@@ -58,7 +58,7 @@ THE SOFTWARE.
scm:git:git://github.com/jenkinsci/jenkins.gitscm:git:ssh://git@github.com/jenkinsci/jenkins.githttps://github.com/jenkinsci/jenkins
- jenkins-1.652
+ HEAD
@@ -179,7 +179,7 @@ THE SOFTWARE.
org.jenkins-ci.mainremoting
- 2.53.3
+ 2.56
diff --git a/test/pom.xml b/test/pom.xml
index 5e8a4129c5..62f5da9612 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
org.jenkins-ci.mainpom
- 2.0-alpha-4-SNAPSHOT
+ 2.0-alpha-5-SNAPSHOTtest
diff --git a/test/src/test/java/hudson/cli/ClearQueueCommandTest.java b/test/src/test/java/hudson/cli/ClearQueueCommandTest.java
new file mode 100644
index 0000000000..20eb1b2a4e
--- /dev/null
+++ b/test/src/test/java/hudson/cli/ClearQueueCommandTest.java
@@ -0,0 +1,94 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2016 Red Hat, 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.
+ */
+
+/**
+ * @author pjanouse
+ */
+
+package hudson.cli;
+
+import hudson.model.FreeStyleProject;
+import hudson.model.labels.LabelAtom;
+import jenkins.model.Jenkins;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.jvnet.hudson.test.JenkinsRule;
+
+import static hudson.cli.CLICommandInvoker.Matcher.failedWith;
+import static hudson.cli.CLICommandInvoker.Matcher.hasNoStandardOutput;
+import static hudson.cli.CLICommandInvoker.Matcher.succeededSilently;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+
+public class ClearQueueCommandTest {
+
+ private CLICommandInvoker command;
+
+ @Rule
+ public final JenkinsRule j = new JenkinsRule();
+
+ @Before
+ public void setUp() {
+ command = new CLICommandInvoker(j, "clear-queue");
+ }
+
+ @Test public void clearQueueShouldFailWithoutAdministerPermission() throws Exception {
+ final CLICommandInvoker.Result result = command
+ .authorizedTo(Jenkins.READ).invoke();
+
+ assertThat(result, failedWith(6));
+ assertThat(result, hasNoStandardOutput());
+ assertThat(result.stderr(), containsString("user is missing the Overall/Administer permission"));
+ }
+
+ @Test
+ public void clearQueueShouldSucceedOnEmptyQueue() throws Exception {
+ assertThat(j.jenkins.getQueue().isEmpty(), equalTo(true));
+
+ final CLICommandInvoker.Result result = command
+ .authorizedTo(Jenkins.READ, Jenkins.ADMINISTER).invoke();
+
+ assertThat(result, succeededSilently());
+ assertThat(j.jenkins.getQueue().isEmpty(), equalTo(true));
+ }
+
+ @Test
+ public void clearQueueShouldSucceed() throws Exception {
+ assertThat(j.jenkins.getQueue().isEmpty(), equalTo(true));
+
+ FreeStyleProject project = j.createFreeStyleProject("aProject");
+ project.setAssignedLabel(new LabelAtom("never_created"));
+ project.scheduleBuild2(0);
+
+ assertThat(j.jenkins.getQueue().isEmpty(), equalTo(false));
+
+ final CLICommandInvoker.Result result = command
+ .authorizedTo(Jenkins.READ, Jenkins.ADMINISTER).invoke();
+
+ assertThat(result, succeededSilently());
+ assertThat(j.jenkins.getQueue().isEmpty(), equalTo(true));
+ }
+}
diff --git a/test/src/test/java/hudson/cli/ConsoleCommandTest.java b/test/src/test/java/hudson/cli/ConsoleCommandTest.java
new file mode 100644
index 0000000000..f48f0fe1ed
--- /dev/null
+++ b/test/src/test/java/hudson/cli/ConsoleCommandTest.java
@@ -0,0 +1,306 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2016 Red Hat, 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.cli;
+
+import hudson.model.FreeStyleProject;
+import hudson.model.Item;
+import hudson.model.Job;
+import hudson.model.Result;
+import hudson.model.Run;
+import hudson.model.labels.LabelAtom;
+import hudson.tasks.Shell;
+import jenkins.model.Jenkins;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.jvnet.hudson.test.JenkinsRule;
+
+import java.io.IOException;
+
+import static hudson.cli.CLICommandInvoker.Matcher.failedWith;
+import static hudson.cli.CLICommandInvoker.Matcher.hasNoStandardOutput;
+import static hudson.cli.CLICommandInvoker.Matcher.succeeded;
+import static hudson.cli.CLICommandInvoker.Matcher.succeededSilently;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+import static org.junit.Assert.fail;
+
+/**
+ * Tests for CLI command {@link hudson.cli.ConsoleCommand console}
+ *
+ * @author pjanouse
+ */
+public class ConsoleCommandTest {
+
+ private CLICommandInvoker command;
+
+ @Rule public final JenkinsRule j = new JenkinsRule();
+
+ @Before public void setUp() {
+
+ command = new CLICommandInvoker(j, "console");
+ }
+
+ @Test public void consoleShouldFailWithoutJobReadPermission() throws Exception {
+
+ j.createFreeStyleProject("aProject");
+
+ final CLICommandInvoker.Result result = command
+ .authorizedTo(Jenkins.READ)
+ .invokeWithArgs("aProject");
+
+ assertThat(result, failedWith(3));
+ assertThat(result, hasNoStandardOutput());
+ assertThat(result.stderr(), containsString("ERROR: No such job 'aProject'"));
+ }
+
+ @Test public void consoleShouldFailWithoutItemBuildPermission() throws Exception {
+
+ j.createFreeStyleProject("aProject");
+
+ final CLICommandInvoker.Result result = command
+ .authorizedTo(Jenkins.READ, Job.READ)
+ .invokeWithArgs("aProject");
+
+ assertThat(result, failedWith(6));
+ assertThat(result, hasNoStandardOutput());
+ assertThat(result.stderr(), containsString("ERROR: user is missing the Job/Build permission"));
+ }
+
+ @Test public void consoleShouldFailWhenProjectDoesNotExist() throws Exception {
+
+ final CLICommandInvoker.Result result = command
+ .authorizedTo(Jenkins.READ, Job.READ, Item.BUILD)
+ .invokeWithArgs("never_created");
+
+ assertThat(result, failedWith(3));
+ assertThat(result, hasNoStandardOutput());
+ assertThat(result.stderr(), containsString("ERROR: No such job 'never_created'"));
+ }
+
+ @Test public void consoleShouldFailWhenLastBuildDoesNotdExist() throws Exception {
+
+ j.createFreeStyleProject("aProject");
+
+ final CLICommandInvoker.Result result = command
+ .authorizedTo(Jenkins.READ, Job.READ, Item.BUILD)
+ .invokeWithArgs("aProject");
+
+ assertThat(result, failedWith(4));
+ assertThat(result, hasNoStandardOutput());
+ assertThat(result.stderr(), containsString("ERROR: Permalink lastBuild produced no build"));
+ }
+
+ @Test public void consoleShouldFailWhenRequestedBuildDoesNotExist() throws Exception {
+
+ j.createFreeStyleProject("aProject");
+
+ final CLICommandInvoker.Result result = command
+ .authorizedTo(Jenkins.READ, Job.READ, Item.BUILD)
+ .invokeWithArgs("aProject", "1");
+
+ assertThat(result, failedWith(3));
+ assertThat(result, hasNoStandardOutput());
+ assertThat(result.stderr(), containsString("ERROR: No such build #1"));
+ }
+
+ @Test public void consoleShouldFailWhenRequestedInvalidBuildNumber() throws Exception {
+
+ FreeStyleProject project = j.createFreeStyleProject("aProject");
+
+ CLICommandInvoker.Result result = command
+ .authorizedTo(Jenkins.READ, Job.READ, Item.BUILD)
+ .invokeWithArgs("aProject", "1a");
+
+ assertThat(result, failedWith(3));
+ assertThat(result, hasNoStandardOutput());
+ assertThat(result.stderr(), containsString("ERROR: Not sure what you meant by \"1a\""));
+
+ project.getBuildersList().add(new Shell("echo 1"));
+ project.scheduleBuild2(0).get();
+
+ result = command
+ .authorizedTo(Jenkins.READ, Job.READ, Item.BUILD)
+ .invokeWithArgs("aProject", "1a");
+
+ assertThat(result, failedWith(3));
+ assertThat(result, hasNoStandardOutput());
+ assertThat(result.stderr(), containsString("ERROR: Not sure what you meant by \"1a\". Did you mean \"lastBuild\"?"));
+ }
+
+ @Test public void consoleShouldSuccessWithLastBuild() throws Exception {
+
+ FreeStyleProject project = j.createFreeStyleProject("aProject");
+ project.getBuildersList().add(new Shell("echo 1"));
+ assertThat(project.scheduleBuild2(0).get().getLog(), containsString("echo 1"));
+
+ final CLICommandInvoker.Result result = command
+ .authorizedTo(Jenkins.READ, Job.READ, Item.BUILD)
+ .invokeWithArgs("aProject");
+
+ assertThat(result, succeeded());
+ assertThat(result.stdout(), containsString("echo 1"));
+ }
+
+ @Test public void consoleShouldSuccessWithSpecifiedBuildNumber() throws Exception {
+
+ FreeStyleProject project = j.createFreeStyleProject("aProject");
+ project.getBuildersList().add(new Shell("echo ${BUILD_NUMBER}"));
+ assertThat(project.scheduleBuild2(0).get().getLog(), containsString("echo 1"));
+ assertThat(project.scheduleBuild2(0).get().getLog(), containsString("echo 2"));
+ assertThat(project.scheduleBuild2(0).get().getLog(), containsString("echo 3"));
+
+ final CLICommandInvoker.Result result = command
+ .authorizedTo(Jenkins.READ, Job.READ, Item.BUILD)
+ .invokeWithArgs("aProject", "2");
+
+ assertThat(result, succeeded());
+ assertThat(result.stdout(), containsString("echo 2"));
+ }
+
+ @Test public void consoleShouldSuccessWithFollow() throws Exception {
+
+ FreeStyleProject project = j.createFreeStyleProject("aProject");
+ project.getBuildersList().add(new Shell("echo start - ${BUILD_NUMBER}\nsleep 10s\n"
+ + "echo after sleep - ${BUILD_NUMBER}"));
+ if (!project.scheduleBuild(0)) {
+ fail("Job wasn't scheduled properly");
+ }
+
+ // Wait until project is started (at least 1s)
+ while(!project.isBuilding()) {
+ System.out.println("Waiting for build to start and sleep 1s...");
+ Thread.sleep(1000);
+ }
+
+ // Wait for the first message
+ if(!project.getBuildByNumber(1).getLog().contains("start - 1")) {
+ Thread.sleep(1000);
+ }
+
+ assertThat(project.getBuildByNumber(1).getLog(), containsString("start - 1"));
+ assertThat(project.getBuildByNumber(1).getLog(), not(containsString("after sleep - 1")));
+
+ CLICommandInvoker.Result result = command
+ .authorizedTo(Jenkins.READ, Job.READ, Item.BUILD)
+ .invokeWithArgs("aProject", "1");
+
+ assertThat(result, succeeded());
+ assertThat(result.stdout(), containsString("start - 1"));
+ assertThat(result.stdout(), not(containsString("after sleep - 1")));
+
+ result = command
+ .authorizedTo(Jenkins.READ, Job.READ, Item.BUILD)
+ .invokeWithArgs("aProject", "1", "-f");
+
+ assertThat(result, succeeded());
+ assertThat(result.stdout(), containsString("after sleep - 1"));
+
+ assertThat(project.getBuildByNumber(1).isBuilding(), equalTo(false));
+ assertThat(project.getBuildByNumber(1).getResult(), equalTo(Result.SUCCESS));
+ assertThat(project.getBuildByNumber(1).getLog(), containsString("after sleep - 1"));
+ }
+
+ @Test public void consoleShouldSuccessWithLastNLines() throws Exception {
+
+ FreeStyleProject project = j.createFreeStyleProject("aProject");
+ project.getBuildersList().add(new Shell("echo 1\necho 2\necho 3\necho 4\necho 5"));
+ project.scheduleBuild2(0).get();
+ assertThat(project.getBuildByNumber(1).getLog(), containsString("echo 1"));
+ assertThat(project.getBuildByNumber(1).getLog(), containsString("echo 5"));
+
+ final CLICommandInvoker.Result result = command
+ .authorizedTo(Jenkins.READ, Job.READ, Item.BUILD)
+ .invokeWithArgs("aProject", "1", "-n", "4");
+
+ assertThat(result, succeeded());
+ assertThat(result.stdout(), not(containsString("echo 1")));
+ assertThat(result.stdout(), containsString("echo 5"));
+ }
+
+ @Test public void consoleShouldSuccessWithLastNLinesAndFollow() throws Exception {
+
+ FreeStyleProject project = j.createFreeStyleProject("aProject");
+ project.getBuildersList().add(new Shell("echo 1\necho 2\necho 3\necho 4\necho 5\n"
+ + "sleep 10s\n"
+ + "echo 6\necho 7\necho 8\necho 9"));
+
+ if (!project.scheduleBuild(0)) {
+ fail("Job wasn't scheduled properly");
+ }
+
+ // Wait until project is started (at least 1s)
+ while(!project.isBuilding()) {
+ System.out.println("Waiting for build to start and sleep 1s...");
+ Thread.sleep(1000);
+ }
+
+ // Wait for the first sleep
+ if(!project.getBuildByNumber(1).getLog().contains("echo 5")) {
+ Thread.sleep(1000);
+ }
+
+ assertThat(project.getBuildByNumber(1).getLog(), containsString("echo 5"));
+ assertThat(project.getBuildByNumber(1).getLog(), not(containsString("echo 6")));
+
+ CLICommandInvoker.Result result = command
+ .authorizedTo(Jenkins.READ, Job.READ, Item.BUILD)
+ .invokeWithArgs("aProject", "1", "-f", "-n", "4");
+
+ assertThat(result, succeeded());
+ assertThat(result.stdout(), not(containsString("echo 1")));
+ assertThat(result.stdout(), containsString("echo 5"));
+ assertThat(result.stdout(), containsString("echo 6"));
+ assertThat(result.stdout(), containsString("echo 9"));
+
+ assertThat(project.getBuildByNumber(1).isBuilding(), equalTo(false));
+ assertThat(project.getBuildByNumber(1).getResult(), equalTo(Result.SUCCESS));
+ assertThat(project.getBuildByNumber(1).getLog(), containsString("echo 9"));
+ }
+
+ @Test public void consoleShouldFailIfTheBuildIsStuckInTheQueue() throws Exception {
+
+ FreeStyleProject project = j.createFreeStyleProject("aProject");
+ project.getBuildersList().add(new Shell("echo 1\nsleep 10s"));
+ project.setAssignedLabel(new LabelAtom("never_created"));
+
+ assertThat("Job wasn't scheduled properly", project.scheduleBuild(0), equalTo(true));
+ Thread.sleep(1000);
+ assertThat("Job wasn't scheduled properly - it isn't in the queue", project.isInQueue(), equalTo(true));
+ assertThat("Job wasn't scheduled properly - it is running on non-exist node", project.isBuilding(), equalTo(false));
+
+ final CLICommandInvoker.Result result = command
+ .authorizedTo(Jenkins.READ, Job.READ, Item.BUILD)
+ .invokeWithArgs("aProject", "1");
+
+ assertThat(result, failedWith(3));
+ assertThat(result, hasNoStandardOutput());
+ assertThat(result.stderr(), containsString("ERROR: No such build #1"));
+ }
+
+}
diff --git a/test/src/test/java/hudson/model/QueueTest.java b/test/src/test/java/hudson/model/QueueTest.java
index 2a91020de2..713bc9d127 100644
--- a/test/src/test/java/hudson/model/QueueTest.java
+++ b/test/src/test/java/hudson/model/QueueTest.java
@@ -305,6 +305,7 @@ public class QueueTest {
}
}
+ @Issue("JENKINS-33467")
@Test public void foldableCauseAction() throws Exception {
final OneShotEvent buildStarted = new OneShotEvent();
final OneShotEvent buildShouldComplete = new OneShotEvent();
@@ -348,14 +349,13 @@ public class QueueTest {
StringBuilder causes = new StringBuilder();
for (Cause c : ca.getCauses()) causes.append(c.getShortDescription() + "\n");
assertEquals("Build causes should have all items, even duplicates",
- "Started by user SYSTEM\nStarted by an SCM change\n"
- + "Started by user SYSTEM\nStarted by timer\n"
+ "Started by user SYSTEM\nStarted by user SYSTEM\n"
+ + "Started by an SCM change\nStarted by an SCM change\nStarted by an SCM change\n"
+ + "Started by timer\nStarted by timer\n"
+ + "Started by remote host 1.2.3.4 with note: test\n"
+ "Started by remote host 1.2.3.4 with note: test\n"
+ "Started by remote host 4.3.2.1 with note: test\n"
- + "Started by an SCM change\n"
- + "Started by remote host 1.2.3.4 with note: test\n"
- + "Started by remote host 1.2.3.4 with note: foo\n"
- + "Started by an SCM change\nStarted by timer\n",
+ + "Started by remote host 1.2.3.4 with note: foo\n",
causes.toString());
// View for build should group duplicates
@@ -369,6 +369,7 @@ public class QueueTest {
+ "Started by remote host 1.2.3.4 with note: test (2 times) "
+ "Started by remote host 4.3.2.1 with note: test "
+ "Started by remote host 1.2.3.4 with note: foo"));
+ System.out.println(new XmlFile(new File(build.getRootDir(), "build.xml")).asString());
}
@Issue("JENKINS-8790")
diff --git a/test/src/test/java/hudson/util/BootFailureTest.java b/test/src/test/java/hudson/util/BootFailureTest.java
index 5ab16ed0c9..aeaf88e7d0 100644
--- a/test/src/test/java/hudson/util/BootFailureTest.java
+++ b/test/src/test/java/hudson/util/BootFailureTest.java
@@ -74,7 +74,7 @@ public class BootFailureTest {
@After
public void tearDown() {
- Jenkins j = Jenkins.getInstance();
+ Jenkins j = Jenkins.getInstanceOrNull();
if (j != null) {
j.cleanUp();
}
diff --git a/test/src/test/java/jenkins/install/UpgradeWizardTest.java b/test/src/test/java/jenkins/install/UpgradeWizardTest.java
new file mode 100644
index 0000000000..427f64bf1a
--- /dev/null
+++ b/test/src/test/java/jenkins/install/UpgradeWizardTest.java
@@ -0,0 +1,86 @@
+package jenkins.install;
+
+import hudson.util.VersionNumber;
+import org.apache.commons.io.FileUtils;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.jvnet.hudson.test.JenkinsRule;
+
+import javax.inject.Inject;
+
+import java.io.IOException;
+
+import static org.junit.Assert.*;
+
+/**
+ * @author Kohsuke Kawaguchi
+ */
+public class UpgradeWizardTest {
+ @Rule
+ public final JenkinsRule j = new JenkinsRule();
+
+ @Inject
+ UpgradeWizard uw;
+
+ @Before
+ public void setup() {
+ j.jenkins.getInjector().injectMembers(this);
+ }
+
+ @Test
+ public void snooze() throws Exception {
+ assertTrue(uw.isDue());
+ uw.doSnooze();
+ assertFalse(uw.isDue());
+ }
+
+ /**
+ * If not upgraded, the upgrade should cause some side effect.
+ */
+ @Test
+ public void upgrade() throws Exception {
+ assertTrue(j.jenkins.getUpdateCenter().getJobs().size() == 0);
+ assertTrue(newInstance().isDue());
+ assertNotSame(UpgradeWizard.NOOP, uw.doUpgrade());
+
+ // can't really test this because UC metadata is empty
+ // assertTrue(j.jenkins.getUpdateCenter().getJobs().size() > 0);
+ }
+
+ /**
+ * If already upgraded, don't show anything
+ */
+ @Test
+ public void fullyUpgraded() throws Exception {
+ FileUtils.writeStringToFile(uw.getStateFile(), "2.0");
+ assertFalse(newInstance().isDue());
+ assertSame(UpgradeWizard.NOOP, uw.doUpgrade());
+ }
+
+ /**
+ * If downgraded from future version, don't prompt upgrade wizard.
+ */
+ @Test
+ public void downgradeFromFuture() throws Exception {
+ FileUtils.writeStringToFile(uw.getStateFile(), "3.0");
+ assertFalse(newInstance().isDue());
+ assertSame(UpgradeWizard.NOOP, uw.doUpgrade());
+ }
+
+ @Test
+ public void freshInstallation() throws Exception {
+ assertTrue(uw.isDue());
+ uw.setCurrentLevel(new VersionNumber("2.0"));
+ assertFalse(uw.isDue());
+ }
+
+ /**
+ * Fresh instance of {@link UpgradeWizard} to test its behavior.
+ */
+ private UpgradeWizard newInstance() throws IOException {
+ UpgradeWizard uw2 = new UpgradeWizard();
+ j.jenkins.getInjector().injectMembers(uw2);
+ return uw2;
+ }
+}
diff --git a/test/src/test/java/jenkins/util/JenkinsJVMRealTest.java b/test/src/test/java/jenkins/util/JenkinsJVMRealTest.java
new file mode 100644
index 0000000000..bdce8a15e3
--- /dev/null
+++ b/test/src/test/java/jenkins/util/JenkinsJVMRealTest.java
@@ -0,0 +1,34 @@
+package jenkins.util;
+
+import hudson.slaves.DumbSlave;
+import java.io.IOException;
+import jenkins.security.MasterToSlaveCallable;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.jvnet.hudson.test.JenkinsRule;
+
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
+public class JenkinsJVMRealTest {
+
+ @ClassRule
+ public static JenkinsRule j = new JenkinsRule();
+
+ @Test
+ public void isJenkinsJVM() throws Exception {
+ assertThat(new IsJenkinsJVM().call(), is(true));
+ DumbSlave slave = j.createOnlineSlave();
+ assertThat(slave.getChannel().call(new IsJenkinsJVM()), is(false));
+ }
+
+ public static class IsJenkinsJVM extends MasterToSlaveCallable {
+
+ @Override
+ public Boolean call() throws IOException {
+ return JenkinsJVM.isJenkinsJVM();
+ }
+ }
+
+}
diff --git a/war/gulpfile.js b/war/gulpfile.js
index cd1f43067a..e335e11d60 100644
--- a/war/gulpfile.js
+++ b/war/gulpfile.js
@@ -28,5 +28,14 @@ builder.bundle('src/main/js/pluginSetupWizard.js')
//
builder.bundle('src/main/js/config-tabbar.js')
.withExternalModuleMapping('jquery-detached', 'core-assets/jquery-detached:jquery2')
- .less('src/main/js/widgets/jenkins-widgets.less')
+ .less('src/main/js/config-tabbar.less')
+ .inDir('src/main/webapp/jsbundles');
+
+//
+// Bundle the Config Scrollspy.
+// See https://github.com/jenkinsci/js-builder#bundling
+//
+builder.bundle('src/main/js/config-scrollspy.js')
+ .withExternalModuleMapping('jquery-detached', 'core-assets/jquery-detached:jquery2')
+ .less('src/main/js/config-scrollspy.less')
.inDir('src/main/webapp/jsbundles');
diff --git a/war/pom.xml b/war/pom.xml
index ec6106eb86..82d1fa87d7 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
org.jenkins-ci.mainpom
- 2.0-alpha-4-SNAPSHOT
+ 2.0-alpha-5-SNAPSHOTjenkins-war
diff --git a/war/src/main/js/api/plugins.js b/war/src/main/js/api/plugins.js
index c64235d867..1e09b0e570 100644
--- a/war/src/main/js/api/plugins.js
+++ b/war/src/main/js/api/plugins.js
@@ -10,7 +10,6 @@
exports.recommendedPlugins = [
"ant",
"antisamy-markup-formatter",
- "build-monitor-plugin",
"build-timeout",
"cloudbees-folder",
"credentials-binding",
@@ -19,7 +18,7 @@ exports.recommendedPlugins = [
"gradle",
"ldap",
"mailer",
- // "matrix-auth",
+ "matrix-auth",
"pam-auth",
"pipeline-stage-view",
"ssh-slaves",
@@ -38,8 +37,7 @@ exports.availablePlugins = [
{
"category":"Organization and Administration",
"plugins": [
- // { "name": "dashboard-view" },
- { "name": "build-monitor-plugin" },
+ { "name": "dashboard-view" },
{ "name": "cloudbees-folder" },
{ "name": "antisamy-markup-formatter" }
]
@@ -49,15 +47,15 @@ exports.availablePlugins = [
"description":"Add general purpose features to your jobs",
"plugins": [
{ "name": "ansicolor" },
- // { "name": "build-name-setter" },
+ { "name": "build-name-setter" },
{ "name": "build-timeout" },
{ "name": "config-file-provider" },
{ "name": "credentials-binding" },
{ "name": "rebuild" },
{ "name": "ssh-agent" },
- // { "name": "throttle-concurrents" },
- { "name": "timestamper" }
- // { "name": "ws-cleanup" }
+ { "name": "throttle-concurrents" },
+ { "name": "timestamper" },
+ { "name": "ws-cleanup" }
]
},
{
@@ -72,12 +70,12 @@ exports.availablePlugins = [
{
"category":"Build Analysis and Reporting",
"plugins": [
- // { "name": "checkstyle" },
- // { "name": "cobertura" },
+ { "name": "checkstyle" },
+ { "name": "cobertura" },
{ "name": "htmlpublisher" },
{ "name": "junit" },
- // { "name": "sonar" },
- // { "name": "warnings" },
+ { "name": "sonar" },
+ { "name": "warnings" },
{ "name": "xunit" }
]
},
@@ -88,8 +86,8 @@ exports.availablePlugins = [
{ "name": "github-organization-folder" },
{ "name": "pipeline-stage-view" },
{ "name": "build-pipeline-plugin" },
- // { "name": "conditional-buildstep" },
- // { "name": "jenkins-multijob-plugin" },
+ { "name": "conditional-buildstep" },
+ { "name": "jenkins-multijob-plugin" },
{ "name": "parameterized-trigger" },
{ "name": "copyartifact" }
]
@@ -122,10 +120,10 @@ exports.availablePlugins = [
{
"category":"User Management and Security",
"plugins": [
- // { "name": "matrix-auth" },
+ { "name": "matrix-auth" },
{ "name": "pam-auth" },
{ "name": "ldap" },
- // { "name": "role-strategy" },
+ { "name": "role-strategy" },
{ "name": "active-directory" }
]
},
@@ -136,7 +134,7 @@ exports.availablePlugins = [
{ "name": "emailext-template" },
{ "name": "mailer" },
{ "name": "publish-over-ssh" },
- { "name": "slack" },
+ // { "name": "slack" }, // JENKINS-33571
{ "name": "ssh" }
]
}
diff --git a/war/src/main/js/config-scrollspy.js b/war/src/main/js/config-scrollspy.js
new file mode 100644
index 0000000000..1ed2dca34e
--- /dev/null
+++ b/war/src/main/js/config-scrollspy.js
@@ -0,0 +1,155 @@
+var $ = require('jquery-detached').getJQuery();
+var page = require('./util/page.js');
+var windowHandle = require('window-handle');
+var isScrolling = false;
+var ignoreNextScrollEvent = false;
+var pageHeaderHeight = page.pageHeaderHeight();
+var breadcrumbBarHeight = page.breadcrumbBarHeight();
+
+// Some stuff useful for testing.
+exports.tabbars = [];
+exports.scrollspeed = 500;
+var eventListeners = [];
+exports.on = function(listener) {
+ eventListeners.push(listener);
+};
+function notify(event) {
+ for (var i = 0; i < eventListeners.length; i++) {
+ eventListeners[i](event);
+ }
+}
+
+$(function() {
+ var tabBarWidget = require('./widgets/config/tabbar.js');
+
+ tabBarWidget.addPageTabs('.config-table.scrollspy', function(tabBar) {
+ exports.tabbars.push(tabBar);
+
+ tabBarWidget.addFinderToggle(tabBar);
+ tabBar.onShowSection(function() {
+ // Scroll to the section.
+ scrollTo(this, tabBar);
+ // Hook back into hudson-behavior.js
+ page.fireBottomStickerAdjustEvent();
+ });
+
+ autoActivateTabs(tabBar);
+ page.onWinScroll(function () {
+ autoActivateTabs(tabBar);
+ });
+ page.onWinScroll(function () {
+ stickTabbar(tabBar);
+ });
+ }, {trackSectionVisibility: true});
+});
+
+function scrollTo(section, tabBar) {
+ var $header = section.headerRow;
+ var scrollTop = $header.offset().top - ($('#main-panel .jenkins-config-widgets').outerHeight() + 15);
+
+ isScrolling = true;
+ $('html,body').animate({
+ scrollTop: scrollTop
+ }, exports.scrollspeed, function() {
+ if (isScrolling) {
+ notify({
+ type: 'click_scrollto',
+ section: section
+ });
+ isScrolling = false;
+ ignoreNextScrollEvent = stickTabbar(tabBar);
+ }
+ });
+}
+
+/**
+ * Watch page scrolling, changing the active tab as needed.
+ * @param tabBar The tabbar.
+ */
+function autoActivateTabs(tabBar) {
+ if (isScrolling === true) {
+ // Ignore window scroll events while we are doing a scroll.
+ // See scrollTo function.
+ return;
+ }
+ if (ignoreNextScrollEvent === true) {
+ // Things like repositioning of the tabbar (see stickTabbar)
+ // can trigger scroll events that we want to ignore.
+ ignoreNextScrollEvent = false;
+ return;
+ }
+
+ var winScrollTop = page.winScrollTop();
+ var sections = tabBar.sections;
+
+ // calculate the top and height of each section to know where to switch the tabs...
+ $.each(sections, function (i, section) {
+ if (!section.isVisible()) {
+ return;
+ }
+
+ // each section enters the viewport at its distance down the page, less the height of
+ // the toolbar, which hangs down the page. Or it is zero if the section doesn't
+ // match or was removed...
+ var viewportEntryOffset = section.getViewportEntryOffset();
+ // height of this one is the top of the next, less the top of this one.
+ var sectionHeight = 0;
+ var nextSection = nextVisibleSection(section);
+ if (nextSection) {
+ sectionHeight = nextSection.getViewportEntryOffset() - viewportEntryOffset;
+ }
+
+ // the trigger point to change the tab happens when the scroll position passes below the height of the section...
+ // ...but we want to wait to advance the tab until the existing section is 75% off the top...
+ // ### < 75% ADVANCED
+ if (winScrollTop < (viewportEntryOffset + (0.75 * sectionHeight))) {
+ section.markAsActive();
+ notify({
+ type: 'manual_scrollto',
+ section: section
+ });
+ return false;
+ }
+ });
+}
+
+/**
+ * Stick the scrollspy tabbar to the top of the visible area as the user
+ * scrolls down the page.
+ * @param tabBar The tabbar.
+ */
+function stickTabbar(tabBar) {
+ var win = $(windowHandle.getWindow());
+ var winScrollTop = page.winScrollTop();
+ var widgetBox = tabBar.configWidgets;
+ var configTable = tabBar.configTable;
+ var configForm = tabBar.configForm;
+ var setWidth = function() {
+ widgetBox.width(configForm.outerWidth() - 2);
+ };
+
+ if (winScrollTop > pageHeaderHeight - 5) {
+ setWidth();
+ widgetBox.css({
+ 'position': 'fixed',
+ 'top': (breadcrumbBarHeight - 5 ) + 'px',
+ 'margin': '0 auto !important'
+ });
+ configTable.css({'margin-top': widgetBox.outerHeight() + 'px'});
+ win.resize(setWidth);
+ return true;
+ } else {
+ widgetBox.removeAttr('style');
+ configTable.removeAttr('style');
+ win.unbind('resize', setWidth);
+ return false;
+ }
+}
+
+function nextVisibleSection(section) {
+ var next = section.getSibling(+1);
+ while (next && !next.isVisible()) {
+ next = next.getSibling(+1);
+ }
+ return next;
+}
diff --git a/war/src/main/js/config-scrollspy.less b/war/src/main/js/config-scrollspy.less
new file mode 100644
index 0000000000..b6521a21c9
--- /dev/null
+++ b/war/src/main/js/config-scrollspy.less
@@ -0,0 +1,36 @@
+@import "widgets/variables";
+
+/*
+ * Mixins
+ * http://lesscss.org/features/#mixins-feature
+ */
+@import "widgets/layout-mixins";
+@import "widgets/form/form-mixins";
+
+/*
+ * Widget styles
+ */
+@import "widgets/config/tabbar";
+
+
+/*
+ * ----------------------------------------------------------------------------------------
+ * Scrollspy specific styles.
+ * ----------------------------------------------------------------------------------------
+ */
+
+.jenkins-config {
+ // The Section header for the General section was manufactured,
+ // so the default is to not display it.
+ .section-header-row.config_general .section-header {
+ display: none;
+ }
+}
+
+.jenkins-config-widgets {
+ .find-container {
+ .find {
+ display: none;
+ }
+ }
+}
\ No newline at end of file
diff --git a/war/src/main/js/config-tabbar.js b/war/src/main/js/config-tabbar.js
index 27abb38508..ada0ded36d 100644
--- a/war/src/main/js/config-tabbar.js
+++ b/war/src/main/js/config-tabbar.js
@@ -1,176 +1,35 @@
var $ = require('jquery-detached').getJQuery();
+var page = require('./util/page.js');
var jenkinsLocalStorage = require('./util/jenkinsLocalStorage.js');
-var configMetadata = require('./widgets/config/model/ConfigTableMetaData.js');
+
+exports.tabs = []; // Useful for testing.
$(function() {
- // Horrible ugly hack...
- // We need to use Behaviour.js to wait until after radioBlock.js Behaviour.js rules
- // have been applied, otherwise row-set rows become visible across sections.
- var done = false;
-
- Behaviour.specify(".dd-handle", 'config-drag-start',1000,fixDragEvent); // jshint ignore:line
- Behaviour.specify(".block-control", 'row-set-block-control', 1000, function() { // jshint ignore:line
- if (done) {
- return;
+ var tabBarWidget = require('./widgets/config/tabbar.js');
+
+ tabBarWidget.addPageTabs('.config-table.tabbed', function(tabBar) {
+ exports.tabs.push(tabBar);
+
+ // We want to merge some sections together.
+ // Merge the "Advanced" section into the "General" section.
+ var generalSection = tabBar.getSection('config_general');
+ if (generalSection) {
+ generalSection.adoptSection('config_advanced_project_options');
}
- done = true;
- // Only do job configs for now.
- var configTables = $('.job-config.tabbed');
- if (configTables.size() > 0) {
- var tabBarShowPreferenceKey = 'config:usetabs';
- var tabBarShowPreference = jenkinsLocalStorage.getGlobalItem(tabBarShowPreferenceKey, "yes");
-
- fixDragEvent(configTables);
-
- var tabBarWidget = require('./widgets/config/tabbar.js');
- if (tabBarShowPreference === "yes") {
- configTables.each(function() {
- var configTable = $(this);
- var tabBar = tabBarWidget.addTabs(configTable);
+ tabBarWidget.addFinderToggle(tabBar);
+ tabBar.onShowSection(function() {
+ // Hook back into hudson-behavior.js
+ page.fireBottomStickerAdjustEvent();
+ });
- // We want to merge some sections together.
- // Merge the "Advanced" section into the "General" section.
- var generalSection = tabBar.getSection('config_general');
- if (generalSection) {
- generalSection.adoptSection('config_advanced_project_options');
- }
-
- addFinderToggle(tabBar);
- tabBar.onShowSection(function() {
- // Hook back into hudson-behavior.js
- fireBottomStickerAdjustEvent();
- });
- tabBar.deactivator.click(function() {
- jenkinsLocalStorage.setGlobalItem(tabBarShowPreferenceKey, "no");
- require('window-handle').getWindow().location.reload();
- });
- $('.jenkins-config-widgets .find-container input').focus(function() {
- fireBottomStickerAdjustEvent();
- });
-
- if (tabBar.hasSections()) {
- var tabBarLastSectionKey = 'config:' + tabBar.configForm.attr('name') + ':last-tab';
- var tabBarLastSection = jenkinsLocalStorage.getPageItem(tabBarLastSectionKey, tabBar.sections[0].id);
- tabBar.onShowSection(function() {
- jenkinsLocalStorage.setPageItem(tabBarLastSectionKey, this.id);
- });
- tabBar.showSection(tabBarLastSection);
- }
- watchScroll(tabBar);
- $(window).on('scroll',function(){watchScroll(tabBar);});
- });
-
- } else {
- configTables.each(function() {
- var configTable = $(this);
- var activator = tabBarWidget.addTabsActivator(configTable);
- configMetadata.markConfigTableParentForm(configTable);
- activator.click(function() {
- jenkinsLocalStorage.setGlobalItem(tabBarShowPreferenceKey, "yes");
- require('window-handle').getWindow().location.reload();
- });
- });
- }
+ if (tabBar.hasSections()) {
+ var tabBarLastSectionKey = 'config:' + tabBar.configForm.attr('name') + ':last-tab';
+ var tabBarLastSection = jenkinsLocalStorage.getPageItem(tabBarLastSectionKey, tabBar.sections[0].id);
+ tabBar.onShowSection(function() {
+ jenkinsLocalStorage.setPageItem(tabBarLastSectionKey, this.id);
+ });
+ tabBar.showSection(tabBarLastSection);
}
});
-
-
-});
-
-function addFinderToggle(configTableMetadata) {
- var findToggle = $('');
- var finderShowPreferenceKey = 'config:showfinder';
-
- findToggle.click(function() {
- var findContainer = $('.find-container', configTableMetadata.configWidgets);
- if (findContainer.hasClass('visible')) {
- findContainer.removeClass('visible');
- jenkinsLocalStorage.setGlobalItem(finderShowPreferenceKey, "no");
- } else {
- findContainer.addClass('visible');
- $('input', findContainer).focus();
- jenkinsLocalStorage.setGlobalItem(finderShowPreferenceKey, "yes");
- }
- });
-
- if (jenkinsLocalStorage.getGlobalItem(finderShowPreferenceKey, "yes") === 'yes') {
- findToggle.click();
- }
-}
-
-function watchScroll(tabControl){
- var $window = $(window);
- var $tabBox= tabControl.configWidgets;
- var $tabs = $tabBox.find('.tab');
- var $table= tabControl.configTable;
- var $jenkTools = $('#breadcrumbBar');
- var winScoll = $window.scrollTop();
- var categories = tabControl.sections;
- var jenkToolOffset = ($jenkTools.height() + $jenkTools.offset().top);
-
- // reset tabs to start...
- $tabs.find('.active').removeClass('active');
-
- function getCatTop($cat){
- return($cat.length > 0)?
- $cat.offset().top - jenkToolOffset
- :0;
- }
- // calculate the top and height of each section to know where to switch the tabs...
- $.each(categories,function(i,cat){
- var $cat = $(cat.headerRow);
- var $nextCat = (i+1 $('#page-head').height() - 5 ){
- $tabBox.width($tabBox.width()).css({
- 'position':'fixed',
- 'top':($jenkTools.height() - 5 )+'px'});
- $table.css({'margin-top':$tabBox.outerHeight()+'px'});
-
- }
- else{
- $tabBox.add($table).removeAttr('style');
- }
-}
-
-function fireBottomStickerAdjustEvent() {
- Event.fire(window, 'jenkins:bottom-sticker-adjust'); // jshint ignore:line
-}
-// YUI Drag widget does not like to work on elements with a relative position.
-// This tells the element to switch to static position at the start of the drag, so it can work.
-function fixDragEvent(handle){
- var isReady = false;
- var $handle = $(handle);
- var $chunk = $handle.closest('.repeated-chunk');
- $handle.add('#ygddfdiv')
- .mousedown(function(){
- isReady = true;
- })
- .mousemove(function(){
- if(isReady && !$chunk.hasClass('dragging')){
- $chunk.addClass('dragging');
- }
- }).mouseup(function(){
- isReady = false;
- $chunk.removeClass('dragging');
- });
-}
+});
\ No newline at end of file
diff --git a/war/src/main/js/config-tabbar.less b/war/src/main/js/config-tabbar.less
new file mode 100644
index 0000000000..2ab6a24396
--- /dev/null
+++ b/war/src/main/js/config-tabbar.less
@@ -0,0 +1,33 @@
+@import "widgets/variables";
+
+/*
+ * Mixins
+ * http://lesscss.org/features/#mixins-feature
+ */
+@import "widgets/layout-mixins";
+@import "widgets/form/form-mixins";
+
+/*
+ * Widget styles
+ */
+@import "widgets/config/tabbar";
+
+
+/*
+ * ----------------------------------------------------------------------------------------
+ * Tab bar specific styles.
+ * ----------------------------------------------------------------------------------------
+ */
+
+.jenkins-config {
+
+ // For a tabbar, the default is to hide all of the table rows.
+ tr.config-table-top-row {
+ display: none;
+ }
+ // ... and then show them when given the "active" class.
+ tr.config-table-top-row.active {
+ display: table-row;
+ }
+
+}
\ No newline at end of file
diff --git a/war/src/main/js/pluginSetupWizardGui.js b/war/src/main/js/pluginSetupWizardGui.js
index e011bfb4a4..b51f6d0d21 100644
--- a/war/src/main/js/pluginSetupWizardGui.js
+++ b/war/src/main/js/pluginSetupWizardGui.js
@@ -232,6 +232,15 @@ var createPluginSetupWizard = function(appendTarget) {
// plugin data for the progress panel
var installingPlugins = [];
+ var getInstallingPlugin = function(plugName) {
+ for(var i = 0; i < installingPlugins.length; i++) {
+ var p = installingPlugins[i];
+ if(p.name === plugName) {
+ return p;
+ }
+ }
+ return null;
+ };
// recursively get all the dependencies for a particular plugin, this is used to show 'installing' status
// when only dependencies are being installed
@@ -266,28 +275,26 @@ var createPluginSetupWizard = function(appendTarget) {
// Initializes the set of installing plugins with pending statuses
var initInstallingPluginList = function() {
installingPlugins = [];
- installingPlugins.names = [];
for (var i = 0; i < selectedPluginNames.length; i++) {
var pluginName = selectedPluginNames[i];
- var p = availablePlugins[ pluginName];
+ var p = availablePlugins[pluginName];
if (p) {
var plug = $.extend({
installStatus : 'pending'
}, p);
installingPlugins.push(plug);
- installingPlugins[plug.name] = plug;
- installingPlugins.names.push(pluginName);
}
}
};
// call this to go install the selected set of plugins
var installPlugins = function(plugins) {
+ // Switch to the right view but function() to force update when progressPanel re-rendered
+ setPanel(function() { return progressPanel(arguments); }, { installingPlugins : [] });
+
pluginManager.installPlugins(plugins, handleGenericError(function() {
showInstallProgress();
}));
-
- setPanel(progressPanel, { installingPlugins : installingPlugins });
};
// toggles visibility of dependency listing for a plugin
@@ -599,7 +606,13 @@ var createPluginSetupWizard = function(appendTarget) {
$('.plugin-list .selected').addClass('match');
}
else {
- var matches = findElementsWithText($pl[0], text.toLowerCase(), function(d) { return d.toLowerCase(); });
+ var matches = [];
+ $containers.find('.title,.description').each(function() {
+ var localMatches = findElementsWithText(this, text.toLowerCase(), function(d) { return d.toLowerCase(); });
+ if(localMatches.length > 0) {
+ matches = matches.concat(localMatches);
+ }
+ });
$(matches).parents('.plugin').addClass('match');
if(lastSearch !== text && scroll) {
scrollPlugin($pl, matches, text);
@@ -853,11 +866,10 @@ var createPluginSetupWizard = function(appendTarget) {
initInstallingPluginList();
for(var plugName in incompleteStatus) {
- var j = installingPlugins[plugName];
+ var j = getInstallingPlugin(plugName);
if (!j) {
console.warn('Plugin "' + plugName + '" not found in the list of installing plugins.');
- console.warn('\tInstalling plugins: ' + installingPlugins.names);
continue;
}
diff --git a/war/src/main/js/util/behavior-shim.js b/war/src/main/js/util/behavior-shim.js
new file mode 100644
index 0000000000..27d00b784a
--- /dev/null
+++ b/war/src/main/js/util/behavior-shim.js
@@ -0,0 +1,4 @@
+
+exports.specify = function(selector, id, priority, behavior) {
+ Behaviour.specify(selector, id, priority, behavior); // jshint ignore:line
+};
\ No newline at end of file
diff --git a/war/src/main/js/util/localStorage.js b/war/src/main/js/util/localStorage.js
index d04063777e..0628c1b547 100644
--- a/war/src/main/js/util/localStorage.js
+++ b/war/src/main/js/util/localStorage.js
@@ -2,22 +2,20 @@ var windowHandle = require('window-handle');
var win = windowHandle.getWindow();
var storage = win.localStorage;
-if (typeof storage === "undefined") {
- console.warn('HTML5 localStorage not supported by this browser.');
- // mock it...
+exports.setMock = function() {
storage = {
storage: {},
- setItem: function(name, value) {
+ setItem: function (name, value) {
this.storage[name] = value;
},
- getItem: function(name) {
+ getItem: function (name) {
return this.storage[name];
},
- removeItem: function(name) {
+ removeItem: function (name) {
delete this.storage[name];
}
};
-}
+};
exports.setItem = function(name, value) {
storage.setItem(name, value);
@@ -33,4 +31,10 @@ exports.getItem = function(name, defaultVal) {
exports.removeItem = function(name) {
return storage.removeItem(name);
-};
\ No newline at end of file
+};
+
+if (typeof storage === "undefined") {
+ console.warn('HTML5 localStorage not supported by this browser.');
+ // mock it...
+ exports.setMock();
+}
\ No newline at end of file
diff --git a/war/src/main/js/util/page.js b/war/src/main/js/util/page.js
new file mode 100644
index 0000000000..77052bb9d0
--- /dev/null
+++ b/war/src/main/js/util/page.js
@@ -0,0 +1,91 @@
+var jQD = require('jquery-detached');
+var windowHandle = require('window-handle');
+var timestamp = (new Date().getTime());
+var loadedClass = 'jenkins-loaded-' + timestamp;
+
+/**
+ * Wait for the specified element to be added to the DOM.
+ *
+ * A jQuery based alternative to Behaviour.specify. Grrrr.
+ * @param selector The jQuery selector.
+ * @param callback The callback to call after finding new elements. This
+ * callback must return a boolean value of true if scanning is to continue.
+ * @param contextEl The jQuery selector context (optional).
+ */
+exports.onload = function(selector, callback, contextEl) {
+ var $ = jQD.getJQuery();
+
+ function registerRescan() {
+ setTimeout(scan, 50);
+ }
+ function scan() {
+ var elements = $(selector, contextEl).not(loadedClass);
+ if (elements.size() > 0) {
+ elements.addClass(loadedClass);
+ if (callback(elements) === true) {
+ registerRescan();
+ }
+ } else {
+ registerRescan();
+ }
+ }
+ scan();
+};
+
+exports.winScrollTop = function() {
+ var $ = jQD.getJQuery();
+ var win = $(windowHandle.getWindow());
+ return win.scrollTop();
+};
+
+exports.onWinScroll = function(callback) {
+ var $ = jQD.getJQuery();
+ $(windowHandle.getWindow()).on('scroll', callback);
+};
+
+exports.pageHeaderHeight = function() {
+ return elementHeight('#page-head');
+};
+
+exports.breadcrumbBarHeight = function() {
+ return elementHeight('#breadcrumbBar');
+};
+
+exports.fireBottomStickerAdjustEvent = function() {
+ Event.fire(window, 'jenkins:bottom-sticker-adjust'); // jshint ignore:line
+};
+
+// YUI Drag widget does not like to work on elements with a relative position.
+// This tells the element to switch to static position at the start of the drag, so it can work.
+exports.fixDragEvent = function(handle) {
+ var $ = jQD.getJQuery();
+ var isReady = false;
+ var $handle = $(handle);
+ var $chunk = $handle.closest('.repeated-chunk');
+ $handle.add('#ygddfdiv')
+ .mousedown(function(){
+ isReady = true;
+ })
+ .mousemove(function(){
+ if(isReady && !$chunk.hasClass('dragging')){
+ $chunk.addClass('dragging');
+ }
+ }).mouseup(function(){
+ isReady = false;
+ $chunk.removeClass('dragging');
+ });
+};
+
+exports.removeTextHighlighting = function(selector) {
+ var $ = jQD.getJQuery();
+ $('span.highlight-split', selector).each(function() {
+ var highlightSplit = $(this);
+ highlightSplit.before(highlightSplit.text());
+ highlightSplit.remove();
+ });
+};
+
+function elementHeight(selector) {
+ var $ = jQD.getJQuery();
+ return $(selector).height();
+}
\ No newline at end of file
diff --git a/war/src/main/js/widgets/config/model/ConfigSection.js b/war/src/main/js/widgets/config/model/ConfigSection.js
index 2a260dffea..8f8c7e88a7 100644
--- a/war/src/main/js/widgets/config/model/ConfigSection.js
+++ b/war/src/main/js/widgets/config/model/ConfigSection.js
@@ -1,6 +1,8 @@
var jQD = require('../../../util/jquery-ext.js');
var util = require('./util.js');
+var page = require('../../../util/page.js');
var ConfigRowGrouping = require('./ConfigRowGrouping.js');
+var pageHeaderHeight = page.pageHeaderHeight();
module.exports = ConfigSection;
@@ -17,12 +19,50 @@ function ConfigSection(headerRow, parentCMD) {
this.rowGroups = undefined;
this.activator = undefined;
this.subSections = [];
+
+ this.headerRow.addClass(this.id);
}
ConfigSection.prototype.isTopLevelSection = function() {
return (this.parentCMD.getSection(this.id) !== undefined);
};
+ConfigSection.prototype.isVisible = function() {
+ return this.headerRow.is(':visible');
+};
+
+/**
+ * Get the page offset (height) at which this section comes
+ * into view.
+ * @returns {number}
+ */
+ConfigSection.prototype.getViewportEntryOffset = function() {
+ return this.headerRow.offset().top - pageHeaderHeight;
+};
+
+/**
+ * Get the sibling section at the relative offset.
+ * @param relOffset
+ */
+ConfigSection.prototype.getSibling = function(relOffset) {
+ var sections = this.parentCMD.sections;
+ var endIndex = sections.length - 1;
+
+ for (var i = 0; i < endIndex; i++) {
+ var testIndex = i + relOffset;
+ if (testIndex < 0) {
+ continue;
+ } else if (testIndex > endIndex) {
+ return undefined;
+ }
+ if (sections[i] === this) {
+ return sections[testIndex];
+ }
+ }
+
+ return undefined;
+};
+
/**
* Move another top-level section into this section i.e. adopt it.
*
@@ -91,10 +131,16 @@ ConfigSection.prototype.activate = function() {
}
};
+ConfigSection.prototype.markAsActive = function() {
+ this.parentCMD.hideSection();
+ this.activator.addClass('active');
+ this.markRowsAsActive();
+};
+
ConfigSection.prototype.markRowsAsActive = function() {
var rows = this.getRows();
for (var i = 0; i < rows.length; i++) {
- rows[i].addClass('active').show();
+ rows[i].addClass('active');
}
for (var ii = 0; ii < this.subSections.length; ii++) {
this.subSections[ii].markRowsAsActive();
@@ -173,6 +219,7 @@ ConfigSection.prototype.gatherRowGroups = function(rows) {
for (var i = 0; i < rows.length; i++) {
var row = rows[i];
+
if (row.hasClass('row-group-start')) {
var newRowGroup = new ConfigRowGrouping(row, rowGroupContainer);
if (rowGroupContainer) {
@@ -180,12 +227,7 @@ ConfigSection.prototype.gatherRowGroups = function(rows) {
}
rowGroupContainer = newRowGroup;
newRowGroup.findToggleWidget(row);
- } else {
- //FIXME: I am not sure how rowGroupContainer can be undefined, but I am seeing the error, so somethings not right
- if(!rowGroupContainer){
- console.log('missing rowGroupContainer');
- return false;
- }
+ } else if (rowGroupContainer) {
if (row.hasClass('row-group-end')) {
rowGroupContainer.endRow = row;
rowGroupContainer = rowGroupContainer.parentRowGroupContainer; // pop back off the "stack"
@@ -220,12 +262,7 @@ ConfigSection.prototype.highlightText = function(text) {
for (var i1 = 0; i1 < rows.length; i1++) {
var row = rows[i1];
- /*jshint loopfunc: true */
- $('span.highlight-split', row).each(function() { // jshint ignore:line
- var highlightSplit = $(this);
- highlightSplit.before(highlightSplit.text());
- highlightSplit.remove();
- });
+ page.removeTextHighlighting(row);
if (text !== '') {
var regex = new RegExp('(' + text + ')',"gi");
diff --git a/war/src/main/js/widgets/config/model/ConfigTableMetaData.js b/war/src/main/js/widgets/config/model/ConfigTableMetaData.js
index 3c3417eb3c..c77425b2f0 100644
--- a/war/src/main/js/widgets/config/model/ConfigTableMetaData.js
+++ b/war/src/main/js/widgets/config/model/ConfigTableMetaData.js
@@ -4,6 +4,7 @@
var jQD = require('../../../util/jquery-ext.js');
var ConfigSection = require('./ConfigSection.js');
+var page = require('../../../util/page.js');
var util = require('./util.js');
exports.markConfigTableParentForm = function(configTable) {
@@ -99,7 +100,9 @@ function ConfigTableMetaData(configForm, configTable) {
}
ConfigTableMetaData.prototype.getTopRows = function() {
- return this.configTableBody.children('tr');
+ var topRows = this.configTableBody.children('tr');
+ topRows.addClass('config-table-top-row');
+ return topRows;
};
ConfigTableMetaData.prototype.getFirstRow = function() {
@@ -127,24 +130,19 @@ ConfigTableMetaData.prototype.addFindWidget = function() {
});
var findTimeout;
- thisTMD.findInput.keyup(function() {
-
- var val = thisTMD.findInput.val();
-
- //if the keydown does not set a value, this filtering should exit.
- if(val === ''){
- return false;
- }
-
- if (findTimeout) {
- clearTimeout(findTimeout);
- findTimeout = undefined;
- }
- findTimeout = setTimeout(function() {
- findTimeout = undefined;
- thisTMD.showSections(thisTMD.findInput.val());
- }, 300);
+ thisTMD.findInput.keydown(function() {
+ if (findTimeout) {
+ clearTimeout(findTimeout);
+ findTimeout = undefined;
+ }
+ findTimeout = setTimeout(function() {
+ findTimeout = undefined;
+ thisTMD.showSections(thisTMD.findInput.val());
+ }, 300);
+ });
+ $('.jenkins-config-widgets .find-container input').focus(function() {
+ page.fireBottomStickerAdjustEvent();
});
this.configWidgets.append(findWidget);
@@ -192,12 +190,20 @@ ConfigTableMetaData.prototype.activeSection = function() {
}
};
-ConfigTableMetaData.prototype.getSection = function(sectionId) {
+ConfigTableMetaData.prototype.getSection = function(ref) {
if (this.hasSections()) {
- for (var i = 0; i < this.sections.length; i++) {
- var section = this.sections[i];
- if (section.id === sectionId) {
- return section;
+ if (typeof ref === 'number') {
+ // It's a section index...
+ if (ref >= 0 && ref <= this.sections.length - 1) {
+ return this.sections[ref];
+ }
+ } else {
+ // It's a section ID...
+ for (var i = 0; i < this.sections.length; i++) {
+ var section = this.sections[i];
+ if (section.id === ref) {
+ return section;
+ }
}
}
}
@@ -243,28 +249,12 @@ ConfigTableMetaData.prototype.showSection = function(section) {
if (typeof section === 'string') {
section = this.getSection(section);
}
- if(!section) {return;}
- var $ = this.$;
- var $header = $(section.headerRow).show();
- var scrollTop = $header.offset().top - ($('#main-panel .jenkins-config-widgets').outerHeight() + 15);
-
- $('html,body').animate({
- scrollTop: scrollTop
- }, 500);
- setTimeout(function(){
- section.activator.closest('.tabBar').find('.active').removeClass('active');
- section.activator.addClass('active');
- },510);
if (section) {
var topRows = this.getTopRows();
- // Deactivate currently active section ...
- this.deactivateActiveSection();
-
// Active the specified section
- section.activator.addClass('active');
- section.markRowsAsActive();
+ section.markAsActive();
// and always show the buttons
topRows.filter('.config_buttons').show();
@@ -276,14 +266,12 @@ ConfigTableMetaData.prototype.showSection = function(section) {
}
};
-ConfigTableMetaData.prototype.deactivateActiveSection = function(hideRows) {
+ConfigTableMetaData.prototype.hideSection = function() {
var topRows = this.getTopRows();
var $ = jQD.getJQuery();
$('.config-section-activator.active', this.activatorContainer).removeClass('active');
topRows.filter('.active').removeClass('active');
- if(hideRows)
- {topRows.hide();}
};
ConfigTableMetaData.prototype.onShowSection = function(listener) {
@@ -291,6 +279,8 @@ ConfigTableMetaData.prototype.onShowSection = function(listener) {
};
ConfigTableMetaData.prototype.showSections = function(withText) {
+ this.removeTextHighlighting();
+
if (withText === '') {
if (this.hasSections()) {
for (var i1 = 0; i1 < this.sections.length; i1++) {
@@ -300,7 +290,6 @@ ConfigTableMetaData.prototype.showSections = function(withText) {
if (!activeSection) {
this.showSection(this.sections[0]);
} else {
- this.deactivateActiveSection(true);
activeSection.highlightText(this.findInput.val());
}
}
@@ -323,12 +312,50 @@ ConfigTableMetaData.prototype.showSections = function(withText) {
if (sectionsWithText.length > 0) {
this.showSection(sectionsWithText[0]);
} else {
- this.deactivateActiveSection();
+ this.hideSection();
}
}
}
};
+/**
+ * We need this because sections can mysteriously change visibility,
+ * which looks strange for scroolspy.
+ */
+ConfigTableMetaData.prototype.trackSectionVisibility = function() {
+ if (isTestEnv()) {
+ return;
+ }
+
+ var thisConfig = this;
+
+ try {
+ for (var i = 0; i < this.sections.length; i++) {
+ var section = this.sections[i];
+ if (section.isVisible()) {
+ section.activator.show();
+ } else {
+ section.activator.hide();
+ }
+ }
+ } finally {
+ var interval = (thisConfig.trackSectionVisibilityTO || 0);
+
+ // The rescan interval will drop off over time, starting out very fast.
+ interval += 10;
+ interval = Math.min(interval, 500);
+ thisConfig.trackSectionVisibilityTO = interval;
+
+ setTimeout(function() {
+ thisConfig.trackSectionVisibility();
+ }, interval);
+ }
+};
+
+ConfigTableMetaData.prototype.removeTextHighlighting = function() {
+ page.removeTextHighlighting(this.configForm);
+};
+
function fireListeners(listeners, contextObject) {
for (var i = 0; i < listeners.length; i++) {
fireListener(listeners[i], contextObject);
@@ -338,4 +365,22 @@ function fireListeners(listeners, contextObject) {
listener.call(contextObject);
}, 1);
}
+}
+
+function isTestEnv() {
+ if (window === undefined) {
+ return true;
+ } else if (window.navigator === undefined) {
+ return true;
+ } else if (window.navigator.userAgent === undefined) {
+ return true;
+ } else if (window.navigator.userAgent === 'JasmineTest') {
+ return true;
+ } else if (window.navigator.userAgent === 'JenkinsTest') {
+ return true;
+ } else if (window.navigator.userAgent.toLowerCase().indexOf("node.js") !== -1) {
+ return true;
+ }
+
+ return false;
}
\ No newline at end of file
diff --git a/war/src/main/js/widgets/config/tabbar.js b/war/src/main/js/widgets/config/tabbar.js
index 2a6f59f518..ddb87cc49b 100644
--- a/war/src/main/js/widgets/config/tabbar.js
+++ b/war/src/main/js/widgets/config/tabbar.js
@@ -1,13 +1,66 @@
var jQD = require('jquery-detached');
+var page = require('../../util/page.js');
+var jenkinsLocalStorage = require('../../util/jenkinsLocalStorage.js');
var tableMetadata = require('./model/ConfigTableMetaData.js');
+var behaviorShim = require('../../util/behavior-shim');
+
+exports.tabBarShowPreferenceKey = 'config:usetabs';
+
+exports.addPageTabs = function(configSelector, onEachConfigTable, options) {
+ var $ = jQD.getJQuery();
+
+ $(function() {
+ behaviorShim.specify(".dd-handle", 'config-drag-start', 1000, function(el) {
+ page.fixDragEvent(el);
+ });
+
+ // We need to wait until after radioBlock.js Behaviour.js rules
+ // have been applied, otherwise row-set rows become visible across sections.
+ page.onload('.block-control', function() {
+ // Only do job configs for now.
+ var configTables = $(configSelector);
+ if (configTables.size() > 0) {
+ var tabBarShowPreference = jenkinsLocalStorage.getGlobalItem(exports.tabBarShowPreferenceKey, "yes");
+
+ page.fixDragEvent(configTables);
+
+ if (tabBarShowPreference === "yes") {
+ configTables.each(function() {
+ var configTable = $(this);
+ var tabBar = exports.addTabs(configTable, options);
+
+ onEachConfigTable.call(configTable, tabBar);
+
+ tabBar.deactivator.click(function() {
+ jenkinsLocalStorage.setGlobalItem(exports.tabBarShowPreferenceKey, "no");
+ require('window-handle').getWindow().location.reload();
+ });
+ });
+ } else {
+ configTables.each(function() {
+ var configTable = $(this);
+ var activator = exports.addTabsActivator(configTable);
+ tableMetadata.markConfigTableParentForm(configTable);
+ activator.click(function() {
+ jenkinsLocalStorage.setGlobalItem(exports.tabBarShowPreferenceKey, "yes");
+ require('window-handle').getWindow().location.reload();
+ });
+ });
+ }
+ }
+ }, configSelector);
+ });
+};
exports.addTabsOnFirst = function() {
return exports.addTabs(tableMetadata.findConfigTables().first());
};
-exports.addTabs = function(configTable) {
+exports.addTabs = function(configTable, options) {
var $ = jQD.getJQuery();
var configTableMetadata;
+ var tabOptions = (options || {});
+ var trackSectionVisibility = (tabOptions.trackSectionVisibility || false);
if ($.isArray(configTable)) {
// It's a config
- Trigger builds of the other projects once a build is successfully completed.
- Multiple projects can be specified by using comma, like "abc, def".
+ Trigger builds of the other projects once a build is successfully completed.
+ Multiple projects can be specified by using comma, like "abc, def".
-
- Other than the obvious use case where you'd like to build other projects that have a dependency
- on the current project, this can also be useful to split a long build process in to multiple
- stages (such as the build portion and the test portion).
+
+ Other than the obvious use case where you'd like to build other projects that have a dependency
+ on the current project, this can also be useful to split a long build process in to multiple
+ stages (such as the build portion and the test portion).
+
+
+
+ Nested projects need to be specified by using a path. It can be an absolute path starting from Jenkins
+ root, like "/grp/abc" where "grp" is located at the root of Jenkins. It can also be a relative path
+ from the current project location, like "grp/abc" where "grp" is located at the same level as the
+ current project.
+ Examples of plugins that provide such implementation include but are not limited to the
+ CloudBees Folder Plugin
+ and the
+ Multi-Branch Project Plugin
+
\ No newline at end of file
diff --git a/war/src/test/js/widgets/config/freestyle-config-scrollspy.html b/war/src/test/js/widgets/config/freestyle-config-scrollspy.html
new file mode 100644
index 0000000000..1f3a6be104
--- /dev/null
+++ b/war/src/test/js/widgets/config/freestyle-config-scrollspy.html
@@ -0,0 +1,169 @@
+
+
+
+
+
+
+
diff --git a/war/src/test/js/widgets/config/freestyle-config.html b/war/src/test/js/widgets/config/freestyle-config-tabbed.html
similarity index 99%
rename from war/src/test/js/widgets/config/freestyle-config.html
rename to war/src/test/js/widgets/config/freestyle-config-tabbed.html
index a236ee0f45..523bc8e1a5 100644
--- a/war/src/test/js/widgets/config/freestyle-config.html
+++ b/war/src/test/js/widgets/config/freestyle-config-tabbed.html
@@ -1,5 +1,5 @@