From 45da182f71a9ef75148a008019ba7e7090cd1fab Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 31 Jan 2011 18:34:17 -0800 Subject: [PATCH 1/3] Fixed a bug in the test harness. --- .hudson => .jenkins | 0 .../org/jvnet/hudson/test/WarExploder.java | 20 +++++++++---------- 2 files changed, 10 insertions(+), 10 deletions(-) rename .hudson => .jenkins (100%) diff --git a/.hudson b/.jenkins similarity index 100% rename from .hudson rename to .jenkins diff --git a/test/src/main/java/org/jvnet/hudson/test/WarExploder.java b/test/src/main/java/org/jvnet/hudson/test/WarExploder.java index fca55036a6..172c049cea 100644 --- a/test/src/main/java/org/jvnet/hudson/test/WarExploder.java +++ b/test/src/main/java/org/jvnet/hudson/test/WarExploder.java @@ -62,7 +62,7 @@ final class WarExploder { } /** - * Explodes hudson.war, if necesasry, and returns its root dir. + * Explodes hudson.war, if necessary, and returns its root dir. */ private static File explode() throws Exception { // are we in the hudson main workspace? If so, pick up hudson/main/war/resources @@ -71,15 +71,15 @@ final class WarExploder { File d = new File(".").getAbsoluteFile(); // just in case we were started from hudson instead of from hudson/main/... - if (new File(d, "main/war/target/hudson").exists()) { - return new File(d, "main/war/target/hudson"); + if (new File(d, "main/war/target/jenkins").exists()) { + return new File(d, "main/war/target/jenkins"); } for( ; d!=null; d=d.getParentFile()) { - if(new File(d,".hudson").exists()) { - File dir = new File(d,"war/target/hudson"); + if(new File(d,".jenkins").exists()) { + File dir = new File(d,"war/target/jenkins"); if(dir.exists()) { - System.out.println("Using hudson.war resources from "+dir); + System.out.println("Using jenkins.war resources from "+dir); return dir; } } @@ -89,14 +89,14 @@ final class WarExploder { URL winstone = WarExploder.class.getResource("/winstone.jar"); if(winstone==null) // impossible, since the test harness pulls in hudson.war - throw new AssertionError("hudson.war is not in the classpath."); + throw new AssertionError("jenkins.war is not in the classpath."); File war = Which.jarFile(Class.forName("executable.Executable")); - File explodeDir = new File("./target/hudson-for-test").getAbsoluteFile(); + File explodeDir = new File("./target/jenkins-for-test").getAbsoluteFile(); File timestamp = new File(explodeDir,".timestamp"); if(!timestamp.exists() || (timestamp.lastModified()!=war.lastModified())) { - System.out.println("Exploding hudson.war at "+war); + System.out.println("Exploding jenkins.war at "+war); new FilePath(explodeDir).deleteRecursive(); new FilePath(war).unzip(new FilePath(explodeDir)); if(!explodeDir.exists()) // this is supposed to be impossible, but I'm investigating HUDSON-2605 @@ -104,7 +104,7 @@ final class WarExploder { new FileOutputStream(timestamp).close(); timestamp.setLastModified(war.lastModified()); } else { - System.out.println("Picking up existing exploded hudson.war at "+explodeDir.getAbsolutePath()); + System.out.println("Picking up existing exploded jenkins.war at "+explodeDir.getAbsolutePath()); } return explodeDir; From da1dc0142d084204045de43854f01d754d14b776 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 31 Jan 2011 19:08:11 -0800 Subject: [PATCH 2/3] bug fix in the test --- .../main/java/org/jvnet/hudson/test/JavaNetReverseProxy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/src/main/java/org/jvnet/hudson/test/JavaNetReverseProxy.java b/test/src/main/java/org/jvnet/hudson/test/JavaNetReverseProxy.java index 6aae6ac831..27019330d5 100644 --- a/test/src/main/java/org/jvnet/hudson/test/JavaNetReverseProxy.java +++ b/test/src/main/java/org/jvnet/hudson/test/JavaNetReverseProxy.java @@ -80,7 +80,7 @@ public class JavaNetReverseProxy extends HttpServlet { File cache = new File(cacheFolder, d); if(!cache.exists()) { - URL url = new URL("http://jenkins-ci.org/" + path); + URL url = new URL("http://updates.jenkins-ci.org/" + path); FileUtils.copyURLToFile(url,cache); } From ec3fbdf457ed81191b018680519f89e69e93f425 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 31 Jan 2011 19:14:45 -0800 Subject: [PATCH 3/3] preparing for RC --- changelog.html | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/changelog.html b/changelog.html index 062bde74e4..2d1c77457d 100644 --- a/changelog.html +++ b/changelog.html @@ -39,6 +39,14 @@ Upcoming changes + + + - - -

What's new in 1.395 (2011/01/21)