Skip to content
Permalink
Browse files

[FIXED JENKINS-22247] Noting merge of #1161.

  • Loading branch information
jglick committed May 22, 2014
1 parent ef949ee commit 484db6b645b8f2963f02861678092c5b235687c4
@@ -55,6 +55,9 @@
<!-- Record your changes in the trunk here. -->
<div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
<ul class=image>
<li class="rfe">
Configurable case sensitivity mode for user IDs.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-22247">issue 22247</a>)
<li class="bug">
Extension point for project naming strategies did not work from actual plugins.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-23127">issue 23127</a>)
@@ -133,7 +133,7 @@ private User(String id, String fullName) {
* {@link hudson.security.SecurityRealm#getUserIdStrategy()}
*
* @return the {@link jenkins.model.IdStrategy} for use with {@link User} instances.
* @since 1.560
* @since 1.566
*/
@Nonnull
public static IdStrategy idStrategy() {
@@ -497,7 +497,7 @@ public static void clear() {

/**
* Called when changing the {@link IdStrategy}.
* @since 1.560
* @since 1.566
*/
public static void rekey() {
final IdStrategy strategy = idStrategy();
@@ -712,7 +712,6 @@ private void rss(StaplerRequest req, StaplerResponse rsp, String suffix, RunList
* {@link java.util.concurrent.locks.ReadWriteLock#readLock()} for normal access and
* {@link java.util.concurrent.locks.ReadWriteLock#writeLock()} for {@link #rekey()} or any other operation
* that requires operating on the map as a whole.
* @since 1.560
*/
private static final ReadWriteLock byNameLock = new ReentrantReadWriteLock();

@@ -156,7 +156,7 @@
*
* @return the {@link IdStrategy} that should be used for turning
* {@link org.acegisecurity.userdetails.UserDetails#getUsername()} into an ID.
* @since 1.560
* @since 1.566
*/
public IdStrategy getUserIdStrategy() {
return IdStrategy.CASE_INSENSITIVE;
@@ -170,7 +170,7 @@ public IdStrategy getUserIdStrategy() {
*
* @return the {@link IdStrategy} that should be used for turning {@link hudson.security.GroupDetails#getName()}
* into an ID.
* @since 1.560
* @since 1.566
*/
public IdStrategy getGroupIdStrategy() {
return getUserIdStrategy();
@@ -37,7 +37,7 @@
/**
* The strategy to use for manipulating converting names (e.g. user names, group names, etc) into ids.
*
* @since 1.560
* @since 1.566
*/
public abstract class IdStrategy extends AbstractDescribableImpl<IdStrategy> implements ExtensionPoint,
Comparator<String> {
@@ -135,8 +135,6 @@ public String toString() {

/**
* The default case insensitive {@link IdStrategy}
*
* @since 1.560
*/
public static class CaseInsensitive extends IdStrategy {

@@ -177,8 +175,6 @@ public String getDisplayName() {

/**
* A case sensitive {@link IdStrategy}
*
* @since 1.560
*/
public static class CaseSensitive extends IdStrategy {

@@ -256,8 +252,6 @@ public String getDisplayName() {
* Note: Not all email addresses are case sensitive. It is knowledge that belongs to the server that holds the
* mailbox. Most sane system administrators do not configure their accounts using case sensitive mailboxes
* but the RFC does allow them the option to configure that way. Domain names are always case insensitive per RFC.
*
* @since 1.560
*/
public static class CaseSensitiveEmailAddress extends CaseSensitive {

@@ -28,7 +28,7 @@
/**
* The {@link hudson.model.Descriptor} for {@link jenkins.model.IdStrategy}
*
* @since 1.560
* @since 1.566
*/
public abstract class IdStrategyDescriptor extends Descriptor<IdStrategy> {

0 comments on commit 484db6b

Please sign in to comment.
You can’t perform that action at this time.