mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-17 05:52:26 +00:00
Merge branch 'rc'
Diverging from the normal RC process since the additional commits have alrady been made in the master. * rc: preparing for RC bug fix in the test Fixed a bug in the test harness.
This commit is contained in:
commit
f88e491ac8
4 files changed
+19
-17
No files matched your search
File renamed without changes.
+8
-6
@@ -39,6 +39,14 @@ Upcoming changes</a>
|
||||
|
||||
<!-- Record your changes in the trunk here. -->
|
||||
<div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
|
||||
<ul class=image>
|
||||
<li class=>
|
||||
</ul>
|
||||
</div><!--=TRUNK-END=-->
|
||||
|
||||
<!-- these changes are controlled by the release process. DO NOT MODIFY -->
|
||||
<div id="rc" style="display:none;"><!--=BEGIN=-->
|
||||
<h3><a name=v1.396>What's new in 1.396</a> <!--=DATE=--></h3>
|
||||
<ul class=image>
|
||||
<li class=bug>
|
||||
Fixed a bug in crontab "day of week" handling in locales where a week starts from Monday.
|
||||
@@ -55,12 +63,6 @@ Upcoming changes</a>
|
||||
<li class=rfe>
|
||||
Added auto-completion to the build trigger.
|
||||
</ul>
|
||||
</div><!--=TRUNK-END=-->
|
||||
|
||||
<!-- these changes are controlled by the release process. DO NOT MODIFY -->
|
||||
<div id="rc" style="display:none;"><!--=BEGIN=-->
|
||||
<h3><a name=v1.396>What's new in 1.396</a> <!--=DATE=--></h3>
|
||||
<!--=RC-CHANGES=-->
|
||||
</div><!--=END=-->
|
||||
<h3><a name=v1.395>What's new in 1.395</a> (2011/01/21)</h3>
|
||||
<ul class=image>
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in new issue
Block a user