diff --git a/core/src/main/java/hudson/PluginWrapper.java b/core/src/main/java/hudson/PluginWrapper.java index a1090dea80218c03ab96b4f16ed14ff924cce7a7..4f7d2a4b7218b055d5936c68ff684baf9d5143b5 100644 --- a/core/src/main/java/hudson/PluginWrapper.java +++ b/core/src/main/java/hudson/PluginWrapper.java @@ -50,8 +50,8 @@ import java.util.Enumeration; import java.util.jar.JarFile; /** - * Represents a Hudson plug-in and associated control information - * for Hudson to control {@link Plugin}. + * Represents a Jenkins plug-in and associated control information + * for Jenkins to control {@link Plugin}. * *
* A plug-in is packaged into a jar file whose extension is ".hpi", @@ -60,9 +60,9 @@ import java.util.jar.JarFile; *
* At the runtime, a plugin has two distinct state axis. *
@@ -104,7 +104,7 @@ public class PluginWrapper implements Comparable
@@ -126,22 +126,22 @@ public abstract class Lifecycle implements ExtensionPoint {
}
/**
- * Replaces hudson.war by the given file.
+ * Replaces jenkins.war by the given file.
*
*
* On some system, most notably Windows, a file being in use cannot be changed,
- * so rewriting hudson.war requires some special trick. Override this method
+ * so rewriting jenkins.war requires some special trick. Override this method
* to do so.
*/
public void rewriteHudsonWar(File by) throws IOException {
File dest = getHudsonWar();
// this should be impossible given the canRewriteHudsonWar method,
// but let's be defensive
- if(dest==null) throw new IOException("hudson.war location is not known.");
+ if(dest==null) throw new IOException("jenkins.war location is not known.");
- // backing up the old hudson.war before it gets lost due to upgrading
- // (newly downloaded hudson.war and 'backup' (hudson.war.tmp) are the same files
- // unless we are trying to rewrite hudson.war by a backup itself
+ // backing up the old jenkins.war before it gets lost due to upgrading
+ // (newly downloaded jenkins.war and 'backup' (jenkins.war.tmp) are the same files
+ // unless we are trying to rewrite jenkins.war by a backup itself
File bak = new File(dest.getPath() + ".bak");
if (!by.equals(bak))
FileUtils.copyFile(dest, bak);
@@ -156,7 +156,7 @@ public abstract class Lifecycle implements ExtensionPoint {
* Can {@link #rewriteHudsonWar(File)} work?
*/
public boolean canRewriteHudsonWar() {
- // if we don't know where hudson.war is, it's impossible to replace.
+ // if we don't know where jenkins.war is, it's impossible to replace.
File f = getHudsonWar();
return f!=null && f.canWrite();
}
diff --git a/core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java b/core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java
index 3a2d44aca04bbd18fad34b42529c556219dd0287..274ba97708f54ccb8f225ef4cc6793272d01e995 100644
--- a/core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java
+++ b/core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java
@@ -55,7 +55,7 @@ import java.net.URL;
public class WindowsInstallerLink extends ManagementLink {
/**
- * Location of the hudson.war.
+ * Location of the jenkins.war.
* In general case, we can't determine this value, yet having this is a requirement for the installer.
*/
private final File hudsonWar;
@@ -65,8 +65,8 @@ public class WindowsInstallerLink extends ManagementLink {
*/
private volatile File installationDir;
- private WindowsInstallerLink(File hudsonWar) {
- this.hudsonWar = hudsonWar;
+ private WindowsInstallerLink(File jenkinsWar) {
+ this.hudsonWar = jenkinsWar;
}
public String getIconFileName() {
diff --git a/core/src/main/java/hudson/lifecycle/WindowsServiceLifecycle.java b/core/src/main/java/hudson/lifecycle/WindowsServiceLifecycle.java
index 30999d6e2edb0f00307d7185df5f836027ee1606..01a6b6f755a1eadb6624d675fd2fec56b11901ae 100644
--- a/core/src/main/java/hudson/lifecycle/WindowsServiceLifecycle.java
+++ b/core/src/main/java/hudson/lifecycle/WindowsServiceLifecycle.java
@@ -87,7 +87,7 @@ public class WindowsServiceLifecycle extends Lifecycle {
}
/**
- * On Windows, hudson.war is locked, so we place a new version under a special name,
+ * On Windows, jenkins.war is locked, so we place a new version under a special name,
* which is picked up by the service wrapper upon restart.
*/
@Override
@@ -98,7 +98,7 @@ public class WindowsServiceLifecycle extends Lifecycle {
if(dest==null) throw new IOException("jenkins.war location is not known.");
// backing up the old jenkins.war before its lost due to upgrading
- // unless we are trying to rewrite hudson.war by a backup itself
+ // unless we are trying to rewrite jenkins.war by a backup itself
File bak = new File(dest.getPath() + ".bak");
if (!by.equals(bak))
FileUtils.copyFile(dest, bak);
diff --git a/core/src/main/java/hudson/model/UpdateSite.java b/core/src/main/java/hudson/model/UpdateSite.java
index 0d888d42fd50ca7b4af5bcf25c0b70df0a2ed60c..d165c77d9845a853bad6c521896638f41f8096b0 100644
--- a/core/src/main/java/hudson/model/UpdateSite.java
+++ b/core/src/main/java/hudson/model/UpdateSite.java
@@ -74,7 +74,7 @@ import javax.servlet.ServletContext;
* Source of the update center information, like "http://jenkins-ci.org/update-center.json"
*
*
- * Hudson can have multiple {@link UpdateSite}s registered in the system, so that it can pick up plugins
+ * Jenkins can have multiple {@link UpdateSite}s registered in the system, so that it can pick up plugins
* from different locations.
*
* @author Andrew Bayer
@@ -173,7 +173,7 @@ public class UpdateSite {
certs.add(c);
}
- // all default root CAs in JVM are trusted, plus certs bundled in Hudson
+ // all default root CAs in JVM are trusted, plus certs bundled in Jenkins
Set