Skip to content

Commit 45da182

Browse files
committed
Fixed a bug in the test harness.
1 parent d44eef2 commit 45da182

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

.hudson renamed to .jenkins

File renamed without changes.

test/src/main/java/org/jvnet/hudson/test/WarExploder.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public static File getExplodedDir() throws Exception {
6262
}
6363

6464
/**
65-
* Explodes hudson.war, if necesasry, and returns its root dir.
65+
* Explodes hudson.war, if necessary, and returns its root dir.
6666
*/
6767
private static File explode() throws Exception {
6868
// are we in the hudson main workspace? If so, pick up hudson/main/war/resources
@@ -71,15 +71,15 @@ private static File explode() throws Exception {
7171
File d = new File(".").getAbsoluteFile();
7272

7373
// just in case we were started from hudson instead of from hudson/main/...
74-
if (new File(d, "main/war/target/hudson").exists()) {
75-
return new File(d, "main/war/target/hudson");
74+
if (new File(d, "main/war/target/jenkins").exists()) {
75+
return new File(d, "main/war/target/jenkins");
7676
}
7777

7878
for( ; d!=null; d=d.getParentFile()) {
79-
if(new File(d,".hudson").exists()) {
80-
File dir = new File(d,"war/target/hudson");
79+
if(new File(d,".jenkins").exists()) {
80+
File dir = new File(d,"war/target/jenkins");
8181
if(dir.exists()) {
82-
System.out.println("Using hudson.war resources from "+dir);
82+
System.out.println("Using jenkins.war resources from "+dir);
8383
return dir;
8484
}
8585
}
@@ -89,22 +89,22 @@ private static File explode() throws Exception {
8989
URL winstone = WarExploder.class.getResource("/winstone.jar");
9090
if(winstone==null)
9191
// impossible, since the test harness pulls in hudson.war
92-
throw new AssertionError("hudson.war is not in the classpath.");
92+
throw new AssertionError("jenkins.war is not in the classpath.");
9393
File war = Which.jarFile(Class.forName("executable.Executable"));
9494

95-
File explodeDir = new File("./target/hudson-for-test").getAbsoluteFile();
95+
File explodeDir = new File("./target/jenkins-for-test").getAbsoluteFile();
9696
File timestamp = new File(explodeDir,".timestamp");
9797

9898
if(!timestamp.exists() || (timestamp.lastModified()!=war.lastModified())) {
99-
System.out.println("Exploding hudson.war at "+war);
99+
System.out.println("Exploding jenkins.war at "+war);
100100
new FilePath(explodeDir).deleteRecursive();
101101
new FilePath(war).unzip(new FilePath(explodeDir));
102102
if(!explodeDir.exists()) // this is supposed to be impossible, but I'm investigating HUDSON-2605
103103
throw new IOException("Failed to explode "+war);
104104
new FileOutputStream(timestamp).close();
105105
timestamp.setLastModified(war.lastModified());
106106
} else {
107-
System.out.println("Picking up existing exploded hudson.war at "+explodeDir.getAbsolutePath());
107+
System.out.println("Picking up existing exploded jenkins.war at "+explodeDir.getAbsolutePath());
108108
}
109109

110110
return explodeDir;

0 commit comments

Comments
 (0)