[Yanel-commits] rev 23572 - in public/yanel/trunk/src: build
contributions/resources/yanel-user/src/build
core/java/org/wyona/yanel/servlet
michi at wyona.com
michi at wyona.com
Tue Apr 3 12:29:02 CEST 2007
Author: michi
Date: 2007-04-03 12:29:01 +0200 (Tue, 03 Apr 2007)
New Revision: 23572
Modified:
public/yanel/trunk/src/build/dependencies.xml
public/yanel/trunk/src/contributions/resources/yanel-user/src/build/dependencies.xml
public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java
Log:
serializing identity fixed
Modified: public/yanel/trunk/src/build/dependencies.xml
===================================================================
--- public/yanel/trunk/src/build/dependencies.xml 2007-04-03 09:55:21 UTC (rev 23571)
+++ public/yanel/trunk/src/build/dependencies.xml 2007-04-03 10:29:01 UTC (rev 23572)
@@ -34,7 +34,7 @@
<dependency groupId="wyona-org-commons" artifactId="wyona-org-commons"
version="0.0.1-dev-r22621"/>
<dependency groupId="wyona-org-security" artifactId="wyona-org-security-core"
- version="0.0.1-dev-r23290"/>
+ version="0.0.1-dev-r23559"/>
<!-- TODO: Add to yanel.xml, because these libs are only needed during runtime -->
<dependency groupId="avalon-framework" artifactId="avalon-framework-api"
@@ -60,7 +60,7 @@
<dependency groupId="xalan" artifactId="xalan"
version="2.7.0"/>
<dependency groupId="wyona-org-security" artifactId="wyona-org-security-impl"
- version="0.0.1-dev-r23290"/>
+ version="0.0.1-dev-r23559"/>
<!-- IMPORTANT: Please make sure to update pom-core.xml as well! -->
<dependency groupId="yarep" artifactId="yarep-impl"
version="0.0.1-dev-r23202"/>
Modified: public/yanel/trunk/src/contributions/resources/yanel-user/src/build/dependencies.xml
===================================================================
--- public/yanel/trunk/src/contributions/resources/yanel-user/src/build/dependencies.xml 2007-04-03 09:55:21 UTC (rev 23571)
+++ public/yanel/trunk/src/contributions/resources/yanel-user/src/build/dependencies.xml 2007-04-03 10:29:01 UTC (rev 23572)
@@ -21,9 +21,9 @@
<dependency groupId="avalon-framework" artifactId="avalon-framework-impl"
version="4.3"/>
<dependency groupId="wyona-org-security" artifactId="wyona-org-security-core"
- version="0.0.1-dev-r23290"/>
+ version="0.0.1-dev-r23559"/>
<dependency groupId="wyona-org-security" artifactId="wyona-org-security-impl"
- version="0.0.1-dev-r23290"/>
+ version="0.0.1-dev-r23559"/>
</artifact:dependencies>
<property name="maven2.cp" refid="maven2.classpath"/>
Modified: public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java
===================================================================
--- public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java 2007-04-03 09:55:21 UTC (rev 23571)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java 2007-04-03 10:29:01 UTC (rev 23572)
@@ -61,6 +61,7 @@
import org.wyona.security.core.api.Identity;
import org.wyona.security.core.api.IdentityManager;
+import org.wyona.security.core.api.IdentityMap;
import org.wyona.security.core.api.PolicyManager;
import org.wyona.security.core.api.Role;
import org.wyona.security.core.api.User;
@@ -478,7 +479,7 @@
// note: this will throw an exception if the document is checked out already
// by another user.
Identity identity = getIdentity(request);
- String userID = identity.getUser().getID();
+ String userID = identity.getUsername();
VersionableV2 versionable = (VersionableV2)res;
if (versionable.isCheckedOut()) {
String checkoutUserID = versionable.getCheckoutUserID();
@@ -1379,9 +1380,9 @@
User user = realm.getIdentityManager().getUserManager().getUser(loginUsername);
if (user != null && user.authenticate(request.getParameter("yanel.login.password"))) {
log.debug("Realm: " + realm);
- HashMap identityMap = (HashMap)session.getAttribute(IDENTITY_MAP_KEY);
+ IdentityMap identityMap = (IdentityMap)session.getAttribute(IDENTITY_MAP_KEY);
if (identityMap == null) {
- identityMap = new HashMap();
+ identityMap = new IdentityMap();
session.setAttribute(IDENTITY_MAP_KEY, identityMap);
}
identityMap.put(realm.getID(), new Identity(user));
@@ -1436,9 +1437,9 @@
User user = realm.getIdentityManager().getUserManager().getUser(username);
if (user != null && user.authenticate(password)) {
log.info("Authentication successful: " + username);
- HashMap identityMap = (HashMap)session.getAttribute(IDENTITY_MAP_KEY);
+ IdentityMap identityMap = (IdentityMap)session.getAttribute(IDENTITY_MAP_KEY);
if (identityMap == null) {
- identityMap = new HashMap();
+ identityMap = new IdentityMap();
session.setAttribute(IDENTITY_MAP_KEY, identityMap);
}
identityMap.put(realm.getID(), new Identity(user));
@@ -1546,7 +1547,7 @@
// TODO: should we logout only from the current realm, or from all realms?
// -> logout only from the current realm
Realm realm = map.getRealm(request.getServletPath());
- HashMap identityMap = (HashMap)session.getAttribute(IDENTITY_MAP_KEY);
+ IdentityMap identityMap = (IdentityMap)session.getAttribute(IDENTITY_MAP_KEY);
if (identityMap != null && identityMap.containsKey(realm.getID())) {
identityMap.remove(realm.getID());
}
@@ -1879,7 +1880,7 @@
buf.append("</div>");
Identity identity = getIdentity(request);
if (identity != null) {
- buf.append("<span id=\"yaneltoolbar_user\">User: " + identity.getUser().getID() + " (Realm: " + resource.getRealm().getName() + ")</span>");
+ buf.append("<span id=\"yaneltoolbar_user\">User: " + identity.getUsername() + " (Realm: " + resource.getRealm().getName() + ")</span>");
} else {
buf.append("<span id=\"yaneltoolbar_user\">User: Not signed in!</span>");
}
@@ -1973,7 +1974,7 @@
Realm realm = map.getRealm(request.getServletPath());
HttpSession session = request.getSession(false);
if (session != null) {
- HashMap identityMap = (HashMap)session.getAttribute(IDENTITY_MAP_KEY);
+ IdentityMap identityMap = (IdentityMap)session.getAttribute(IDENTITY_MAP_KEY);
if (identityMap != null) {
return (Identity)identityMap.get(realm.getID());
}
More information about the Yanel-commits
mailing list