Skip to content

Commit

Permalink
Merge pull request #244 from darxriggs/hudson-jenkins-renaming
Browse files Browse the repository at this point in the history
Replace "Hudson" with "Jenkins"
  • Loading branch information
jglick authored Feb 7, 2020
2 parents c52f92d + d5371b9 commit 8e2a71a
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ example.
CRUMB_ISSUER_URL='crumbIssuer/api/xml?xpath=concat(//crumbRequestField,":",//crumb)'

function notifyCI {
# URL to Hudson/Jenkins server application (with protocol, hostname, port and deployment descriptor if needed)
# URL to Jenkins server application (with protocol, hostname, port and deployment descriptor if needed)
CISERVER=$1

# Check if "[X] Prevent Cross Site Request Forgery exploits" is activated
Expand All @@ -162,7 +162,7 @@ example.
${CISERVER}/${NOTIFY_URL}
}

# The code above was placed in a function so you can easily notify multiple Jenkins/Hudson servers:
# The code above was placed in a function so you can easily notify multiple Jenkins servers:
notifyCI "http://myPC.company.local:8080"
notifyCI "http://jenkins.company.com:8080/jenkins"

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/hudson/scm/SubversionCredentialProvider.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
*/
public abstract class SubversionCredentialProvider implements ExtensionPoint {
/**
* Called whenever Hudson needs to connect to an authenticated subversion repository,
* Called whenever Jenkins needs to connect to an authenticated subversion repository,
* to obtain a credential.
*
* @param realm
Expand All @@ -51,7 +51,7 @@ public abstract class SubversionCredentialProvider implements ExtensionPoint {
* URL that is being accessed. Never null.
* @return
* null if the implementation doesn't understand the given realm. When null is returned,
* Hudson searches other sources of credentials to come up with one.
* Jenkins searches other sources of credentials to come up with one.
*/
public abstract Credential getCredential(SVNURL url, String realm);

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/hudson/scm/SubversionSCM.java
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@
* <h2>Plugin Developer Notes</h2>
* <p>
* Plugins that interact with Subversion can use {@link DescriptorImpl#createAuthenticationProvider(AbstractProject)}
* so that it can use the credentials (username, password, etc.) that the user entered for Hudson.
* so that it can use the credentials (username, password, etc.) that the user entered for Jenkins.
* See the javadoc of this method for the precautions you need to take if you run Subversion operations
* remotely on slaves.
*
Expand Down Expand Up @@ -2220,7 +2220,7 @@ public ISVNAuthenticationProvider createAuthenticationProvider(AbstractProject<?

/**
* @deprecated as of 1.18
* Now that Hudson allows different credentials to be given in different jobs,
* Now that Jenkins allows different credentials to be given in different jobs,
* The caller should use {@link #createAuthenticationProvider(AbstractProject)} to indicate
* the project in which the subversion operation is performed.
*/
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/hudson/scm/UserProvidedCredential.java
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public class UserProvidedCredential implements Closeable {
private final File keyFile;
/**
* If non-null, this credential is submitted primarily to be used with this project.
* This actually doesn't prevent Hudson from trying it with other projects.
* This actually doesn't prevent Jenkins from trying it with other projects.
*/
public final AbstractProject inContextOf;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/hudson/scm/browsers/CollabNetSVN.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

/**
* {@link RepositoryBrowser} implementation for CollabNet hosted Subversion repositories.
* This enables Hudson to integrate with the repository browsers built-in to CollabNet-powered
* This enables Jenkins to integrate with the repository browsers built-in to CollabNet-powered
* sites such as Java.net and Tigris.org.
* @author Daniel Dyer
*/
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/hudson/scm/subversion/WorkspaceUpdater.java
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public static abstract class UpdateTask implements Serializable {
public SvnClientManager clientManager;

/**
* Encapusulates the authentication. Connected back to Hudson master. Never null.
* Encapusulates the authentication. Connected back to Jenkins master. Never null.
*/
public ISVNAuthenticationProvider authProvider;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ SubversionSCM.pollChanges.locationsNoLongerExist=\
SubversionSCM.pollChanges.ignoredRevision.noincpath=Hay rutas de exclusión

SubversionSCM.ClockOutOfSync=ATENCION: \
La fecha del servidor de "subversion" parece no estar sincronizado con el nodo de Hudson.\
La fecha del servidor de "subversion" parece no estar sincronizado con el nodo de Jenkins.\
Esto puede provocar resultados inconsistentes al preguntar por el estado del proyecto.

SubversionTagAction.DisplayName.HasNoTag=Etiquetar esta ejecución
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# THE SOFTWARE.

SubversionSCM.ClockOutOfSync=\
\u8b66\u544a: Subversion\u30b5\u30fc\u30d0\u306e\u30af\u30ed\u30c3\u30af\u3068Hudson\u306e\u30af\u30ed\u30c3\u30af\u304c\u305a\u308c\u3066\u3044\u308b\u3088\u3046\u3067\u3059\u3002\u3053\u308c\u306b\u3088\u3063\u3066\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u52d5\u4f5c\u306b\u652f\u969c\u304c\u51fa\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002
\u8b66\u544a: Subversion\u30b5\u30fc\u30d0\u306e\u30af\u30ed\u30c3\u30af\u3068Jenkins\u306e\u30af\u30ed\u30c3\u30af\u304c\u305a\u308c\u3066\u3044\u308b\u3088\u3046\u3067\u3059\u3002\u3053\u308c\u306b\u3088\u3063\u3066\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u52d5\u4f5c\u306b\u652f\u969c\u304c\u51fa\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002
SubversionSCM.doCheckRemote.badPath=\
{0} \u306f\u3001\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u306f\u5b58\u5728\u3057\u307e\u305b\u3093\u3002
SubversionSCM.doCheckRemote.badPathSuggest=\
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/hudson/scm/SubversionSCMTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -1255,14 +1255,14 @@ public void infiniteLoop() throws Exception {
return; // yep
}
}
fail("Hudson didn't try authentication");
fail("Jenkins didn't try authentication");
}
}
fail("Looks like we went into an infinite loop");
}

/**
* Even if the default providers remember bogus passwords, Hudson should still attempt what it knows.
* Even if the default providers remember bogus passwords, Jenkins should still attempt what it knows.
*/
@Issue("JENKINS-3936")
@Ignore("TODO verify that this test case is invalid for new credentials based world order")
Expand Down Expand Up @@ -1290,10 +1290,10 @@ public void retainBogusPasswords() throws Exception {
}

// make sure the failure didn't clean up the cache,
// since what we want to test here is Hudson trying to supply its credential, despite the failed cache
// since what we want to test here is Jenkins trying to supply its credential, despite the failed cache
assertTrue(SubversionSCM.compareSVNAuthentications(m.getFirstAuthentication(kind, realm, repo),bogus));

// now let Hudson have the real credential
// now let Jenkins have the real credential
// can we now access the repo?
r.jenkins.getDescriptorByType(SubversionSCM.DescriptorImpl.class).postCredential(null,repo.toDecodedString(),"guest","",null,new PrintWriter(System.out));
attemptAccess(m);
Expand Down

0 comments on commit 8e2a71a

Please sign in to comment.