Author: michiel
Date: 2010-07-11 13:14:18 +0200 (Sun, 11 Jul 2010)
New Revision: 42853
Modified:
mmbase/trunk/contributions/aselect/pom.xml
mmbase/trunk/contributions/aselect/src/main/java/org/mmbase/security/implementation/aselect/ASelectAuthentication.java
mmbase/trunk/contributions/aselect/src/main/java/org/mmbase/security/implementation/aselect/ASelectCloudContextUser.java
mmbase/trunk/contributions/aselect/src/main/java/org/mmbase/security/implementation/aselect/ASelectUser.java
Log:
didn't compile
Modified: mmbase/trunk/contributions/aselect/pom.xml
===================================================================
--- mmbase/trunk/contributions/aselect/pom.xml 2010-07-09 19:06:28 UTC (rev
42852)
+++ mmbase/trunk/contributions/aselect/pom.xml 2010-07-11 11:14:18 UTC (rev
42853)
@@ -44,6 +44,11 @@
</dependency>
<dependency>
<groupId>org.mmbase</groupId>
+ <artifactId>mmbase</artifactId>
+ <version>${mmbase.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mmbase</groupId>
<artifactId>mmbase-cloudcontext</artifactId>
<version>${mmbase.version}</version>
<classifier>classes</classifier>
Modified:
mmbase/trunk/contributions/aselect/src/main/java/org/mmbase/security/implementation/aselect/ASelectAuthentication.java
===================================================================
---
mmbase/trunk/contributions/aselect/src/main/java/org/mmbase/security/implementation/aselect/ASelectAuthentication.java
2010-07-09 19:06:28 UTC (rev 42852)
+++
mmbase/trunk/contributions/aselect/src/main/java/org/mmbase/security/implementation/aselect/ASelectAuthentication.java
2010-07-11 11:14:18 UTC (rev 42853)
@@ -354,9 +354,9 @@
protected UserContext getAnonymousUser() {
if (useCloudContext) {
Users users = Users.getBuilder();
- return new ASelectCloudContextUser(users.getAnonymousUser(),
getKey(), "anonymous");
+ return new ASelectCloudContextUser(this, users.getAnonymousUser(),
getKey(), "anonymous");
} else {
- return new ASelectUser("anonymous", Rank.ANONYMOUS, getKey(),
"anonymous");
+ return new ASelectUser(this, "anonymous", Rank.ANONYMOUS,
getKey(), "anonymous");
}
}
@@ -401,7 +401,7 @@
r = rank != null ? Rank.BASICUSER : Rank.getRank(rank);
}
if (userName == null) throw new SecurityException("Should
specify at least a username or a rank for class authenication (given " + li +
":" + li.getMap() + ")");
- return new ASelectCloudContextUser(userName, getKey(),
"class", r.toString());
+ return new ASelectCloudContextUser(this, userName, getKey(),
"class", r.toString());
} else {
if (userName == null) {
if (rank != null) {
@@ -414,7 +414,7 @@
} else {
r = Rank.getRank(rank);
}
- return new ASelectUser(userName, r, getKey(), "class");
+ return new ASelectUser(this, userName, r, getKey(), "class");
}
}
@@ -479,10 +479,10 @@
String userName = getASelectUserId(request);
if (useCloudContext) {
String r = knownUsers.getProperty(userName);
- newUser = new ASelectCloudContextUser(userName, getKey(),
application, r);
+ newUser = new ASelectCloudContextUser(this, userName,
getKey(), application, r);
} else {
Rank rank = getRank(userName);
- newUser = new ASelectUser(userName, rank, getKey(),
application);
+ newUser = new ASelectUser(this, userName, rank, getKey(),
application);
}
} else {
log.debug("User not fully authenticated and has been
redirected to A-Select Agent.");
@@ -512,10 +512,10 @@
}
if (useCloudContext) {
String r = knownUsers.getProperty(userName);
- newUser = new ASelectCloudContextUser(userName,
getKey(), application, r);
+ newUser = new ASelectCloudContextUser(this, userName,
getKey(), application, r);
} else {
Rank rank = getRank(userName);
- newUser = new ASelectUser(userName, rank, getKey(),
application);
+ newUser = new ASelectUser(this, userName, rank,
getKey(), application);
}
if (requiredRank != null && newUser.getRank().getInt() <
requiredRank.getInt()) {
if (log.isDebugEnabled()) {
Modified:
mmbase/trunk/contributions/aselect/src/main/java/org/mmbase/security/implementation/aselect/ASelectCloudContextUser.java
===================================================================
---
mmbase/trunk/contributions/aselect/src/main/java/org/mmbase/security/implementation/aselect/ASelectCloudContextUser.java
2010-07-09 19:06:28 UTC (rev 42852)
+++
mmbase/trunk/contributions/aselect/src/main/java/org/mmbase/security/implementation/aselect/ASelectCloudContextUser.java
2010-07-11 11:14:18 UTC (rev 42853)
@@ -37,15 +37,15 @@
private static final Logger log =
Logging.getLoggerInstance(ASelectCloudContextUser.class);
- protected ASelectCloudContextUser(MMObjectNode node, long number, String
app) {
- super(node, number, app);
+ protected ASelectCloudContextUser(Authentication a, MMObjectNode node,
long number, String app) {
+ super(a, node, number, app);
}
private String rank = null;
// constructor, perhaps needs more argumetns
- protected ASelectCloudContextUser(String userName, long number, String
app, String rank) {
- super(getUser(userName, rank), number, app);
+ protected ASelectCloudContextUser(Authentication a, String userName, long
number, String app, String rank) {
+ super(a, getUser(userName, rank), number, app);
if (! "".equals(rank)) {
this.rank = rank;
}
Modified:
mmbase/trunk/contributions/aselect/src/main/java/org/mmbase/security/implementation/aselect/ASelectUser.java
===================================================================
---
mmbase/trunk/contributions/aselect/src/main/java/org/mmbase/security/implementation/aselect/ASelectUser.java
2010-07-09 19:06:28 UTC (rev 42852)
+++
mmbase/trunk/contributions/aselect/src/main/java/org/mmbase/security/implementation/aselect/ASelectUser.java
2010-07-11 11:14:18 UTC (rev 42853)
@@ -32,30 +32,23 @@
private static final Logger log =
Logging.getLoggerInstance(ASelectUser.class);
private static final long serialVersionUID = 1;
- private String identifier;
private Rank rank;
long key;
// constructor, perhaps needs more argumetns
- public ASelectUser(String name, Rank r, long uniqueNumber, String app) {
- super(app);
+ public ASelectUser(Authentication a, String name, Rank r, long
uniqueNumber, String app) {
+ super(a, app, name);
if (log.isDebugEnabled()) {
log.debug("Instantiating " + name);
}
- identifier = name;
rank = r;
key = uniqueNumber;
}
// javadoc inherited
- public String getIdentifier() {
- return identifier;
- }
-
- // javadoc inherited
public String getOwnerField() {
return getIdentifier();
}
@@ -63,18 +56,7 @@
public Rank getRank() throws SecurityException {
return rank;
}
- private void readObject(java.io.ObjectInputStream in) throws
java.io.IOException, ClassNotFoundException {
- identifier = in.readUTF();
- rank = (Rank)in.readObject();
- key = in.readLong();
- }
- private void writeObject(java.io.ObjectOutputStream out) throws
java.io.IOException {
- out.writeUTF(identifier);
- out.writeObject(rank);
- out.writeLong(key);
- }
-
public boolean equals(Object o) {
if (o instanceof ASelectUser) {
ASelectUser ou = (ASelectUser) o;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
