@@ -62,7 +62,7 @@ public static File getExplodedDir() throws Exception {
62
62
}
63
63
64
64
/**
65
- * Explodes hudson.war, if necesasry , and returns its root dir.
65
+ * Explodes hudson.war, if necessary , and returns its root dir.
66
66
*/
67
67
private static File explode () throws Exception {
68
68
// 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 {
71
71
File d = new File ("." ).getAbsoluteFile ();
72
72
73
73
// 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 " );
76
76
}
77
77
78
78
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 " );
81
81
if (dir .exists ()) {
82
- System .out .println ("Using hudson .war resources from " +dir );
82
+ System .out .println ("Using jenkins .war resources from " +dir );
83
83
return dir ;
84
84
}
85
85
}
@@ -89,22 +89,22 @@ private static File explode() throws Exception {
89
89
URL winstone = WarExploder .class .getResource ("/winstone.jar" );
90
90
if (winstone ==null )
91
91
// 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." );
93
93
File war = Which .jarFile (Class .forName ("executable.Executable" ));
94
94
95
- File explodeDir = new File ("./target/hudson -for-test" ).getAbsoluteFile ();
95
+ File explodeDir = new File ("./target/jenkins -for-test" ).getAbsoluteFile ();
96
96
File timestamp = new File (explodeDir ,".timestamp" );
97
97
98
98
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 );
100
100
new FilePath (explodeDir ).deleteRecursive ();
101
101
new FilePath (war ).unzip (new FilePath (explodeDir ));
102
102
if (!explodeDir .exists ()) // this is supposed to be impossible, but I'm investigating HUDSON-2605
103
103
throw new IOException ("Failed to explode " +war );
104
104
new FileOutputStream (timestamp ).close ();
105
105
timestamp .setLastModified (war .lastModified ());
106
106
} 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 ());
108
108
}
109
109
110
110
return explodeDir ;
0 commit comments