cobricks-cvscommit

[Cobricks-cvscommit] cobricks2/src/org/cobricks/portal PortalServlet.java

[Michael K. <ko...@us...>]

Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/portal
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15569

Modified Files:
	PortalServlet.java 
Log Message:
Added support for Liberty Alliance Single Sign-On.


Index: PortalServlet.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalServlet.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- PortalServlet.java	8 Dec 2004 15:19:44 -0000	1.33
+++ PortalServlet.java	21 Feb 2005 16:01:57 -0000	1.34
@@ -28,7 +28,9 @@
 import org.cobricks.core.util.LogUtil;
 import org.cobricks.user.User;
 import org.cobricks.user.UserHandler;
-
+import org.cobricks.user.liberty.idff.LAIdffArgs;
+import org.cobricks.user.liberty.idff.LAIdffBridge;
+import org.cobricks.user.liberty.idff.IdentityProvider;
 
 /**
  * This class implements functionality for the Cobricks-2 portal, i.e.
@@ -213,9 +215,33 @@
         HttpServletResponse response = portalRequest.getHttpServletResponse();
 
         logger.info("perfomLogout()");
-	
-        // everything went well ...
+
         HttpSession session = request.getSession(true);
+
+        // begin - Liberty Alliance Single Sign On
+
+        //alle SPSessions für den User löschen, sonst Probleme wenn er gleich wieder ein Login
+        //über den selben SP macht
+        LAIdffBridge bridge = LAIdffBridge.getSingleInstance();
+        IdentityProvider idp = (IdentityProvider)bridge.getCurrentIDP(portalRequest);
+        //wenn idp null, keine aktive Session durch IDP mehr => es muss auch keine beendet werden
+        if(idp != null){
+            String userID = (String)session.getAttribute("login.userlogin");
+            String providerID = idp.getName();
+            
+            LAIdffArgs args = new LAIdffArgs();
+            args.setUserID(userID);
+            args.setProviderID(providerID);
+            args.setRequest(request);
+            args.setResponse(response);
+            
+            logger.debug("calling bridge.removeProviderSessions() with args:" + args);
+            bridge.removeProviderSessions(args);
+        }
+		
+        // end - Liberty Alliance Single Sign On
+        
+        // everything went well ...
         sessionHandler.setSession(session);
         session.setAttribute("login.userlogin", "anonymous");
         String target= portalRequest.getRequestParameter("cmd.success");

[Cobricks-cvscommit] cobricks2/src/org/cobricks/portal PortalServlet.java

[Alexander G. <gaf...@us...>]

Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/portal
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21355/src/org/cobricks/portal

Modified Files:
	PortalServlet.java 
Log Message:
Comments deleted

Index: PortalServlet.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalServlet.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- PortalServlet.java	16 Jan 2006 09:23:58 -0000	1.41
+++ PortalServlet.java	26 Jan 2006 12:38:55 -0000	1.42
@@ -328,7 +328,6 @@
             attrs.put("fullcontext", fullcontext);
         }
         
-        //TODO AGA: Erweiterung
         //If the page should be versiond
         String createwikipage = prequest.getRequestParameter("createwikipage");
         createwikipage = (createwikipage == null) ? "" : createwikipage;
@@ -337,7 +336,6 @@
         } else {
             attrs.put("createwikipage", "false");
         }
-        //ENDE
         
         try {
             int itemid =
@@ -480,7 +478,6 @@
         }
                 
         try {
-            //TODO AGA Should be created a new content version
             String newContentVersion = prequest.
             		getRequestParameter("newContentVersion");
             
@@ -488,12 +485,9 @@
                 newContentVersion;
             if(newContentVersion.equals("true")) {
                 attrs.put("newContentVersion", "true");
-                logger.info("AGA updatePage: new Wiki Version");
             } else {
                 attrs.put("newContentVersion", "false");
-                logger.info("AGA updatePage: no new Wiki Version");
             }
-            //ENDE
             portalManager.updatePage(itemid, attrs, portalUser.getUser());
 
             String hostname = request.getRemoteHost();

[Cobricks-cvscommit] cobricks2/src/org/cobricks/portal PortalServlet.java

[Alexander G. <gaf...@us...>]

Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/portal
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2300/src/org/cobricks/portal

Modified Files:
	PortalServlet.java 
Log Message:


Index: PortalServlet.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalServlet.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- PortalServlet.java	2 Feb 2006 11:39:26 -0000	1.44
+++ PortalServlet.java	2 Feb 2006 17:18:00 -0000	1.45
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2006 Cobricks Group. All rights reserved.
+ * Copyright (c) 2003-2005 Cobricks Group. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted under the terms of the Cobricks Software
@@ -329,14 +329,12 @@
             attrs.put("fullcontext", fullcontext);
         }
         
-        //If the page should be versiond
-        String createwikipage = prequest.getRequestParameter("createwikipage");
-        createwikipage = (createwikipage == null) ? "" : createwikipage;
-        if (createwikipage.equals("true")) {
-            attrs.put("itemclass", "wikipage");
-        } else {
-            attrs.put("itemclass", "portalpagehtml");
+        //Set the itemclass
+        String itemclass = prequest.getRequestParameter("itemclass");
+        if(itemclass == null) {
+            itemclass = "portalpagehtml";
         }
+        attrs.put("itemclass", itemclass);            
         
         try {
             int itemid =