Update of
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets
In directory
james.mmbase.org:/tmp/cvs-serv2360/cmsc/portlets/src/java/com/finalist/cmsc/portlets
Modified Files:
Tag: b1_4
CmscPortlet.java IFramePortlet.java
Log Message:
Removed commnunity calls from core portlets.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets
Index: CmscPortlet.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/CmscPortlet.java,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -u -b -r1.16.2.1 -r1.16.2.2
--- CmscPortlet.java 5 Apr 2008 21:52:47 -0000 1.16.2.1
+++ CmscPortlet.java 7 Apr 2008 09:46:25 -0000 1.16.2.2
@@ -24,7 +24,6 @@
import com.finalist.cmsc.beans.om.View;
import com.finalist.cmsc.portalImpl.PortalConstants;
import com.finalist.cmsc.security.SecurityUtil;
-import com.finalist.cmsc.services.community.Community;
import com.finalist.cmsc.services.sitemanagement.SiteManagement;
import com.finalist.cmsc.services.sitemanagement.SiteManagementAdmin;
import com.finalist.cmsc.util.bundles.CombinedResourceBundle;
@@ -36,7 +35,6 @@
private static final String CONTENT_TYPE = "contenttype";
private static final String CONTENT_TYPE_DEFAULT = "text/html";
- private static final String REQ_ATTR_COMMUNITY_AUTHENTICATED =
"communityauthenticated";
private Log log;
@@ -340,7 +338,6 @@
protected void doView(RenderRequest req, RenderResponse res) throws
PortletException, java.io.IOException {
PortletPreferences preferences = req.getPreferences();
String template =
preferences.getValue(PortalConstants.CMSC_PORTLET_VIEW_TEMPLATE, null);
- setAttribute(req, REQ_ATTR_COMMUNITY_AUTHENTICATED, isUserLoggedIn());
doInclude("view", template, req, res);
}
@@ -581,8 +578,4 @@
return (PortletFragment)
servletRequest.getAttribute(PortalConstants.FRAGMENT);
}
- protected boolean isUserLoggedIn() {
- return Community.isAuthenticated();
- }
-
}
Index: IFramePortlet.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/IFramePortlet.java,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -u -b -r1.5.2.3 -r1.5.2.4
--- IFramePortlet.java 1 Apr 2008 12:19:51 -0000 1.5.2.3
+++ IFramePortlet.java 7 Apr 2008 09:46:25 -0000 1.5.2.4
@@ -14,7 +14,6 @@
import javax.portlet.*;
import com.finalist.cmsc.portalImpl.PortalConstants;
-import com.finalist.cmsc.services.community.Community;
/**
* IFramePortlet
@@ -33,7 +32,6 @@
public static final String NAME_ATTR_PARAM = "name";
public static final String SCROLLING_ATTR_PARAM = "scrolling";
public static final String SOURCE_ATTR_PARAM = "source";
- public static final String SOURCE_REQ_PARAM = "source";
public static final String STYLE_ATTR_PARAM = "style";
public static final String WIDTH_ATTR_PARAM = "width";
@@ -95,13 +93,6 @@
// get IFRAME source
String source = getPreference(preferences, SOURCE_ATTR_PARAM,
SOURCE_ATTR_DEFAULT);
- if(request.getParameter(SOURCE_REQ_PARAM) != null) source =
request.getParameter(SOURCE_REQ_PARAM);
-
- if(Community.isAuthenticated()){
- // TODO
- // add username and password from community to the source, if they
are available
- }
-
// IFRAME attribute members.
String alignAttr = getPreference(preferences, ALIGN_ATTR_PARAM,
ALIGN_ATTR_DEFAULT);
String classAttr = getPreference(preferences, CLASS_ATTR_PARAM, null);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
