Author: olamy
Date: Sat Dec 8 17:40:08 2012
New Revision: 1418716
URL: http://svn.apache.org/viewvc?rev=1418716&view=rev
Log:
user now track userManagerImpl id they come from
Modified:
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUser.java
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/User.java
archiva/redback/redback-core/trunk/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/User.java
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/mdo/user.mdo
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-memory/src/main/java/org/apache/archiva/redback/users/memory/SimpleUser.java
Modified:
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUser.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUser.java?rev=1418716&r1=1418715&r2=1418716&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUser.java
(original)
+++
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUser.java
Sat Dec 8 17:40:08 2012
@@ -63,6 +63,11 @@ public class LdapUser
private Attributes originalAttributes;
+ /**
+ * @since 2.1
+ */
+ private String userManagerId = "ldap";
+
public LdapUser( String username )
{
this.username = username;
@@ -239,4 +244,9 @@ public class LdapUser
this.originalAttributes = originalAttributes;
}
+ public String getUserManagerId()
+ {
+ return userManagerId;
+ }
+
}
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/User.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/User.java?rev=1418716&r1=1418715&r2=1418716&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/User.java
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/User.java
Sat Dec 8 17:40:08 2012
@@ -70,10 +70,17 @@ public class User
/**
* with some userManagerImpl it's not possible to edit users;
- * @since 1.4-M4
+ * @since 2.1
*/
private boolean readOnly;
+ /**
+ * as we can user multiple userManagers implementation we must track from
which one this one comes.
+ * @since 2.1
+ * @return userManager id
+ */
+ private String userManagerId;
+
public User()
{
// no op
@@ -255,28 +262,37 @@ public class User
this.readOnly = readOnly;
}
+ public String getUserManagerId()
+ {
+ return userManagerId;
+ }
+
+ public void setUserManagerId( String userManagerId )
+ {
+ this.userManagerId = userManagerId;
+ }
+
@Override
public String toString()
{
- final StringBuilder sb = new StringBuilder();
- sb.append( "User" );
- sb.append( "{username='" ).append( username ).append( '\'' );
- sb.append( ", fullName='" ).append( fullName ).append( '\'' );
- sb.append( ", email='" ).append( email ).append( '\'' );
- sb.append( ", validated=" ).append( validated );
- sb.append( ", locked=" ).append( locked );
- sb.append( ", password='" ).append( password ).append( '\'' );
- sb.append( ", passwordChangeRequired=" ).append(
passwordChangeRequired );
- sb.append( ", permanent=" ).append( permanent );
- sb.append( ", confirmPassword='" ).append( confirmPassword ).append(
'\'' );
- sb.append( ", timestampAccountCreation='" ).append(
timestampAccountCreation ).append( '\'' );
- sb.append( ", timestampLastLogin='" ).append( timestampLastLogin
).append( '\'' );
- sb.append( ", timestampLastPasswordChange='" ).append(
timestampLastPasswordChange ).append( '\'' );
- sb.append( ", previousPassword='" ).append( previousPassword ).append(
'\'' );
- sb.append( ", assignedRoles=" ).append( assignedRoles );
- sb.append( ", readOnly=" ).append( readOnly );
- sb.append( '}' );
- return sb.toString();
+ return "User{" +
+ "username='" + username + '\'' +
+ ", fullName='" + fullName + '\'' +
+ ", email='" + email + '\'' +
+ ", validated=" + validated +
+ ", locked=" + locked +
+ //", password='" + password + '\'' +
+ ", passwordChangeRequired=" + passwordChangeRequired +
+ ", permanent=" + permanent +
+ ", confirmPassword='" + confirmPassword + '\'' +
+ ", timestampAccountCreation='" + timestampAccountCreation + '\'' +
+ ", timestampLastLogin='" + timestampLastLogin + '\'' +
+ ", timestampLastPasswordChange='" + timestampLastPasswordChange +
'\'' +
+ ", previousPassword='" + previousPassword + '\'' +
+ ", assignedRoles=" + assignedRoles +
+ ", readOnly=" + readOnly +
+ ", userManagerId='" + userManagerId + '\'' +
+ '}';
}
@Override
Modified:
archiva/redback/redback-core/trunk/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/User.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/User.java?rev=1418716&r1=1418715&r2=1418716&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/User.java
(original)
+++
archiva/redback/redback-core/trunk/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/User.java
Sat Dec 8 17:40:08 2012
@@ -292,4 +292,11 @@ public interface User
*/
void setLastLoginDate( Date date );
+ /**
+ * as we can user multiple userManagers implementation we must track from
which one this one comes.
+ * @since 2.1
+ * @return userManager id
+ */
+ String getUserManagerId();
+
}
Modified:
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/mdo/user.mdo
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/mdo/user.mdo?rev=1418716&r1=1418715&r2=1418716&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/mdo/user.mdo
(original)
+++
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/mdo/user.mdo
Sat Dec 8 17:40:08 2012
@@ -149,6 +149,10 @@
// Intentionally initialize List to avoid JPOX
NullPointerException Issues.
previousEncodedPasswords = new java.util.ArrayList<String>();
}
+ public String getUserManagerId()
+ {
+ return "jdo";
+ }
]]></code>
</codeSegment>
Modified:
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-memory/src/main/java/org/apache/archiva/redback/users/memory/SimpleUser.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-memory/src/main/java/org/apache/archiva/redback/users/memory/SimpleUser.java?rev=1418716&r1=1418715&r2=1418716&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-memory/src/main/java/org/apache/archiva/redback/users/memory/SimpleUser.java
(original)
+++
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-memory/src/main/java/org/apache/archiva/redback/users/memory/SimpleUser.java
Sat Dec 8 17:40:08 2012
@@ -215,4 +215,9 @@ public class SimpleUser
{
this.validated = validated;
}
+
+ public String getUserManagerId()
+ {
+ return "simple";
+ }
}
