You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2003/08/20 20:54:46 UTC
cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/logicsheets util.xsl
andreas 2003/08/20 11:54:46
Modified: src/java/org/apache/lenya/cms/cocoon/logicsheets util.xsl
Log:
removed old identity
Revision Changes Path
1.27 +4 -8 cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/logicsheets/util.xsl
Index: util.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/logicsheets/util.xsl,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- util.xsl 30 Jul 2003 16:46:12 -0000 1.26
+++ util.xsl 20 Aug 2003 18:54:46 -0000 1.27
@@ -83,15 +83,11 @@
</xsp:content>
Session xsp_lenya_session = request.getSession(true);
- Identity xsp_lenya_id = null;
- org.apache.lenya.cms.ac2.Identity xsp_lenya_id_two = null;
if (xsp_lenya_session != null) {
- xsp_lenya_id = (Identity)xsp_lenya_session.getAttribute("org.apache.lenya.cms.ac.Identity");
- xsp_lenya_id_two = (org.apache.lenya.cms.ac2.Identity)xsp_lenya_session.getAttribute("org.apache.lenya.cms.ac2.Identity");
- if (xsp_lenya_id != null) {
- <xsp:content><current_username><xsp:expr>xsp_lenya_id.getUsername()</xsp:expr></current_username></xsp:content>
- } else if (xsp_lenya_id_two != null && xsp_lenya_id_two.getUser() != null) {
- <xsp:content><current_username><xsp:expr>xsp_lenya_id_two.getUser().getId()</xsp:expr></current_username></xsp:content>
+ org.apache.lenya.cms.ac2.Identity xsp_lenya_id
+ = (org.apache.lenya.cms.ac2.Identity)xsp_lenya_session.getAttribute(org.apache.lenya.cms.ac2.Identity.class.getName());
+ if (xsp_lenya_id != null && xsp_lenya_id.getUser() != null) {
+ <xsp:content><current_username><xsp:expr>xsp_lenya_id.getUser().getId()</xsp:expr></current_username></xsp:content>
} else {
<xsp:content><no_username_yet/></xsp:content>
}
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org