[MMBASE SCM] r41813 - CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/resources
Author: kevinshen Date: 2010-04-09 04:36:25 +0200 (Fri, 09 Apr 2010) New Revision: 41813 Modified: CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/resources/cmsc_nl.properties Log: CMSC-1459 Problem with previewing content that isnt linked to a page Modified: CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/resources/cmsc_nl.properties === --- CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/resources/cmsc_nl.properties 2010-04-09 02:35:48 UTC (rev 41812) +++ CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/resources/cmsc_nl.properties 2010-04-09 02:36:25 UTC (rev 41813) @@ -217,4 +217,4 @@ asset.notimage.warning = Alleen plaatjes toegestaan! simple.editor.login.title=Simple Editor Login -exception.404.no.previewpage= No preview page found for content element \ No newline at end of file +exception.404.no.previewpage= Geen voorbeeld pagina gevonden voor dit content element \ No newline at end of file ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r41812 - CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/resources
Author: kevinshen Date: 2010-04-09 04:35:48 +0200 (Fri, 09 Apr 2010) New Revision: 41812 Modified: CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/resources/cmsc_nl.properties Log: CMSC-1459 Problem with previewing content that isnt linked to a page Modified: CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/resources/cmsc_nl.properties === --- CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/resources/cmsc_nl.properties 2010-04-09 00:34:13 UTC (rev 41811) +++ CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/resources/cmsc_nl.properties 2010-04-09 02:35:48 UTC (rev 41812) @@ -216,4 +216,4 @@ asset.notimage.warning = Alleen plaatjes toegestaan! simple.editor.login.title=Simple Editor Login -exception.404.no.previewpage= No preview page found for content element \ No newline at end of file +exception.404.no.previewpage= Geen voorbeeld pagina gevonden voor dit content element \ No newline at end of file ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r41811 - CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/error
Author: kevinshen Date: 2010-04-09 02:34:13 +0200 (Fri, 09 Apr 2010) New Revision: 41811 Modified: CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/error/nopreview.jsp Log: CMSC-1459 Problem with previewing content that isnt linked to a page Modified: CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/error/nopreview.jsp === --- CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/error/nopreview.jsp 2010-04-09 00:31:44 UTC (rev 41810) +++ CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/error/nopreview.jsp 2010-04-09 00:34:13 UTC (rev 41811) @@ -3,7 +3,6 @@ <%...@include file="header.jsp"%> - No preview page found for content element <%...@include file="footer.jsp"%> ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r41810 - CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/webapp/error
Author: kevinshen Date: 2010-04-09 02:31:44 +0200 (Fri, 09 Apr 2010) New Revision: 41810 Modified: CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/webapp/error/nopreview.jsp Log: CMSC-1459 Problem with previewing content that isnt linked to a page Modified: CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/webapp/error/nopreview.jsp === --- CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/webapp/error/nopreview.jsp 2010-04-08 21:26:32 UTC (rev 41809) +++ CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/webapp/error/nopreview.jsp 2010-04-09 00:31:44 UTC (rev 41810) @@ -3,7 +3,6 @@ <%...@include file="header.jsp"%> - No preview page found for content element <%...@include file="footer.jsp"%> ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r41784 - in CMSContainer/branches/b1_7/CMSContainer/cmsc: edit-webapp/resources edit-webapp/src/webapp/error portal/src/java/com/finalist/cmsc/portalImpl
Author: kevinshen
Date: 2010-04-08 10:46:23 +0200 (Thu, 08 Apr 2010)
New Revision: 41784
Added:
CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/webapp/error/nopreview.jsp
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/resources/cmsc.properties
CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/resources/cmsc_nl.properties
CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/resources/cmsc_zh.properties
CMSContainer/branches/b1_7/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/PortalErrorServlet.java
Log:
CMSC-1459 Problem with previewing content that isnt linked to a page
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/resources/cmsc.properties
===
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/resources/cmsc.properties
2010-04-08 08:39:44 UTC (rev 41783)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/resources/cmsc.properties
2010-04-08 08:46:23 UTC (rev 41784)
@@ -217,4 +217,5 @@
modules.glossary = Glossary
asset.notimage.warning = Only image files allowed!
-simple.editor.login.title=Simple Editor Login
\ No newline at end of file
+simple.editor.login.title=Simple Editor Login
+exception.404.no.previewpage= No preview page found for content element
\ No newline at end of file
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/resources/cmsc_nl.properties
===
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/resources/cmsc_nl.properties
2010-04-08 08:39:44 UTC (rev 41783)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/resources/cmsc_nl.properties
2010-04-08 08:46:23 UTC (rev 41784)
@@ -215,4 +215,5 @@
modules.glossary=Glossary
asset.notimage.warning = Alleen plaatjes toegestaan!
-simple.editor.login.title=Simple Editor Login
\ No newline at end of file
+simple.editor.login.title=Simple Editor Login
+exception.404.no.previewpage= No preview page found for content element
\ No newline at end of file
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/resources/cmsc_zh.properties
===
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/resources/cmsc_zh.properties
2010-04-08 08:39:44 UTC (rev 41783)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/resources/cmsc_zh.properties
2010-04-08 08:46:23 UTC (rev 41784)
@@ -211,4 +211,5 @@
modules.glossary=Glossary
asset.notimage.warning = 只允许图片文件上传!
-simple.editor.login.title=简单编辑器登录
\ No newline at end of file
+simple.editor.login.title=简单编辑器登录
+exception.404.no.previewpage= 没有相关的预览页面!
\ No newline at end of file
Added:
CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/webapp/error/nopreview.jsp
===
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/webapp/error/nopreview.jsp
(rev 0)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/webapp/error/nopreview.jsp
2010-04-08 08:46:23 UTC (rev 41784)
@@ -0,0 +1,9 @@
+<%...@page language="java" contentType="text/html;charset=UTF-8"%>
+<%...@include file="globals.jsp"%>
+
+<%...@include file="header.jsp"%>
+
+ No preview page found for content element
+<%...@include file="footer.jsp"%>
+
+
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/PortalErrorServlet.java
===
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/PortalErrorServlet.java
2010-04-08 08:39:44 UTC (rev 41783)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/PortalErrorServlet.java
2010-04-08 08:46:23 UTC (rev 41784)
@@ -12,6 +12,7 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.util.List;
+import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.servlet.RequestDispatcher;
@@ -68,6 +69,8 @@
private static final String SIMPLE_404 =
"(.*/editors/.*[.](jpg$|gif$|png$|css$|js$|ico$))|robots.txt";
+ private static final Pattern FILE_PATTERN =
Pattern.compile(".*?\\D((?:session=.*?\\+)?\\d+(?:\\+.+?)?)(/.*)?");
+
private Pattern excludePattern = Pattern.compile(SIMPLE_404);
protected static final String[] vars = { ERROR_STATUS_CODE,
ERROR_EXCEPTION_TYPE,
@@ -127,6 +130,22 @@
break;
}
}
+ if(statusCode == 404 && ServerUtil.isStaging() &&
!ServerUtil.useServerName()) {
+ Matcher m
[MMBASE SCM] r41649 - CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl
Author: kevinshen
Date: 2010-03-29 05:31:30 +0200 (Mon, 29 Mar 2010)
New Revision: 41649
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/PortalErrorServlet.java
Log:
CMSC-1459 Problem with previewing content that isnt linked to a page
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/PortalErrorServlet.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/PortalErrorServlet.java
2010-03-26 17:06:48 UTC (rev 41648)
+++
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/PortalErrorServlet.java
2010-03-29 03:31:30 UTC (rev 41649)
@@ -123,7 +123,14 @@
}
}
else {
-if(statusCode == 404 && !ServerUtil.useServerName()) {
+ List sites = SiteManagement.getSites();
+ for (Site site2 : sites) {
+ if (SiteManagement.isNavigation(site2.getUrlfragment() +
PATH_SP + statusCode)) {
+ errorPageSite = site2;
+ break;
+ }
+ }
+ if(statusCode == 404 && ServerUtil.isStaging() &&
!ServerUtil.useServerName()) {
Matcher m = FILE_PATTERN.matcher(path);
String redirectPath = "";
if (m.matches()) {
@@ -139,13 +146,6 @@
return;
}
}
- List sites = SiteManagement.getSites();
- for (Site site2 : sites) {
- if (SiteManagement.isNavigation(site2.getUrlfragment() +
PATH_SP + statusCode)) {
- errorPageSite = site2;
- break;
- }
- }
}
logError(request);
if (errorPageSite != null) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r41586 - in CMSContainer/trunk/CMSContainer/cmsc: edit-webapp/resources edit-webapp/src/webapp/error portal/src/java/com/finalist/cmsc/portalImpl
Author: kevinshen
Date: 2010-03-24 08:29:57 +0100 (Wed, 24 Mar 2010)
New Revision: 41586
Added:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/error/nopreview.jsp
Modified:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/resources/cmsc.properties
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/resources/cmsc_nl.properties
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/resources/cmsc_zh.properties
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/PortalErrorServlet.java
Log:
CMSC-1459 Problem with previewing content that isnt linked to a page
Modified:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/resources/cmsc.properties
===
--- CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/resources/cmsc.properties
2010-03-23 18:27:28 UTC (rev 41585)
+++ CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/resources/cmsc.properties
2010-03-24 07:29:57 UTC (rev 41586)
@@ -218,4 +218,5 @@
modules.glossary = Glossary
asset.notimage.warning = Only image files allowed!
-simple.editor.login.title=Simple Editor Login
\ No newline at end of file
+simple.editor.login.title=Simple Editor Login
+exception.404.no.previewpage= No preview page found for content element
Modified:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/resources/cmsc_nl.properties
===
---
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/resources/cmsc_nl.properties
2010-03-23 18:27:28 UTC (rev 41585)
+++
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/resources/cmsc_nl.properties
2010-03-24 07:29:57 UTC (rev 41586)
@@ -216,4 +216,5 @@
modules.glossary=Glossary
asset.notimage.warning = Alleen plaatjes toegestaan!
-simple.editor.login.title=Simple Editor Login
\ No newline at end of file
+simple.editor.login.title=Simple Editor Login
+exception.404.no.previewpage= No preview page found for content element
\ No newline at end of file
Modified:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/resources/cmsc_zh.properties
===
---
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/resources/cmsc_zh.properties
2010-03-23 18:27:28 UTC (rev 41585)
+++
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/resources/cmsc_zh.properties
2010-03-24 07:29:57 UTC (rev 41586)
@@ -212,4 +212,5 @@
modules.glossary=Glossary
asset.notimage.warning = 只允许图片文件上传!
-simple.editor.login.title=简单编辑器登录
\ No newline at end of file
+simple.editor.login.title=简单编辑器登录
+exception.404.no.previewpage= 没有相关的预览页面!
\ No newline at end of file
Added:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/error/nopreview.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/error/nopreview.jsp
(rev 0)
+++
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/error/nopreview.jsp
2010-03-24 07:29:57 UTC (rev 41586)
@@ -0,0 +1,9 @@
+<%...@page language="java" contentType="text/html;charset=UTF-8"%>
+<%...@include file="globals.jsp"%>
+
+<%...@include file="header.jsp"%>
+
+ No preview page found for content element
+<%...@include file="footer.jsp"%>
+
+
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/PortalErrorServlet.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/PortalErrorServlet.java
2010-03-23 18:27:28 UTC (rev 41585)
+++
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/PortalErrorServlet.java
2010-03-24 07:29:57 UTC (rev 41586)
@@ -12,6 +12,7 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.util.List;
+import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.servlet.RequestDispatcher;
@@ -68,6 +69,8 @@
private static final String SIMPLE_404 =
"(.*/editors/.*[.](jpg$|gif$|png$|css$|js$|ico$))|robots.txt";
+ private static final Pattern FILE_PATTERN =
Pattern.compile(".*?\\D((?:session=.*?\\+)?\\d+(?:\\+.+?)?)(/.*)?");
+
private Pattern excludePattern = Pattern.compile(SIMPLE_404);
protected static final String[] vars = { ERROR_STATUS_CODE,
ERROR_EXCEPTION_TYPE,
@@ -120,6 +123,22 @@
}
}
else {
+if(statusCode == 404 && !ServerUtil.useServerName()) {
+ Matcher m = FILE_PATTERN.matcher(path);
+ String redirectPath = "";
+ if (m.matches()) {
+ if (request.getContextPath() != null) {
+red
[MMBASE SCM] r41455 - in CMSContainer/trunk/CMSContainer/cmsc: portal/src/java/com/finalist/cmsc/portalImpl sitemanagement/config/applications sitemanagement/config/builders/sitemanagement sitemanagem
Author: kevinshen
Date: 2010-03-17 09:23:00 +0100 (Wed, 17 Mar 2010)
New Revision: 41455
Added:
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/builders/sitemanagement/pageproperty.xml
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/pageproperty/
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/pageproperty/search_page_insrel_pageproperty.xml
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/InsertPagePropertyTag.java
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/PageNavigationItemManager.java
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/applications/sitemanagement.xml
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/beans/om/Page.java
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/PagesUtil.java
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/page/edit_page.xml
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/page/load_page.xml
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/tld/cmsc.tld
Log:
CMSC-1641 Properties for pages, sites and newsletters
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/PageNavigationItemManager.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/PageNavigationItemManager.java
2010-03-17 08:14:05 UTC (rev 41454)
+++
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/PageNavigationItemManager.java
2010-03-17 08:23:00 UTC (rev 41455)
@@ -83,6 +83,7 @@
loadLayout(node, page);
loadStylesheet(node, page);
loadPageImages(node, page);
+ loadPageProperties(node, page);
return page;
}
@@ -111,6 +112,11 @@
page.setPageImages(pageImages);
}
+ protected void loadPageProperties(Node pageNode, Page page) {
+ Map pageProperties =
PagesUtil.getPageProperties(pageNode);
+ page.setPageProperties(pageProperties);
+ }
+
/**
* publishing of sites and pages is done by the publish module
*
Modified:
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/applications/sitemanagement.xml
===
---
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/applications/sitemanagement.xml
2010-03-17 08:14:05 UTC (rev 41454)
+++
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/applications/sitemanagement.xml
2010-03-17 08:23:00 UTC (rev 41455)
@@ -66,6 +66,7 @@
+
Added:
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/builders/sitemanagement/pageproperty.xml
===
---
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/builders/sitemanagement/pageproperty.xml
(rev 0)
+++
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/builders/sitemanagement/pageproperty.xml
2010-03-17 08:23:00 UTC (rev 41455)
@@ -0,0 +1,42 @@
+
+http://www.mmbase.org/xmlns/builder";
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://www.mmbase.org/xmlns/builder
http://www.mmbase.org/xmlns/builder.xsd";>
+
+Page Property
+Page Property
+页面属性
+Page Property
+Page Property
+页面属性
+
+
+
+
+
+Sleutel
+Key
+属性关键字
+
+
+
+
+http://www.mmbase.org/xmlns/datatypes";>
+
+
+
+
+
+Waarde
+Value
+属性值
+
+
+
+
+http://www.mmbase.org/xmlns/datatypes";>
+
+
+
+
+
Modified:
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/beans/om/Page.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/beans/om/Page.java
2010-03-17 08:14:05 UTC (rev 41454)
+++
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/beans/om/Page.java
2010-03-17 08:23:00 UTC (rev 41455)
@@ -23,18 +23,24 @@
private int layout;
private List stylesheet = new ArrayList();
private Map> pageImages = new
HashMap>();
+ private Map pageProperties = new HashMap();
-
public int getLayout() {
return layout;
}
-
-
+
public void setLayout(int layout) {
[MMBASE SCM] r41454 - in CMSContainer/branches/b1_7: CMSContainer/cmsc/basicmodel/config/applications CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl CMSContainer/cmsc/portlets/config/a
Author: kevinshen Date: 2010-03-17 09:14:05 +0100 (Wed, 17 Mar 2010) New Revision: 41454 Added: CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/config/builders/sitemanagement/pageproperty.xml CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/pageproperty/ CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/pageproperty/search_page_insrel_pageproperty.xml CMSContainer/branches/b1_7/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/InsertPagePropertyTag.java Modified: CMSContainer/branches/b1_7/CMSContainer/cmsc/basicmodel/config/applications/basecontentelements.xml CMSContainer/branches/b1_7/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/PageNavigationItemManager.java CMSContainer/branches/b1_7/CMSContainer/cmsc/portlets/config/applications/cmscportlets.xml CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/config/applications/sitemanagement.xml CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/beans/om/Page.java CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/PagesUtil.java CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/page/edit_page.xml CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/page/load_page.xml CMSContainer/branches/b1_7/CMSContainer/cmsc/taglib/src/tld/cmsc.tld CMSContainer/branches/b1_7/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/basecontentelements.xml CMSContainer/branches/b1_7/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/cmscimpl.xml CMSContainer/branches/b1_7/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/cmscportlets.xml CMSContainer/branches/b1_7/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/sitemanagement.xml CMSContainer/branches/b1_7/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/config/applications/cmscimpl.xml CMSContainer/branches/b1_7/CMSContainer_Demo/i18n-demo/war/src/webapp/WEB-INF/config/applications/cmscimpl.xml CMSContainer/branches/b1_7/CMSContainer_Demo/www.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/basecontentelements.xml CMSContainer/branches/b1_7/CMSContainer_Demo/www.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/cmscportlets.xml CMSContainer/branches/b1_7/CMSContainer_Demo/www.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/sitemanagement.xml CMSContainer/branches/b1_7/CMSContainer_Modules/alias/config/applications/alias.xml CMSContainer/branches/b1_7/CMSContainer_Modules/fileupload/config/applications/fileupload.xml CMSContainer/branches/b1_7/CMSContainer_Modules/pagewizard/config/applications/pagewizard.xml CMSContainer/branches/b1_7/CMSContainer_Modules/rssfeed/config/applications/rssfeed.xml CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/config/applications/subsite.xml CMSContainer/branches/b1_7/CMSContainer_Modules/workflow/config/applications/workflow.xml CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-googlemap/config/googlemap.xml CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter.xml CMSContainer/branches/b1_7/CMSContainer_Templates/community/pom.xml CMSContainer/branches/b1_7/CMSContainer_Templates/double/war-live/pom.xml CMSContainer/branches/b1_7/CMSContainer_Templates/double/war-live/src/webapp/WEB-INF/config/applications/basecontentelements.xml CMSContainer/branches/b1_7/CMSContainer_Templates/double/war-live/src/webapp/WEB-INF/config/applications/cmscportlets.xml Log: CMSC-1641 Properties for pages, sites and newsletters Modified: CMSContainer/branches/b1_7/CMSContainer/cmsc/basicmodel/config/applications/basecontentelements.xml === --- CMSContainer/branches/b1_7/CMSContainer/cmsc/basicmodel/config/applications/basecontentelements.xml 2010-03-16 20:58:13 UTC (rev 41453) +++ CMSContainer/branches/b1_7/CMSContainer/cmsc/basicmodel/config/applications/basecontentelements.xml 2010-03-17 08:14:05 UTC (rev 41454) @@ -4,7 +4,7 @@ - + Modified: CMSContainer/branches/b1_7/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/PageNavigationItemManager.java === --- CMSContainer/branches/b1_7/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/PageNavigationItemManager.java 2010-03-16 20:58:13 UTC (rev 41453) +++ CMSContainer/branches/b1_7/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/PageNavigationItemManager.java 2010-03-17
[MMBASE SCM] r41389 - in CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src: java/com/finalist/newsletter/forms webapp/editors/newsletter/module
Author: kevinshen
Date: 2010-03-16 04:13:57 +0100 (Tue, 16 Mar 2010)
New Revision: 41389
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterBounceAction.java
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/newsletterbouncelist.jsp
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_overview.jsp
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_edit.jsp
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_statistic.jsp
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_subscribers.jsp
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_terms.jsp
Log:
CMSC-1639 Newsletter: add more features about bounce information
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterBounceAction.java
===
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterBounceAction.java
2010-03-16 03:11:32 UTC (rev 41388)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterBounceAction.java
2010-03-16 03:13:57 UTC (rev 41389)
@@ -25,6 +25,11 @@
if
(StringUtils.isNotEmpty(PropertiesUtil.getProperty("repository.search.results.per.page")))
{
pageSize =
Integer.parseInt(PropertiesUtil.getProperty("repository.search.results.per.page"));
}
+
+ String from = request.getParameter("from");
+ if(from != null) {
+ request.getSession().setAttribute("bounce_page_from",from);
+ }
String[] check_items = request.getParameterValues("chk_items");
if(check_items != null && check_items.length > 0) {
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/newsletterbouncelist.jsp
===
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/newsletterbouncelist.jsp
2010-03-16 03:11:32 UTC (rev 41388)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/newsletterbouncelist.jsp
2010-03-16 03:13:57 UTC (rev 41389)
@@ -11,17 +11,27 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
../NewsletterPublicationManagement.do?newsletterId=${requestScope.newsletterId}
+
+
+
../NewsletterPublicationStatisticSearch.do?newsletterId=${requestScope.newsletterId}
+
+
+
../NewsletterPublicationSubscriberSearch.do?newsletterId=${requestScope.newsletterId}
+
+
+
+ #
+
+
+
+
../NewsletterTermSearch.do?newsletterId=${requestScope.newsletterId}
+
+
+
@@ -40,7 +50,10 @@
+
+
+
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_overview.jsp
===
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_overview.jsp
2010-03-16 03:11:32 UTC (rev 41388)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_overview.jsp
2010-03-16 03:13:57 UTC (rev 41389)
@@ -66,7 +66,7 @@
-
+
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_edit.jsp
===
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_edit.jsp
2010-03-16 03:11:32 UTC (rev 41388)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_edit.jsp
2010-03-16 03:13:57 UTC (rev 41389)
@@ -21,7 +21,7 @@
NewsletterPublicationSubscriberSearch.do?newsletterId=${requestScope.newsletterId}
-
module/NewsletterBounceA
[MMBASE SCM] r41388 - in CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src: java/com/finalist/newsletter/forms webapp/editors/newsletter/module
Author: kevinshen
Date: 2010-03-16 04:11:32 +0100 (Tue, 16 Mar 2010)
New Revision: 41388
Modified:
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterBounceAction.java
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/newsletterbouncelist.jsp
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_overview.jsp
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_edit.jsp
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_statistic.jsp
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_subscribers.jsp
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_terms.jsp
Log:
CMSC-1639 Newsletter: add more features about bounce information
Modified:
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterBounceAction.java
===
---
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterBounceAction.java
2010-03-15 22:56:45 UTC (rev 41387)
+++
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterBounceAction.java
2010-03-16 03:11:32 UTC (rev 41388)
@@ -27,6 +27,10 @@
pageSize =
Integer.parseInt(PropertiesUtil.getProperty("repository.search.results.per.page"));
}
+ String from = request.getParameter("from");
+ if(from != null) {
+ request.getSession().setAttribute("bounce_page_from",from);
+ }
String[] check_items = request.getParameterValues("chk_items");
if(check_items != null && check_items.length > 0) {
Modified:
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/newsletterbouncelist.jsp
===
---
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/newsletterbouncelist.jsp
2010-03-15 22:56:45 UTC (rev 41387)
+++
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/newsletterbouncelist.jsp
2010-03-16 03:11:32 UTC (rev 41388)
@@ -12,18 +12,27 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
../NewsletterPublicationManagement.do?newsletterId=${requestScope.newsletterId}
+
+
+
../NewsletterPublicationStatisticSearch.do?newsletterId=${requestScope.newsletterId}
+
+
+
../NewsletterPublicationSubscriberSearch.do?newsletterId=${requestScope.newsletterId}
+
+
+
+ #
+
+
+
+
../NewsletterTermSearch.do?newsletterId=${requestScope.newsletterId}
+
+
+
@@ -42,7 +51,9 @@
+
+
Modified:
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_overview.jsp
===
---
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_overview.jsp
2010-03-15 22:56:45 UTC (rev 41387)
+++
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_overview.jsp
2010-03-16 03:11:32 UTC (rev 41388)
@@ -66,7 +66,7 @@
-
+
Modified:
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_edit.jsp
===
---
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_edit.jsp
2010-03-15 22:56:45 UTC (rev 41387)
+++
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_edit.jsp
2010-03-16 03:11:32 UTC (rev 41388)
@@ -21,7 +21,7 @@
NewsletterPublicationSubscriberSearch.do?newsletterId=${requestScope.newsletterId}
-
[MMBASE SCM] r41351 - in CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter: resources src/java/com/finalist/newsletter/forms src/java/com/finalist/newsletter/services src/java/com/finalist/
Author: kevinshen Date: 2010-03-12 10:18:10 +0100 (Fri, 12 Mar 2010) New Revision: 41351 Modified: CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter.properties CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_nl.properties CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_zh.properties CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterBounceAction.java CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/CommunityModuleAdapter.java CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterBounceUtil.java CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/newsletterbouncelist.jsp CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_edit.jsp CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/newsletter.js Log: CMSC-1639 Newsletter: add more features about bounce information Modified: CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter.properties === --- CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter.properties 2010-03-12 09:14:54 UTC (rev 41350) +++ CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter.properties 2010-03-12 09:18:10 UTC (rev 41351) @@ -296,4 +296,12 @@ newsletter.edition.fail = freeze failed, please check the edition in work-flow! newsletter.confirm_send.ok=OK -site.newsletter.detail = Newsletter details \ No newline at end of file +site.newsletter.detail = Newsletter details + +newsletter.bounce.selectall = Select all +newsletter.bounce.delete.bounce = Delete bounce +newsletter.bounce.delete.member = Delete member +newsletter.bounce.delete.confirm = Are you sure to delete the selected bounces|members? +newsletter.bounce.newsletter.all = All +newsletter.bounce.newsletter.title = Newsletter: +newsletter.publication.tabs.bounces = Bounces Modified: CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_nl.properties === --- CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_nl.properties 2010-03-12 09:14:54 UTC (rev 41350) +++ CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_nl.properties 2010-03-12 09:18:10 UTC (rev 41351) @@ -296,4 +296,12 @@ newsletter.edition.fail = bevriezing is gemislukt, aub controleer of de editie in de workflow staat! newsletter.confirm_send.ok=OK -site.newsletter.detail = Nieuwsbrief details \ No newline at end of file +site.newsletter.detail = Nieuwsbrief details + +newsletter.bounce.selectall = Selecteer alles +newsletter.bounce.delete.bounce = Verwijder bounce +newsletter.bounce.delete.member = Verwijder lid +newsletter.bounce.delete.confirm = Weet u zeker dat u de geselecteerde bounces|leden wilt verwijderen? +newsletter.bounce.newsletter.all = Alle +newsletter.bounce.newsletter.title = Nieuwsbrief: +newsletter.publication.tabs.bounces = Bounces \ No newline at end of file Modified: CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_zh.properties === --- CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_zh.properties 2010-03-12 09:14:54 UTC (rev 41350) +++ CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_zh.properties 2010-03-12 09:18:10 UTC (rev 41351) @@ -298,4 +298,12 @@ newsletter.edition.fail = 冻结失败，请检查工作流！ newsletter.confirm_send.ok=确定 -site.newsletter.detail = 详细信息 \ No newline at end of file +site.newsletter.detail = 详细信息 + +newsletter.bounce.selectall = 全选 +newsletter.bounce.delete.bounce = 删除弹回邮件 +newsletter.bounce.delete.member = 删除无效用户 +newsletter.bounce.delete.confirm = 你确认删除选中的弹回邮件|用户? +newsletter.bounce.newsletter.all = 全部 +newsletter.bounce.newsletter.title = 邮件: +newsletter.publication.tabs.bounces = 弹回邮件 \ No newline at end of file Modified: CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterBounceAction.java === --- CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterBounceAction.java 2010-03-12 09:14:54 UTC (rev 41350) +++ CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterBounceAction.java 2010-03-12 09:18:10 UTC (rev 41351
[MMBASE SCM] r41350 - in CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter: resources src/java/com/finalist/newsletter/forms src/java/com/finalist/newsletter/services src/java/com/f
Author: kevinshen Date: 2010-03-12 10:14:54 +0100 (Fri, 12 Mar 2010) New Revision: 41350 Modified: CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/resources/newsletter.properties CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_nl.properties CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_zh.properties CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterBounceAction.java CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/CommunityModuleAdapter.java CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterBounceUtil.java CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/newsletterbouncelist.jsp CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_edit.jsp CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/newsletter.js Log: CMSC-1639 Newsletter: add more features about bounce information Modified: CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/resources/newsletter.properties === --- CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/resources/newsletter.properties 2010-03-11 20:00:13 UTC (rev 41349) +++ CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/resources/newsletter.properties 2010-03-12 09:14:54 UTC (rev 41350) @@ -297,3 +297,12 @@ newsletter.confirm_send.ok=OK site.newsletter.detail = Newsletter details + +newsletter.bounce.selectall = Select all +newsletter.bounce.delete.bounce = Delete bounce +newsletter.bounce.delete.member = Delete member +newsletter.bounce.delete.confirm = Are you sure to delete the selected bounces|members? +newsletter.bounce.newsletter.all = All +newsletter.bounce.newsletter.title = Newsletter: +newsletter.publication.tabs.bounces = Bounces + Modified: CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_nl.properties === --- CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_nl.properties 2010-03-11 20:00:13 UTC (rev 41349) +++ CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_nl.properties 2010-03-12 09:14:54 UTC (rev 41350) @@ -296,4 +296,12 @@ newsletter.edition.fail = bevriezing is gemislukt, aub controleer of de editie in de workflow staat! newsletter.confirm_send.ok=OK -site.newsletter.detail = Nieuwsbrief details \ No newline at end of file +site.newsletter.detail = Nieuwsbrief details + +newsletter.bounce.selectall = Selecteer alles +newsletter.bounce.delete.bounce = Verwijder bounce +newsletter.bounce.delete.member = Verwijder lid +newsletter.bounce.delete.confirm = Weet u zeker dat u de geselecteerde bounces|leden wilt verwijderen? +newsletter.bounce.newsletter.all = Alle +newsletter.bounce.newsletter.title = Nieuwsbrief: +newsletter.publication.tabs.bounces = Bounces \ No newline at end of file Modified: CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_zh.properties === --- CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_zh.properties 2010-03-11 20:00:13 UTC (rev 41349) +++ CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_zh.properties 2010-03-12 09:14:54 UTC (rev 41350) @@ -298,4 +298,12 @@ newsletter.edition.fail = 冻结失败，请检查工作流！ newsletter.confirm_send.ok=确定 -site.newsletter.detail = 详细信息 \ No newline at end of file +site.newsletter.detail = 详细信息 + +newsletter.bounce.selectall = 全选 +newsletter.bounce.delete.bounce = 删除弹回邮件 +newsletter.bounce.delete.member = 删除无效用户 +newsletter.bounce.delete.confirm = 你确认删除选中的弹回邮件|用户? +newsletter.bounce.newsletter.all = 全部 +newsletter.bounce.newsletter.title = 邮件: +newsletter.publication.tabs.bounces = 弹回邮件 \ No newline at end of file Modified: CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterBounceAction.java === --- CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterBounceAction.java 2010-03-11 20:00:13 UTC (rev 41349) +++ CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterBounceAction.java 2010-03-12 09:14:54
[MMBASE SCM] r41323 - CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/webapp/WEB-INF
Author: kevinshen Date: 2010-03-11 03:59:49 +0100 (Thu, 11 Mar 2010) New Revision: 41323 Modified: CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml Log: CMSC-1577 Error when exiting personalpage editwizards Modified: CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml === --- CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml 2010-03-11 02:53:18 UTC (rev 41322) +++ CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml 2010-03-11 02:59:49 UTC (rev 41323) @@ -25,8 +25,8 @@ validate="false"> - - + + @@ -38,14 +38,14 @@ unknown="false" validate="false"> - - + + - + http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r41322 - CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/webapp/WEB-INF
Author: kevinshen Date: 2010-03-11 03:53:18 +0100 (Thu, 11 Mar 2010) New Revision: 41322 Modified: CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml Log: CMSC-1577 Error when exiting personalpage editwizards Modified: CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml === --- CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml 2010-03-11 02:52:33 UTC (rev 41321) +++ CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml 2010-03-11 02:53:18 UTC (rev 41322) @@ -26,7 +26,7 @@ - + @@ -40,13 +40,13 @@ - + - + http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r41321 - CMSContainer/trunk/CMSContainer_Modules/subsite/src/webapp/WEB-INF
Author: kevinshen Date: 2010-03-11 03:52:33 +0100 (Thu, 11 Mar 2010) New Revision: 41321 Modified: CMSContainer/trunk/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml Log: CMSC-1577 Error when exiting personalpage editwizards Modified: CMSContainer/trunk/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml === --- CMSContainer/trunk/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml 2010-03-10 22:03:05 UTC (rev 41320) +++ CMSContainer/trunk/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml 2010-03-11 02:52:33 UTC (rev 41321) @@ -26,7 +26,7 @@ - + @@ -40,13 +40,13 @@ - + - + http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r41302 - in CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/webapp: WEB-INF editors/subsite
Author: kevinshen
Date: 2010-03-09 04:10:09 +0100 (Tue, 09 Mar 2010)
New Revision: 41302
Modified:
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/webapp/editors/subsite/refreshandshow.jsp
Log:
CMSC-1577 Error when exiting personalpage editwizards
Modified:
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml
===
---
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml
2010-03-09 03:09:59 UTC (rev 41301)
+++
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml
2010-03-09 03:10:09 UTC (rev 41302)
@@ -26,7 +26,7 @@
-
+
@@ -40,13 +40,13 @@
-
+
-
+
function refreshPages() {
- refreshFrame('pages');
+ if( existFrameWithName('pages') ) {
+ refreshFrame('pages');
+ }
if (window.opener) {
window.close();
}
document.location.href = '<mm:write
referid="pagepath"/>';
}
+ function existFrameWithName(name, win, parentcall) {
+if (!win) {
+ if (!existFrameWithName(name, window)) {
+ return false;
+ }
+ else {
+ return true;
+ }
+}
+if (win.name == name) {
+ return true;
+}
+else {
+ for (var i = 0; i < win.frames.length; i++) {
+ if(existFrameWithName(name, win.frames[i], true)) {
+ return true;
+ }
+ }
+ if (win.parent && win != parent && !parentcall) {
+ return existFrameWithName(name, win.parent);
+ }
+ if (win.opener) {
+ return existFrameWithName(name, win.opener);
+ }
+ return false;
+}
+ }
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r41301 - in CMSContainer/trunk/CMSContainer_Modules/subsite/src/webapp: WEB-INF editors/subsite
Author: kevinshen
Date: 2010-03-09 04:09:59 +0100 (Tue, 09 Mar 2010)
New Revision: 41301
Modified:
CMSContainer/trunk/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml
CMSContainer/trunk/CMSContainer_Modules/subsite/src/webapp/editors/subsite/refreshandshow.jsp
Log:
CMSC-1577 Error when exiting personalpage editwizards
Modified:
CMSContainer/trunk/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml
===
---
CMSContainer/trunk/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml
2010-03-09 02:09:26 UTC (rev 41300)
+++
CMSContainer/trunk/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml
2010-03-09 03:09:59 UTC (rev 41301)
@@ -26,7 +26,7 @@
-
+
@@ -40,13 +40,13 @@
-
+
-
+
function refreshPages() {
- refreshFrame('pages');
+ if( existFrameWithName('pages') ) {
+ refreshFrame('pages');
+ }
if (window.opener) {
window.close();
}
document.location.href = '<mm:write
referid="pagepath"/>';
}
+
+ function existFrameWithName(name, win, parentcall) {
+ if (!win) {
+ if (!existFrameWithName(name, window)) {
+ return false;
+ }
+ else {
+ return true;
+ }
+ }
+ if (win.name == name) {
+ return true;
+ }
+ else {
+ for (var i = 0; i < win.frames.length; i++) {
+ if(existFrameWithName(name,
win.frames[i], true)) {
+return true;
+ }
+ }
+ if (win.parent && win != parent &&
!parentcall) {
+ return existFrameWithName(name,
win.parent);
+ }
+ if (win.opener) {
+ return existFrameWithName(name,
win.opener);
+ }
+ return false;
+ }
+ }
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r41300 - CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/webapp/WEB-INF
Author: kevinshen Date: 2010-03-09 03:09:26 +0100 (Tue, 09 Mar 2010) New Revision: 41300 Modified: CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml Log: CMSC-1577 Error when exiting personalpage editwizards Modified: CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml === --- CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml 2010-03-08 22:26:56 UTC (rev 41299) +++ CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml 2010-03-09 02:09:26 UTC (rev 41300) @@ -26,7 +26,7 @@ - + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r41285 - CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/util/http
Author: kevinshen
Date: 2010-03-08 08:07:49 +0100 (Mon, 08 Mar 2010)
New Revision: 41285
Modified:
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/util/http/BulkUploadUtil.java
Log:
CMSC-1655 Zipped uploads for assets do not work anymore
Modified:
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/util/http/BulkUploadUtil.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/util/http/BulkUploadUtil.java
2010-03-08 07:04:16 UTC (rev 41284)
+++
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/util/http/BulkUploadUtil.java
2010-03-08 07:07:49 UTC (rev 41285)
@@ -260,11 +260,11 @@
try {
byte[] buffer = new byte[2048 * 1024];
while ((entry = zip.getNextEntry()) != null) {
+if (entry.isDirectory()) {
+ continue;
+}
long size = entry.getSize();
if (maxFileSizeBiggerThan(size)) {
- if (entry.isDirectory()) {
- continue;
- }
if ("images".equals(manager.getName()) &&
!isImage(entry.getName())) {
if (log.isDebugEnabled()) {
log.debug("Skipping " + entry.getName() + " because it is
not an image");
@@ -282,9 +282,18 @@
.createTransformer(checksumFactory.createParameters());
ByteArrayOutputStream fileData = new ByteArrayOutputStream();
int len = 0;
+ long entrySize = 0 ;
while ((len = zip.read(buffer)) > 0) {
fileData.write(buffer, 0, len);
+ entrySize += len;
}
+ if (entrySize <= 0) {
+ notUploadedFiles.add(entry.getName());
+ continue;
+ }
+ if (size <= 0) {
+ size = entrySize;
+ }
String checkSum = transformer.transform(fileData.toByteArray());
NodeQuery query = manager.createQuery();
SearchUtil.addEqualConstraint(query,
manager.getField("checksum"), checkSum);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r41284 - CMSContainer/branches/b1_7/CMSContainer/cmsc/utilities/src/java/com/finalist/util/http
Author: kevinshen
Date: 2010-03-08 08:04:16 +0100 (Mon, 08 Mar 2010)
New Revision: 41284
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/utilities/src/java/com/finalist/util/http/BulkUploadUtil.java
Log:
CMSC-1655 Zipped uploads for assets do not work anymore
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/utilities/src/java/com/finalist/util/http/BulkUploadUtil.java
===
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/utilities/src/java/com/finalist/util/http/BulkUploadUtil.java
2010-03-07 20:31:29 UTC (rev 41283)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/utilities/src/java/com/finalist/util/http/BulkUploadUtil.java
2010-03-08 07:04:16 UTC (rev 41284)
@@ -260,11 +260,11 @@
try {
byte[] buffer = new byte[2048 * 1024];
while ((entry = zip.getNextEntry()) != null) {
+if (entry.isDirectory()) {
+continue;
+}
long size = entry.getSize();
if (maxFileSizeBiggerThan(size)) {
- if (entry.isDirectory()) {
- continue;
- }
if ("images".equals(manager.getName()) &&
!isImage(entry.getName())) {
if (log.isDebugEnabled()) {
log.debug("Skipping " + entry.getName() + " because it is
not an image");
@@ -282,9 +282,18 @@
.createTransformer(checksumFactory.createParameters());
ByteArrayOutputStream fileData = new ByteArrayOutputStream();
int len = 0;
+ long entrySize = 0 ;
while ((len = zip.read(buffer)) > 0) {
fileData.write(buffer, 0, len);
+ entrySize += len;
}
+ if (entrySize <= 0) {
+ notUploadedFiles.add(entry.getName());
+ continue;
+ }
+ if (size <= 0) {
+ size = entrySize;
+ }
String checkSum = transformer.transform(fileData.toByteArray());
NodeQuery query = manager.createQuery();
SearchUtil.addEqualConstraint(query,
manager.getField("checksum"), checkSum);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r41219 - in CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors: recyclebin repository
Author: kevinshen
Date: 2010-03-02 09:29:04 +0100 (Tue, 02 Mar 2010)
New Revision: 41219
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/assettrash.jsp
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/contenttrash.jsp
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.js
Log:
CMSC-1568 Sorting is lost when using paging intrashbin and in a content channel
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/assettrash.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/assettrash.jsp
2010-03-02 08:27:45 UTC (rev 41218)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/assettrash.jsp
2010-03-02 08:29:04 UTC (rev 41219)
@@ -13,7 +13,7 @@
-up
+down
title
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/contenttrash.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/contenttrash.jsp
2010-03-02 08:27:45 UTC (rev 41218)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/contenttrash.jsp
2010-03-02 08:29:04 UTC (rev 41219)
@@ -13,7 +13,7 @@
-up
+down
title
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.js
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.js
2010-03-02 08:27:45 UTC (rev 41218)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.js
2010-03-02 08:29:04 UTC (rev 41219)
@@ -59,7 +59,7 @@
}
else {
document.forms['initForm'].order.value = orderColumn;
- document.forms['initForm'].direction.value = 'down';
+ document.forms['initForm'].direction.value = 'up';
}
newDirection=document.forms['initForm'].direction.value;
type=document.forms['initForm'].order.value;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r41218 - in CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors: recyclebin repository
Author: kevinshen
Date: 2010-03-02 09:27:45 +0100 (Tue, 02 Mar 2010)
New Revision: 41218
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/assettrash.jsp
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/contenttrash.jsp
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.js
Log:
CMSC-1568 Sorting is lost when using paging intrashbin and in a content channel
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/assettrash.jsp
===
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/assettrash.jsp
2010-03-02 08:25:58 UTC (rev 41217)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/assettrash.jsp
2010-03-02 08:27:45 UTC (rev 41218)
@@ -13,7 +13,7 @@
-up
+down
title
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/contenttrash.jsp
===
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/contenttrash.jsp
2010-03-02 08:25:58 UTC (rev 41217)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/contenttrash.jsp
2010-03-02 08:27:45 UTC (rev 41218)
@@ -13,7 +13,7 @@
-up
+down
title
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.js
===
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.js
2010-03-02 08:25:58 UTC (rev 41217)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.js
2010-03-02 08:27:45 UTC (rev 41218)
@@ -59,7 +59,7 @@
}
else {
document.forms['initForm'].order.value = orderColumn;
- document.forms['initForm'].direction.value = 'down';
+ document.forms['initForm'].direction.value = 'up';
}
newDirection=document.forms['initForm'].direction.value;
type=document.forms['initForm'].order.value;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r41217 - in CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/webapp/editors: recyclebin repository
Author: kevinshen
Date: 2010-03-02 09:25:58 +0100 (Tue, 02 Mar 2010)
New Revision: 41217
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/index.jsp
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.js
Log:
CMSC-1568 Sorting is lost when using paging intrashbin and in a content channel
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/index.jsp
===
---
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/index.jsp
2010-03-01 21:29:22 UTC (rev 41216)
+++
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/index.jsp
2010-03-02 08:25:58 UTC (rev 41217)
@@ -7,7 +7,7 @@
-up
+down
title
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.js
===
---
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.js
2010-03-01 21:29:22 UTC (rev 41216)
+++
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.js
2010-03-02 08:25:58 UTC (rev 41217)
@@ -58,7 +58,7 @@
}
else {
document.forms[0].order.value = orderColumn;
- document.forms[0].direction.value = 'down';
+ document.forms[0].direction.value = 'up';
}
newDirection=document.forms[0].direction.value;
type=document.forms[0].order.value;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40955 - CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
Author: kevinshen
Date: 2010-02-10 07:13:59 +0100 (Wed, 10 Feb 2010)
New Revision: 40955
Modified:
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_subscribers.jsp
Log:
CMSC-1631 Newsletter: add 'newsletter details' link to newsletter context menu
Modified:
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_subscribers.jsp
===
---
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_subscribers.jsp
2010-02-10 06:09:54 UTC (rev 40954)
+++
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_subscribers.jsp
2010-02-10 06:13:59 UTC (rev 40955)
@@ -1,10 +1,11 @@
<%...@include file="globals.jsp"
%><%@ taglib uri="http://finalist.com/cmsc"; prefix="cmsc"
%><%@ page import="com.finalist.cmsc.navigation.NavigationUtil"
-%><%@ page import="com.finalist.cmsc.security.*"
+%><%@ page import="com.finalist.cmsc.security.*, org.mmbase.security.Rank"
%><%@ taglib prefix="edit" tagdir="/WEB-INF/tags/edit"
%>
http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+
@@ -25,10 +26,16 @@
NewsletterTermSearch.do?newsletterId=${requestScope.newsletterId}
-
+<%
+UserRole role = NavigationUtil.getRole(cloud,
cloud.getNode(request.getParameter("newsletterId")), false);
+if (role != null ) {
+ boolean hasRight = SecurityUtil.isWebmaster(role) && Rank.BASICUSER_INT
< cloud.getUser().getRank().getInt();
+ pageContext.setAttribute("hasRight",hasRight);
+}
+%>
-
+
@@ -87,7 +94,7 @@
-
+
@@ -114,4 +121,5 @@
+
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40954 - CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
Author: kevinshen
Date: 2010-02-10 07:09:54 +0100 (Wed, 10 Feb 2010)
New Revision: 40954
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_subscribers.jsp
Log:
CMSC-1631 Newsletter: add 'newsletter details' link to newsletter context menu
reverting
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_subscribers.jsp
===
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_subscribers.jsp
2010-02-09 18:11:16 UTC (rev 40953)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_subscribers.jsp
2010-02-10 06:09:54 UTC (rev 40954)
@@ -1,7 +1,10 @@
<%...@include file="globals.jsp"
%><%@ taglib uri="http://finalist.com/cmsc"; prefix="cmsc"
%><%@ taglib prefix="edit" tagdir="/WEB-INF/tags/edit"
+%><%@ page import="com.finalist.cmsc.navigation.NavigationUtil"
+%><%@ page import="com.finalist.cmsc.security.*, org.mmbase.security.Rank"
%>
+
http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
@@ -24,10 +27,16 @@
NewsletterTermSearch.do?newsletterId=${requestScope.newsletterId}
-
+<%
+UserRole role = NavigationUtil.getRole(cloud,
cloud.getNode(request.getParameter("newsletterId")), false);
+if (role != null ) {
+ boolean hasRight = SecurityUtil.isWebmaster(role) && Rank.BASICUSER_INT
< cloud.getUser().getRank().getInt();
+ pageContext.setAttribute("hasRight",hasRight);
+}
+%>
-
+
@@ -87,7 +96,7 @@
-
+
@@ -114,4 +123,5 @@
+
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40889 - in CMSContainer/trunk/CMSContainer_Modules/community: resources src/java/com/finalist/cmsc/community/forms src/java/com/finalist/cmsc/services/community/person src/webapp/WEB-INF
Author: kevinshen
Date: 2010-02-08 10:34:49 +0100 (Mon, 08 Feb 2010)
New Revision: 40889
Added:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/UserBulkDeleteAction.java
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/resources/cmsc-community.properties
CMSContainer/trunk/CMSContainer_Modules/community/resources/cmsc-community_nl.properties
CMSContainer/trunk/CMSContainer_Modules/community/resources/cmsc-community_zh.properties
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/SearchConditionalUserAction.java
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/SearchForm.java
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonHibernateService.java
CMSContainer/trunk/CMSContainer_Modules/community/src/webapp/WEB-INF/struts-community.xml
CMSContainer/trunk/CMSContainer_Modules/community/src/webapp/editors/community/listUsers.jsp
CMSContainer/trunk/CMSContainer_Modules/community/src/webapp/editors/community/search_user_form_table.jspf
CMSContainer/trunk/CMSContainer_Modules/community/src/webapp/editors/community/userlist_table.jspf
Log:
CMSC-1636 Community: add sort on status, select all, delete options
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/resources/cmsc-community.properties
===
---
CMSContainer/trunk/CMSContainer_Modules/community/resources/cmsc-community.properties
2010-02-08 09:33:26 UTC (rev 40888)
+++
CMSContainer/trunk/CMSContainer_Modules/community/resources/cmsc-community.properties
2010-02-08 09:34:49 UTC (rev 40889)
@@ -134,4 +134,8 @@
datafile.invalid = Error happened when importing file. Please check the data
of the imported file and be sure they are right.
datafile.unsupport = The file should have the extension CSV or XML.
datafile.import.success = {0} users are added or overwritten successfully
-datafile.import.success.title = Import Data
\ No newline at end of file
+datafile.import.success.title = Import Data
+
+community.search.state.all = All
+community.selectall = Select all
+community.bulkdelete = Delete
\ No newline at end of file
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/resources/cmsc-community_nl.properties
===
---
CMSContainer/trunk/CMSContainer_Modules/community/resources/cmsc-community_nl.properties
2010-02-08 09:33:26 UTC (rev 40888)
+++
CMSContainer/trunk/CMSContainer_Modules/community/resources/cmsc-community_nl.properties
2010-02-08 09:34:49 UTC (rev 40889)
@@ -133,4 +133,8 @@
datafile.invalid = Er is een fout gebeurd tijdens het importeren. Controleer
of de data correct is en in het juiste formaat.
datafile.unsupport = Het bestand moet de extensie CSV of XML hebben.
datafile.import.success = {0} leden zijn succesvol toegevoegd of overschreven
-datafile.import.success.title = Importeer data
\ No newline at end of file
+datafile.import.success.title = Importeer data
+
+community.search.state.all = Alle
+community.selectall = Selecteer alles
+community.bulkdelete = Verwijderen
\ No newline at end of file
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/resources/cmsc-community_zh.properties
===
---
CMSContainer/trunk/CMSContainer_Modules/community/resources/cmsc-community_zh.properties
2010-02-08 09:33:26 UTC (rev 40888)
+++
CMSContainer/trunk/CMSContainer_Modules/community/resources/cmsc-community_zh.properties
2010-02-08 09:34:49 UTC (rev 40889)
@@ -135,4 +135,8 @@
datafile.invalid = 导入文件时发生错误.
datafile.unsupport = 导入支持 CSV 和 XML.
datafile.import.success = {0} 用户被导入
-datafile.import.success.title =数据导入
\ No newline at end of file
+datafile.import.success.title =数据导入
+
+community.search.state.all = 全部
+community.selectall = 全选
+community.bulkdelete = 删除
\ No newline at end of file
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/SearchConditionalUserAction.java
===
---
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/SearchConditionalUserAction.java
2010-02-08 09:33:26 UTC (rev 40888)
+++
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/SearchConditionalUserAction.java
2010-02-08 09:34:49 UTC (rev 40889)
@@ -63,11 +63,13 @@
setPagingInformation(request);
Map < String , String > map = getParameterMap(actionForm);
- String active=request.getParameter("state");
+ String active=request.getParameter("active");
if(null!=active){
String authId=re
[MMBASE SCM] r40888 - CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/tags/edit
Author: kevinshen Date: 2010-02-08 10:33:26 +0100 (Mon, 08 Feb 2010) New Revision: 40888 Modified: CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/tags/edit/ui-tcolumn.tag Log: CMSC-1636 Community: add sort on status, select all, delete options Modified: CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/tags/edit/ui-tcolumn.tag === --- CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/tags/edit/ui-tcolumn.tag 2010-02-08 09:32:41 UTC (rev 40887) +++ CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/tags/edit/ui-tcolumn.tag 2010-02-08 09:33:26 UTC (rev 40888) @@ -3,6 +3,7 @@ <%@ attribute name="title" rtexprvalue="true" required="false" %> <%@ attribute name="sort" rtexprvalue="true" required="false" %> <%@ attribute name="width" rtexprvalue="true" required="false" %> +<%@ attribute name="checkboxlabel" rtexprvalue="true" required="false" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %> @@ -21,7 +22,10 @@ - + + + + @@ -29,7 +33,7 @@ - + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40887 - in CMSContainer/branches/b1_7/CMSContainer_Modules/community: resources src/java/com/finalist/cmsc/community/forms src/java/com/finalist/cmsc/services/community/person src/webapp
Author: kevinshen
Date: 2010-02-08 10:32:41 +0100 (Mon, 08 Feb 2010)
New Revision: 40887
Added:
CMSContainer/branches/b1_7/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/UserBulkDeleteAction.java
Modified:
CMSContainer/branches/b1_7/CMSContainer_Modules/community/resources/cmsc-community.properties
CMSContainer/branches/b1_7/CMSContainer_Modules/community/resources/cmsc-community_nl.properties
CMSContainer/branches/b1_7/CMSContainer_Modules/community/resources/cmsc-community_zh.properties
CMSContainer/branches/b1_7/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/SearchConditionalUserAction.java
CMSContainer/branches/b1_7/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/SearchForm.java
CMSContainer/branches/b1_7/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonHibernateService.java
CMSContainer/branches/b1_7/CMSContainer_Modules/community/src/webapp/WEB-INF/struts-community.xml
CMSContainer/branches/b1_7/CMSContainer_Modules/community/src/webapp/editors/community/listUsers.jsp
CMSContainer/branches/b1_7/CMSContainer_Modules/community/src/webapp/editors/community/search_user_form_table.jspf
CMSContainer/branches/b1_7/CMSContainer_Modules/community/src/webapp/editors/community/userlist_table.jspf
Log:
CMSC-1636 Community: add sort on status, select all, delete options
Modified:
CMSContainer/branches/b1_7/CMSContainer_Modules/community/resources/cmsc-community.properties
===
---
CMSContainer/branches/b1_7/CMSContainer_Modules/community/resources/cmsc-community.properties
2010-02-08 09:30:48 UTC (rev 40886)
+++
CMSContainer/branches/b1_7/CMSContainer_Modules/community/resources/cmsc-community.properties
2010-02-08 09:32:41 UTC (rev 40887)
@@ -128,4 +128,8 @@
datafile.invalid = Error happened when importing file. Please check the data
of the imported file and be sure they are right.
datafile.unsupport = The file should have the extension CSV or XML.
datafile.import.success = {0} users are added or overwritten successfully
-datafile.import.success.title = Import Data
\ No newline at end of file
+datafile.import.success.title = Import Data
+
+community.search.state.all = All
+community.selectall = Select all
+community.bulkdelete = Delete
\ No newline at end of file
Modified:
CMSContainer/branches/b1_7/CMSContainer_Modules/community/resources/cmsc-community_nl.properties
===
---
CMSContainer/branches/b1_7/CMSContainer_Modules/community/resources/cmsc-community_nl.properties
2010-02-08 09:30:48 UTC (rev 40886)
+++
CMSContainer/branches/b1_7/CMSContainer_Modules/community/resources/cmsc-community_nl.properties
2010-02-08 09:32:41 UTC (rev 40887)
@@ -127,4 +127,8 @@
datafile.invalid = Er is een fout gebeurd tijdens het importeren. Controleer
of de data correct is en in het juiste formaat.
datafile.unsupport = Het bestand moet de extensie CSV of XML hebben.
datafile.import.success = {0} leden zijn succesvol toegevoegd of overschreven
-datafile.import.success.title = Importeer data
\ No newline at end of file
+datafile.import.success.title = Importeer data
+
+community.search.state.all = Alle
+community.selectall = Selecteer alles
+community.bulkdelete = Verwijderen
\ No newline at end of file
Modified:
CMSContainer/branches/b1_7/CMSContainer_Modules/community/resources/cmsc-community_zh.properties
===
---
CMSContainer/branches/b1_7/CMSContainer_Modules/community/resources/cmsc-community_zh.properties
2010-02-08 09:30:48 UTC (rev 40886)
+++
CMSContainer/branches/b1_7/CMSContainer_Modules/community/resources/cmsc-community_zh.properties
2010-02-08 09:32:41 UTC (rev 40887)
@@ -128,4 +128,8 @@
datafile.invalid = 导入文件时发生错误.
datafile.unsupport = 导入支持 CSV 和 XML.
datafile.import.success = {0} 用户被导入
-datafile.import.success.title =数据导入
\ No newline at end of file
+datafile.import.success.title =数据导入
+
+community.search.state.all = 全部
+community.selectall = 全选
+community.bulkdelete = 删除
\ No newline at end of file
Modified:
CMSContainer/branches/b1_7/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/SearchConditionalUserAction.java
===
---
CMSContainer/branches/b1_7/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/SearchConditionalUserAction.java
2010-02-08 09:30:48 UTC (rev 40886)
+++
CMSContainer/branches/b1_7/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/SearchConditionalUserAction.java
2010-02-08 09:32:41 UTC (rev 40887)
@@ -63,11 +63,13 @@
setPagingInformation(request);
Map < String , String > map = getParameterMap(actionForm);
-
[MMBASE SCM] r40886 - CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/tags/edit
Author: kevinshen Date: 2010-02-08 10:30:48 +0100 (Mon, 08 Feb 2010) New Revision: 40886 Modified: CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/tags/edit/ui-tcolumn.tag Log: CMSC-1636 Community: add sort on status, select all, delete options Modified: CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/tags/edit/ui-tcolumn.tag === --- CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/tags/edit/ui-tcolumn.tag 2010-02-08 09:08:18 UTC (rev 40885) +++ CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/tags/edit/ui-tcolumn.tag 2010-02-08 09:30:48 UTC (rev 40886) @@ -3,6 +3,7 @@ <%@ attribute name="title" rtexprvalue="true" required="false" %> <%@ attribute name="sort" rtexprvalue="true" required="false" %> <%@ attribute name="width" rtexprvalue="true" required="false" %> +<%@ attribute name="checkboxlabel" rtexprvalue="true" required="false" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %> @@ -21,7 +22,10 @@ - + + + + @@ -29,7 +33,7 @@ - + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40872 - CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
Author: kevinshen
Date: 2010-02-05 03:46:08 +0100 (Fri, 05 Feb 2010)
New Revision: 40872
Modified:
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_subscribers.jsp
Log:
CMSC-1631 Newsletter: add 'newsletter details' link to newsletter context menu
reverting
Modified:
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_subscribers.jsp
===
---
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_subscribers.jsp
2010-02-05 02:45:52 UTC (rev 40871)
+++
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_subscribers.jsp
2010-02-05 02:46:08 UTC (rev 40872)
@@ -1,5 +1,7 @@
<%...@include file="globals.jsp"
%><%@ taglib uri="http://finalist.com/cmsc"; prefix="cmsc"
+%><%@ page import="com.finalist.cmsc.navigation.NavigationUtil"
+%><%@ page import="com.finalist.cmsc.security.*"
%><%@ taglib prefix="edit" tagdir="/WEB-INF/tags/edit"
%>
http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
@@ -7,7 +9,7 @@
"
rel="stylesheet" type="text/css">
-
+
@@ -23,11 +25,34 @@
NewsletterTermSearch.do?newsletterId=${requestScope.newsletterId}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
@@ -62,6 +87,12 @@
+
+
+
+
+
+
${result.fullname}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40871 - CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
Author: kevinshen
Date: 2010-02-05 03:45:52 +0100 (Fri, 05 Feb 2010)
New Revision: 40871
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_subscribers.jsp
Log:
CMSC-1631 Newsletter: add 'newsletter details' link to newsletter context menu
reverting
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_subscribers.jsp
===
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_subscribers.jsp
2010-02-05 01:06:05 UTC (rev 40870)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_subscribers.jsp
2010-02-05 02:45:52 UTC (rev 40871)
@@ -7,6 +7,7 @@
"
rel="stylesheet" type="text/css">
+ " />
@@ -23,9 +24,35 @@
NewsletterTermSearch.do?newsletterId=${requestScope.newsletterId}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -60,6 +87,12 @@
+
+
+
+
+
+
${result.fullname}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40870 - CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/config/builders/newsletter
Author: kevinshen Date: 2010-02-05 02:06:05 +0100 (Fri, 05 Feb 2010) New Revision: 40870 Modified: CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/config/builders/newsletter/newsletterdailylog.xml Log: CMSC-1631 Newsletter: add 'newsletter details' link to newsletter context menu reverting Modified: CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/config/builders/newsletter/newsletterdailylog.xml === --- CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/config/builders/newsletter/newsletterdailylog.xml 2010-02-05 00:31:43 UTC (rev 40869) +++ CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/config/builders/newsletter/newsletterdailylog.xml 2010-02-05 01:06:05 UTC (rev 40870) @@ -100,7 +100,7 @@ 1 -http://www.mmbase.org/xmlns/datatypes"/> +http://www.mmbase.org/xmlns/datatypes"/> @@ -113,7 +113,7 @@ 1 -http://www.mmbase.org/xmlns/datatypes"/> +http://www.mmbase.org/xmlns/datatypes"/> ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40869 - CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders
Author: kevinshen Date: 2010-02-05 01:31:43 +0100 (Fri, 05 Feb 2010) New Revision: 40869 Modified: CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders/subscriptionrecord.xml Log: CMSC-1634 Newsletter: check and improve the subscriptionrecord builder Modified: CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders/subscriptionrecord.xml === --- CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders/subscriptionrecord.xml 2010-02-05 00:30:46 UTC (rev 40868) +++ CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders/subscriptionrecord.xml 2010-02-05 00:31:43 UTC (rev 40869) @@ -117,7 +117,7 @@ http://www.mmbase.org/xmlns/datatypes"/> format -STRING +STRING ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40868 - CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/config/builders/newsletter
Author: kevinshen Date: 2010-02-05 01:30:46 +0100 (Fri, 05 Feb 2010) New Revision: 40868 Modified: CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/config/builders/newsletter/subscriptionrecord.xml Log: CMSC-1634 Newsletter: check and improve the subscriptionrecord builder Modified: CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/config/builders/newsletter/subscriptionrecord.xml === --- CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/config/builders/newsletter/subscriptionrecord.xml 2010-02-05 00:30:10 UTC (rev 40867) +++ CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/config/builders/newsletter/subscriptionrecord.xml 2010-02-05 00:30:46 UTC (rev 40868) @@ -66,7 +66,7 @@ http://www.mmbase.org/xmlns/datatypes";> - + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40867 - CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/config/builders/newsletter
Author: kevinshen Date: 2010-02-05 01:30:10 +0100 (Fri, 05 Feb 2010) New Revision: 40867 Modified: CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/config/builders/newsletter/subscriptionrecord.xml Log: CMSC-1634 Newsletter: check and improve the subscriptionrecord builder Modified: CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/config/builders/newsletter/subscriptionrecord.xml === --- CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/config/builders/newsletter/subscriptionrecord.xml 2010-02-04 15:57:09 UTC (rev 40866) +++ CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/config/builders/newsletter/subscriptionrecord.xml 2010-02-05 00:30:10 UTC (rev 40867) @@ -66,7 +66,7 @@ http://www.mmbase.org/xmlns/datatypes";> - + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40860 - CMSContainer/branches/b1_5/CMSContainer/migration
Author: kevinshen Date: 2010-02-04 08:32:37 +0100 (Thu, 04 Feb 2010) New Revision: 40860 Added: CMSContainer/branches/b1_5/CMSContainer/migration/migration_1.5.14_to_1.5.15.txt Log: CMSC-1634 Newsletter: check and improve the subscriptionrecord builder Added: CMSContainer/branches/b1_5/CMSContainer/migration/migration_1.5.14_to_1.5.15.txt === --- CMSContainer/branches/b1_5/CMSContainer/migration/migration_1.5.14_to_1.5.15.txt (rev 0) +++ CMSContainer/branches/b1_5/CMSContainer/migration/migration_1.5.14_to_1.5.15.txt 2010-02-04 07:32:37 UTC (rev 40860) @@ -0,0 +1,20 @@ +Migration document: + +From version: 1.5.14 +To version: 1.5.15 + + +Name: Alter two fields of the table subscriptionrecord +Goal: Change the type of the two fields +Type: sql-script +--- Start script --- +ALTER TABLE mm_subscriptionrecord MODIFY subscriber VARCHAR(11) +ALTER TABLE mm_subscriptionrecord MODIFY format VARCHAR(256) + +ALTER TABLE live_subscriptionrecord MODIFY subscriber VARCHAR(11) +ALTER TABLE live_subscriptionrecord MODIFY format VARCHAR(256) + +--- End script --- +Exceptions/errors/other problems and what to do: +* +* ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40859 - CMSContainer/branches/b1_7/CMSContainer/migration
Author: kevinshen Date: 2010-02-04 08:32:19 +0100 (Thu, 04 Feb 2010) New Revision: 40859 Modified: CMSContainer/branches/b1_7/CMSContainer/migration/migration_1.7.1_to_1.7.2.txt Log: CMSC-1634 Newsletter: check and improve the subscriptionrecord builder Modified: CMSContainer/branches/b1_7/CMSContainer/migration/migration_1.7.1_to_1.7.2.txt === --- CMSContainer/branches/b1_7/CMSContainer/migration/migration_1.7.1_to_1.7.2.txt 2010-02-04 07:31:59 UTC (rev 40858) +++ CMSContainer/branches/b1_7/CMSContainer/migration/migration_1.7.1_to_1.7.2.txt 2010-02-04 07:32:19 UTC (rev 40859) @@ -45,3 +45,18 @@ * * * + +Name: Alter two fields of the table subscriptionrecord +Goal: Change the type of the two fields +Type: sql-script +--- Start script --- +ALTER TABLE mm_subscriptionrecord MODIFY subscriber VARCHAR(11) +ALTER TABLE mm_subscriptionrecord MODIFY format VARCHAR(256) + +ALTER TABLE live_subscriptionrecord MODIFY subscriber VARCHAR(11) +ALTER TABLE live_subscriptionrecord MODIFY format VARCHAR(256) + +--- End script --- +Exceptions/errors/other problems and what to do: +* +* \ No newline at end of file ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40858 - CMSContainer/trunk/CMSContainer/migration
Author: kevinshen Date: 2010-02-04 08:31:59 +0100 (Thu, 04 Feb 2010) New Revision: 40858 Modified: CMSContainer/trunk/CMSContainer/migration/migration_1.7_to_1.8.txt Log: CMSC-1634 Newsletter: check and improve the subscriptionrecord builder Modified: CMSContainer/trunk/CMSContainer/migration/migration_1.7_to_1.8.txt === --- CMSContainer/trunk/CMSContainer/migration/migration_1.7_to_1.8.txt 2010-02-04 07:25:25 UTC (rev 40857) +++ CMSContainer/trunk/CMSContainer/migration/migration_1.7_to_1.8.txt 2010-02-04 07:31:59 UTC (rev 40858) @@ -44,3 +44,17 @@ * * * +Name: Alter two fields of the table subscriptionrecord +Goal: Change the type of the two fields +Type: sql-script +--- Start script --- +ALTER TABLE mm_subscriptionrecord MODIFY subscriber VARCHAR(11) +ALTER TABLE mm_subscriptionrecord MODIFY format VARCHAR(256) + +ALTER TABLE live_subscriptionrecord MODIFY subscriber VARCHAR(11) +ALTER TABLE live_subscriptionrecord MODIFY format VARCHAR(256) + +--- End script --- +Exceptions/errors/other problems and what to do: +* +* \ No newline at end of file ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40857 - CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders
Author: kevinshen Date: 2010-02-04 08:25:25 +0100 (Thu, 04 Feb 2010) New Revision: 40857 Modified: CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders/subscriptionrecord.xml Log: CMSC-1634 Newsletter: check and improve the subscriptionrecord builder Modified: CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders/subscriptionrecord.xml === --- CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders/subscriptionrecord.xml 2010-02-04 07:17:59 UTC (rev 40856) +++ CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders/subscriptionrecord.xml 2010-02-04 07:25:25 UTC (rev 40857) @@ -90,10 +90,10 @@ -1 - http://www.mmbase.org/xmlns/datatypes"/> + http://www.mmbase.org/xmlns/datatypes"/> subscriber -STRING +STRING @@ -114,10 +114,10 @@ -1 - http://www.mmbase.org/xmlns/datatypes"/> + http://www.mmbase.org/xmlns/datatypes"/> format -STRING +STRING ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40856 - CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/config/builders/newsletter
Author: kevinshen Date: 2010-02-04 08:17:59 +0100 (Thu, 04 Feb 2010) New Revision: 40856 Modified: CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/config/builders/newsletter/subscriptionrecord.xml Log: CMSC-1634 Newsletter: check and improve the subscriptionrecord builder Modified: CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/config/builders/newsletter/subscriptionrecord.xml === --- CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/config/builders/newsletter/subscriptionrecord.xml 2010-02-04 07:16:29 UTC (rev 40855) +++ CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/config/builders/newsletter/subscriptionrecord.xml 2010-02-04 07:17:59 UTC (rev 40856) @@ -50,8 +50,8 @@ 3 -http://www.mmbase.org/xmlns/datatypes";> - +http://www.mmbase.org/xmlns/datatypes";> + @@ -65,8 +65,8 @@ 4 -http://www.mmbase.org/xmlns/datatypes";> - +http://www.mmbase.org/xmlns/datatypes";> + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40855 - CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/config/builders/newsletter
Author: kevinshen Date: 2010-02-04 08:16:29 +0100 (Thu, 04 Feb 2010) New Revision: 40855 Modified: CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/config/builders/newsletter/subscriptionrecord.xml Log: CMSC-1634 Newsletter: check and improve the subscriptionrecord builder Modified: CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/config/builders/newsletter/subscriptionrecord.xml === --- CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/config/builders/newsletter/subscriptionrecord.xml 2010-02-04 06:25:44 UTC (rev 40854) +++ CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/config/builders/newsletter/subscriptionrecord.xml 2010-02-04 07:16:29 UTC (rev 40855) @@ -50,8 +50,8 @@ 3 -http://www.mmbase.org/xmlns/datatypes";> - +http://www.mmbase.org/xmlns/datatypes";> + @@ -65,8 +65,8 @@ 4 -http://www.mmbase.org/xmlns/datatypes";> - +http://www.mmbase.org/xmlns/datatypes";> + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40854 - in CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter: resources src/java/com/finalist/newsletter/tree src/webapp/editors/gfx/icons src/webapp/editors/newsletter/module
Author: kevinshen
Date: 2010-02-04 07:25:44 +0100 (Thu, 04 Feb 2010)
New Revision: 40854
Added:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/newsletter_detail.png
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter.properties
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_nl.properties
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_zh.properties
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree/NewsletterTreeItemRenderer.java
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_subscribers.jsp
Log:
CMSC-1631 Newsletter: add 'newsletter details' link to newsletter context menu
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter.properties
===
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter.properties
2010-02-04 06:19:52 UTC (rev 40853)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter.properties
2010-02-04 06:25:44 UTC (rev 40854)
@@ -294,4 +294,6 @@
newsletter.edition.errors = the {0} have not been published yet, if you want
to Freeze it, you should publish it first!
newsletter.edition.auto = the edition have been published by system, it will
be frozen later!
newsletter.edition.fail = freeze failed, please check the edition in work-flow!
-newsletter.confirm_send.ok=OK
\ No newline at end of file
+newsletter.confirm_send.ok=OK
+
+site.newsletter.detail = Newsletter details
\ No newline at end of file
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_nl.properties
===
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_nl.properties
2010-02-04 06:19:52 UTC (rev 40853)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_nl.properties
2010-02-04 06:25:44 UTC (rev 40854)
@@ -294,4 +294,6 @@
newsletter.edition.errors = de {0} zijn nog niet gepubliceerd. Als u ze wilt
bevriezen, moeten ze eerst gepubliceerd worden!
newsletter.edition.auto = de editie is gepubliceerd, straks wordt het bevroren!
newsletter.edition.fail = bevriezing is gemislukt, aub controleer of de editie
in de workflow staat!
-newsletter.confirm_send.ok=OK
\ No newline at end of file
+newsletter.confirm_send.ok=OK
+
+site.newsletter.detail = Newsletter details
\ No newline at end of file
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_zh.properties
===
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_zh.properties
2010-02-04 06:19:52 UTC (rev 40853)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_zh.properties
2010-02-04 06:25:44 UTC (rev 40854)
@@ -296,4 +296,6 @@
newsletter.edition.errors ={0} 还没有发布，请在冻结它之前发布它 !
newsletter.edition.auto = 系统已经为你发布，稍后会为您自动冻结！
newsletter.edition.fail = 冻结失败，请检查工作流！
-newsletter.confirm_send.ok=确定
\ No newline at end of file
+newsletter.confirm_send.ok=确定
+
+site.newsletter.detail = 详细信息
\ No newline at end of file
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree/NewsletterTreeItemRenderer.java
===
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree/NewsletterTreeItemRenderer.java
2010-02-04 06:19:52 UTC (rev 40853)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree/NewsletterTreeItemRenderer.java
2010-02-04 06:25:44 UTC (rev 40854)
@@ -36,7 +36,11 @@
if (SecurityUtil.isEditor(role)) {
addEditorOptions(renderer, id, element);
-
+ if (SecurityUtil.isWebmaster(role)) {
+element.addOption(
+ renderer.createTreeOption("newsletter_detail.png",
"site.newsletter.detail","newsletter",
"../newsletter/NewsletterPublicationManagement.do?newsletterId=" + id)
+);
+ }
if (SecurityUtil.isWebmaster(role) ||
(model.getChildCount(parentNode) == 0 && !Publish.isPublished(parentNode))) {
addWebmasterOptions(renderer, id, element);
}
Added:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/newsletter_detail.png
===
(Binary files differ)
Property changes on:
CM
[MMBASE SCM] r40853 - in CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter: config/builders/newsletter resources src/java/com/finalist/newsletter/tree src/webapp/editors/gfx/icons s
Author: kevinshen
Date: 2010-02-04 07:19:52 +0100 (Thu, 04 Feb 2010)
New Revision: 40853
Added:
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/newsletter_detail.png
Modified:
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/config/builders/newsletter/newsletterdailylog.xml
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/resources/newsletter.properties
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_nl.properties
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_zh.properties
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree/NewsletterTreeItemRenderer.java
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_subscribers.jsp
Log:
CMSC-1631 Newsletter: add 'newsletter details' link to newsletter context menu
Modified:
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/config/builders/newsletter/newsletterdailylog.xml
===
---
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/config/builders/newsletter/newsletterdailylog.xml
2010-02-04 03:06:16 UTC (rev 40852)
+++
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/config/builders/newsletter/newsletterdailylog.xml
2010-02-04 06:19:52 UTC (rev 40853)
@@ -100,7 +100,7 @@
1
-http://www.mmbase.org/xmlns/datatypes"/>
+http://www.mmbase.org/xmlns/datatypes"/>
@@ -113,7 +113,7 @@
1
-http://www.mmbase.org/xmlns/datatypes"/>
+http://www.mmbase.org/xmlns/datatypes"/>
Modified:
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/resources/newsletter.properties
===
---
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/resources/newsletter.properties
2010-02-04 03:06:16 UTC (rev 40852)
+++
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/resources/newsletter.properties
2010-02-04 06:19:52 UTC (rev 40853)
@@ -294,4 +294,6 @@
newsletter.edition.errors = the {0} have not been published yet, if you want
to Freeze it, you should publish it first!
newsletter.edition.auto = the edition have been published by system, it will
be frozen later!
newsletter.edition.fail = freeze failed, please check the edition in work-flow!
-newsletter.confirm_send.ok=OK
\ No newline at end of file
+newsletter.confirm_send.ok=OK
+
+site.newsletter.detail = Newsletter details
Modified:
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_nl.properties
===
---
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_nl.properties
2010-02-04 03:06:16 UTC (rev 40852)
+++
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_nl.properties
2010-02-04 06:19:52 UTC (rev 40853)
@@ -294,4 +294,6 @@
newsletter.edition.errors = de {0} zijn nog niet gepubliceerd. Als u ze wilt
bevriezen, moeten ze eerst gepubliceerd worden!
newsletter.edition.auto = de editie is gepubliceerd, straks wordt het bevroren!
newsletter.edition.fail = bevriezing is gemislukt, aub controleer of de editie
in de workflow staat!
-newsletter.confirm_send.ok=OK
\ No newline at end of file
+newsletter.confirm_send.ok=OK
+
+site.newsletter.detail = Newsletter details
\ No newline at end of file
Modified:
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_zh.properties
===
---
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_zh.properties
2010-02-04 03:06:16 UTC (rev 40852)
+++
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_zh.properties
2010-02-04 06:19:52 UTC (rev 40853)
@@ -296,4 +296,6 @@
newsletter.edition.errors ={0} 还没有发布，请在冻结它之前发布它 !
newsletter.edition.auto = 系统已经为你发布，稍后会为您自动冻结！
newsletter.edition.fail = 冻结失败，请检查工作流！
-newsletter.confirm_send.ok=确定
\ No newline at end of file
+newsletter.confirm_send.ok=确定
+
+site.newsletter.detail = 详细信息
\ No newline at end of file
Modified:
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree/NewsletterTreeItemRenderer.java
===
---
CMSContainer/branches/b1_7
[MMBASE SCM] r40852 - CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/login/filter
Author: kevinshen
Date: 2010-02-04 04:06:16 +0100 (Thu, 04 Feb 2010)
New Revision: 40852
Modified:
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/login/filter/PortalFilter.java
Log:
CMSC-1500 Pluggable J2EE authentication for Community Module remove unusefull
logs
Modified:
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/login/filter/PortalFilter.java
===
---
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/login/filter/PortalFilter.java
2010-02-03 21:23:25 UTC (rev 40851)
+++
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/login/filter/PortalFilter.java
2010-02-04 03:06:16 UTC (rev 40852)
@@ -56,8 +56,6 @@
{
if (sRequest instanceof HttpServletRequest) {
HttpServletRequest request = (HttpServletRequest)sRequest;
-log.info(" remote
user==="+request.getRemoteUser());
-log.info("
UserPrincipal==="+request.getUserPrincipal());
String username =
request.getParameter(ACEGI_SECURITY_FORM_USERNAME_KEY);
String password =
request.getParameter(ACEGI_SECURITY_FORM_PASSWORD_KEY);
if (username != null) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40816 - CMSContainer/branches/b1_7/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/servlet
Author: kevinshen
Date: 2010-02-03 07:32:01 +0100 (Wed, 03 Feb 2010)
New Revision: 40816
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/servlet/StylesheetServlet.java
Log:
CMSC-1565 Extend stylesheet feature withstylesheet data from database
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/servlet/StylesheetServlet.java
===
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/servlet/StylesheetServlet.java
2010-02-03 06:31:12 UTC (rev 40815)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/servlet/StylesheetServlet.java
2010-02-03 06:32:01 UTC (rev 40816)
@@ -14,6 +14,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.mmbase.bridge.Cloud;
import org.mmbase.bridge.Node;
import org.mmbase.servlet.BridgeServlet;
@@ -46,11 +47,15 @@
number = pathInfo.replaceAll("/|.css", "");
}
if (number != null) {
- if (number.matches("[0-9]+")) {
+ Cloud cloud = getAnonymousCloud();
+ if (number.matches("[0-9]+") && cloud != null &&
cloud.hasNode(number)) {
Node stylesheet= getAnonymousCloud().getNode(number);
String text = stylesheet.getStringValue("text");
response.getWriter().print(text);
}
+ else {
+response.getWriter().print("404 NOT FOUND page");
+ }
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40815 - CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/servlet
Author: kevinshen
Date: 2010-02-03 07:31:12 +0100 (Wed, 03 Feb 2010)
New Revision: 40815
Modified:
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/servlet/StylesheetServlet.java
Log:
CMSC-1565 Extend stylesheet feature withstylesheet data from database
Modified:
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/servlet/StylesheetServlet.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/servlet/StylesheetServlet.java
2010-02-03 06:27:18 UTC (rev 40814)
+++
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/servlet/StylesheetServlet.java
2010-02-03 06:31:12 UTC (rev 40815)
@@ -14,6 +14,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.mmbase.bridge.Cloud;
import org.mmbase.bridge.Node;
import org.mmbase.servlet.BridgeServlet;
@@ -46,11 +47,15 @@
number = pathInfo.replaceAll("/|.css", "");
}
if (number != null) {
- if (number.matches("[0-9]+")) {
+ Cloud cloud = getAnonymousCloud();
+ if (number.matches("[0-9]+") && cloud != null &&
cloud.hasNode(number)) {
Node stylesheet= getAnonymousCloud().getNode(number);
String text = stylesheet.getStringValue("text");
response.getWriter().print(text);
}
+ else {
+response.getWriter().print("404 NOT FOUND page");
+ }
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40814 - CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/stylesheet
Author: kevinshen Date: 2010-02-03 07:27:18 +0100 (Wed, 03 Feb 2010) New Revision: 40814 Modified: CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/stylesheet/edit_stylesheet.xml Log: CMSC-1565 Extend stylesheet feature withstylesheet data from database Modified: CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/stylesheet/edit_stylesheet.xml === --- CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/stylesheet/edit_stylesheet.xml 2010-02-03 06:25:19 UTC (rev 40813) +++ CMSContainer/branches/b1_7/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/stylesheet/edit_stylesheet.xml 2010-02-03 06:27:18 UTC (rev 40814) @@ -36,6 +36,5 @@ Stylesheet body Stylesheet tekst 脚本 - \ No newline at end of file ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40813 - CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/stylesheet
Author: kevinshen Date: 2010-02-03 07:25:19 +0100 (Wed, 03 Feb 2010) New Revision: 40813 Modified: CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/stylesheet/edit_stylesheet.xml Log: CMSC-1565 Extend stylesheet feature withstylesheet data from database Modified: CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/stylesheet/edit_stylesheet.xml === --- CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/stylesheet/edit_stylesheet.xml 2010-02-02 19:14:58 UTC (rev 40812) +++ CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/stylesheet/edit_stylesheet.xml 2010-02-03 06:25:19 UTC (rev 40813) @@ -36,6 +36,5 @@ Stylesheet body Stylesheet tekst 脚本 - \ No newline at end of file ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40778 - CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type
Author: kevinshen Date: 2010-02-02 10:22:52 +0100 (Tue, 02 Feb 2010) New Revision: 40778 Modified: CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletter_chiefeditor.png CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletter_editor.png CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletter_webmaster.png CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletter_writer.png Log: CMSC-1630 Icon on newsletter parent not adjusted to user rights Modified: CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletter_chiefeditor.png === (Binary files differ) Modified: CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletter_editor.png === (Binary files differ) Modified: CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletter_webmaster.png === (Binary files differ) Modified: CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletter_writer.png === (Binary files differ) ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40777 - CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type
Author: kevinshen Date: 2010-02-02 10:10:51 +0100 (Tue, 02 Feb 2010) New Revision: 40777 Modified: CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletter_chiefeditor.png CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletter_editor.png CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletter_webmaster.png CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletter_writer.png CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletterpublication_chiefeditor.png CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletterpublication_editor.png CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletterpublication_webmaster.png CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletterpublication_writer.png Log: CMSC-1630 Icon on newsletter parent not adjusted to user rights Modified: CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletter_chiefeditor.png === (Binary files differ) Modified: CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletter_editor.png === (Binary files differ) Modified: CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletter_webmaster.png === (Binary files differ) Modified: CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletter_writer.png === (Binary files differ) Modified: CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletterpublication_chiefeditor.png === (Binary files differ) Modified: CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletterpublication_editor.png === (Binary files differ) Modified: CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletterpublication_webmaster.png === (Binary files differ) Modified: CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletterpublication_writer.png === (Binary files differ) ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40776 - CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type
Author: kevinshen Date: 2010-02-02 10:10:26 +0100 (Tue, 02 Feb 2010) New Revision: 40776 Modified: CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletter_chiefeditor.png CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletter_editor.png CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletter_webmaster.png CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletter_writer.png CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletterpublication_chiefeditor.png CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletterpublication_editor.png CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletterpublication_webmaster.png CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletterpublication_writer.png Log: CMSC-1630 Icon on newsletter parent not adjusted to user rights Modified: CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletter_chiefeditor.png === (Binary files differ) Modified: CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletter_editor.png === (Binary files differ) Modified: CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletter_webmaster.png === (Binary files differ) Modified: CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletter_writer.png === (Binary files differ) Modified: CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletterpublication_chiefeditor.png === (Binary files differ) Modified: CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletterpublication_editor.png === (Binary files differ) Modified: CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletterpublication_webmaster.png === (Binary files differ) Modified: CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/type/newsletterpublication_writer.png === (Binary files differ) ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40775 - CMSContainer/branches/b1_7/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow
Author: kevinshen
Date: 2010-02-02 09:26:09 +0100 (Tue, 02 Feb 2010)
New Revision: 40775
Modified:
CMSContainer/branches/b1_7/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/PageWorkflow.java
Log:
CMSC-1632 images not published with site.
Modified:
CMSContainer/branches/b1_7/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/PageWorkflow.java
===
---
CMSContainer/branches/b1_7/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/PageWorkflow.java
2010-02-02 08:26:00 UTC (rev 40774)
+++
CMSContainer/branches/b1_7/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/PageWorkflow.java
2010-02-02 08:26:09 UTC (rev 40775)
@@ -138,6 +138,7 @@
Node wf = getWorkflowNode(blockNode, "asset");
if (wf != null) {
changeWorkflow(wf, STATUS_PUBLISHED, "");
+publishInternal(wf, blockNode);
}
}
publish(page, TYPE_PAGE, publishNumbers);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40774 - CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard
Author: kevinshen
Date: 2010-02-02 09:26:00 +0100 (Tue, 02 Feb 2010)
New Revision: 40774
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard/WizardController.java
Log:
CMSC-1632 images not published with site.
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard/WizardController.java
===
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard/WizardController.java
2010-02-02 08:11:04 UTC (rev 40773)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard/WizardController.java
2010-02-02 08:26:00 UTC (rev 40774)
@@ -344,15 +344,19 @@
if
(PagesUtil.isPageType(editNode.getCloud().getNode(channelnr))) {
channelnr = RepositoryUtil.getRoot(editNode.getCloud());
}
+
+ }
+ else {
+ channelnr = RepositoryUtil.getRoot(editNode.getCloud());
+ //log.warn("AssetElement: Creationchannel was not found in
session");
+ }
+ if (channelnr != null ) {
RepositoryUtil.addCreationChannel(editNode, channelnr);
AssetElementUtil.addOwner(editNode);
if (isMainWizard(ewconfig, wizardConfig)) {
RepositoryUtil.addAssetToChannel(editNode, channelnr);
}
}
- else {
- log.warn("AssetElement: Creationchannel was not found in
session");
- }
}
}
else {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40773 - CMSContainer/trunk/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow
Author: kevinshen
Date: 2010-02-02 09:11:04 +0100 (Tue, 02 Feb 2010)
New Revision: 40773
Modified:
CMSContainer/trunk/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/PageWorkflow.java
Log:
CMSC-1632 images not published with site.
Modified:
CMSContainer/trunk/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/PageWorkflow.java
===
---
CMSContainer/trunk/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/PageWorkflow.java
2010-02-02 08:09:11 UTC (rev 40772)
+++
CMSContainer/trunk/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/PageWorkflow.java
2010-02-02 08:11:04 UTC (rev 40773)
@@ -138,6 +138,7 @@
Node wf = getWorkflowNode(blockNode, "asset");
if (wf != null) {
changeWorkflow(wf, STATUS_PUBLISHED, "");
+publishInternal(wf, blockNode);
}
}
publish(page, TYPE_PAGE, publishNumbers);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40772 - CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard
Author: kevinshen
Date: 2010-02-02 09:09:11 +0100 (Tue, 02 Feb 2010)
New Revision: 40772
Modified:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard/WizardController.java
Log:
CMSC-1632 images not published with site.
Modified:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard/WizardController.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard/WizardController.java
2010-02-01 19:06:21 UTC (rev 40771)
+++
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard/WizardController.java
2010-02-02 08:09:11 UTC (rev 40772)
@@ -344,15 +344,18 @@
if
(PagesUtil.isPageType(editNode.getCloud().getNode(channelnr))) {
channelnr = RepositoryUtil.getRoot(editNode.getCloud());
}
+ }
+ else {
+ channelnr = RepositoryUtil.getRoot(editNode.getCloud());
+ //log.warn("AssetElement: Creationchannel was not found in
session");
+ }
+ if (channelnr != null ) {
RepositoryUtil.addCreationChannel(editNode, channelnr);
AssetElementUtil.addOwner(editNode);
if (isMainWizard(ewconfig, wizardConfig)) {
RepositoryUtil.addAssetToChannel(editNode, channelnr);
}
}
- else {
- log.warn("AssetElement: Creationchannel was not found in
session");
- }
}
}
else {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40745 - CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl
Author: kevinshen
Date: 2010-01-28 10:48:46 +0100 (Thu, 28 Jan 2010)
New Revision: 40745
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecurePortalServlet.java
Log:
CMSC-1596 Make staging side unaccessible until you log in with a mmbase user
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecurePortalServlet.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecurePortalServlet.java
2010-01-28 03:38:36 UTC (rev 40744)
+++
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecurePortalServlet.java
2010-01-28 09:48:46 UTC (rev 40745)
@@ -38,7 +38,7 @@
}
Cloud cloud = CloudUtil.getCloudFromThread();
//In the staging side. deny community user and guest. redirect to 403
page.
- if (ServerUtil.isStaging() && cloud == null) {
+ if (!ServerUtil.isSingle() && ServerUtil.isStaging() && cloud ==
null) {
String noRightPage =
SiteManagement.getSiteFromPath(path).getUrlfragment()+"/403";
if (path != null && !path.endsWith("/403")) {
response.sendRedirect(HttpUtil.getWebappUri(request)+noRightPage);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40744 - CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation
Author: kevinshen
Date: 2010-01-28 04:38:36 +0100 (Thu, 28 Jan 2010)
New Revision: 40744
Removed:
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/community.jsp
Modified:
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/submenu.jsp
Log:
CMSC-1626 SS0 - Demo views are depending on community
Deleted:
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/community.jsp
===
---
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/community.jsp
2010-01-28 03:38:02 UTC (rev 40743)
+++
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/community.jsp
2010-01-28 03:38:36 UTC (rev 40744)
@@ -1 +0,0 @@
-<%...@taglib uri="http://finalist.com/cmsc/community"; prefix="community" %>
Modified:
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/submenu.jsp
===
---
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/submenu.jsp
2010-01-28 03:38:02 UTC (rev 40743)
+++
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/submenu.jsp
2010-01-28 03:38:36 UTC (rev 40744)
@@ -1,9 +1,7 @@
<%...@include file="/WEB-INF/templates/portletglobals.jsp" %>
<%...@taglib uri="http://java.sun.com/jsp/jstl/functions"; prefix="fn" %>
-
-
-
-
+<%@ page import="com.finalist.cmsc.portalImpl.SecureUtil" %>
+<%= SecureUtil.getEnvironment("useSSO")%>
@@ -17,15 +15,16 @@
-
+
+ <%=SecureUtil.isReadable((String)pageContext.getAttribute("pageId"))%>
-
+
class="selected">
"
title="">
-
+
class="selected">
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40743 - in CMSContainer/trunk/CMSContainer/cmsc: edit-webapp/src/webapp/editors/modules portal/src/java/com/finalist/cmsc/portalImpl
Author: kevinshen
Date: 2010-01-28 04:38:02 +0100 (Thu, 28 Jan 2010)
New Revision: 40743
Modified:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecureUtil.java
Log:
CMSC-1626 SS0 - Demo views are depending on community
Modified:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp
2010-01-27 14:41:30 UTC (rev 40742)
+++
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp
2010-01-28 03:38:02 UTC (rev 40743)
@@ -1,10 +1,7 @@
<%...@page language="java" contentType="text/html;charset=UTF-8"%>
<%...@page import="com.finalist.cmsc.portalImpl.SecureUtil" %>
<%...@include file="../globals.jsp"%>
-
- <%...@taglib uri="http://finalist.com/cmsc/community"; prefix="community" %>
- <%= SecureUtil.getEnvironment("useSSO")%>
-
+<%= SecureUtil.getEnvironment("useSSO")%>
http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecureUtil.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecureUtil.java
2010-01-27 14:41:30 UTC (rev 40742)
+++
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecureUtil.java
2010-01-28 03:38:02 UTC (rev 40743)
@@ -21,20 +21,9 @@
private static final Logger log = Logger.getLogger(SecureUtil.class);
public static boolean isAllowedToSee(NavigationItem item) {
- Cloud cloud =
CloudProviderFactory.getCloudProvider().getCloud();
- Node node = cloud.getNode(item.getId());
- NodeList groups = node.getRelatedNodes("pagegroup");
- if(groups.size() == 0) {
- return true;
- }
- for(NodeIterator i = groups.nodeIterator(); i.hasNext(); ) {
- Node group = i.nextNode();
-
if(Community.hasAuthority(group.getStringValue("name"))) {
- return true;
- }
- }
- return false;
+ return isReadable(Integer.toString(item.getId()));
}
+
public static String getEnvironment(String name) {
String value = null;
Context env = null;
@@ -60,5 +49,21 @@
log.error("Get environment "+name+" error :"+e);
}
return value;
+ }
+
+ public static boolean isReadable(String pageId) {
+ Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
+ Node node = cloud.getNode(pageId);
+ NodeList groups = node.getRelatedNodes("pagegroup");
+ if(groups.size() == 0) {
+ return true;
+ }
+ for(NodeIterator i = groups.nodeIterator(); i.hasNext(); ) {
+ Node group = i.nextNode();
+ if(Community.hasAuthority(group.getStringValue("name"))) {
+return true;
+ }
+ }
+ return false;
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40737 - CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications
Author: kevinshen Date: 2010-01-27 08:04:49 +0100 (Wed, 27 Jan 2010) New Revision: 40737 Modified: CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/sitemanagement.xml Log: CMSC-1539 CAS single sign-on implementation Modified: CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/sitemanagement.xml === --- CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/sitemanagement.xml 2010-01-27 06:24:28 UTC (rev 40736) +++ CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/sitemanagement.xml 2010-01-27 07:04:49 UTC (rev 40737) @@ -63,6 +63,8 @@ + + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40736 - CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl
Author: kevinshen
Date: 2010-01-27 07:24:28 +0100 (Wed, 27 Jan 2010)
New Revision: 40736
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecurePortalServlet.java
Log:
CMSC-1596 Make staging side unaccessible until you log in with a mmbase user
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecurePortalServlet.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecurePortalServlet.java
2010-01-27 05:41:54 UTC (rev 40735)
+++
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecurePortalServlet.java
2010-01-27 06:24:28 UTC (rev 40736)
@@ -19,26 +19,38 @@
import com.finalist.cmsc.services.community.Community;
import com.finalist.cmsc.services.sitemanagement.SiteManagement;
import com.finalist.cmsc.util.HttpUtil;
+import com.finalist.cmsc.util.ServerUtil;
@SuppressWarnings("serial")
public class SecurePortalServlet extends PortalServlet {
+
+ private static Log log = LogFactory.getLog(SecurePortalServlet.class);
+
private static final String CAS_LOGIN_LOCALE = "cas_login_locale";
+
private static final String DEFAULT_LOGIN_URL = "casServerLoginUrl";
- private static Log log = LogFactory.getLog(SecurePortalServlet.class);
-
+
protected boolean doRender(HttpServletRequest request,
HttpServletResponse response, String path) throws
IOException {
String useSSO = SecureUtil.getEnvironment("useSSO");
if(useSSO == null || "false".equalsIgnoreCase(useSSO)) {
return super.doRender(request, response, path);
}
+ Cloud cloud = CloudUtil.getCloudFromThread();
+ //In the staging side. deny community user and guest. redirect to 403
page.
+ if (ServerUtil.isStaging() && cloud == null) {
+ String noRightPage =
SiteManagement.getSiteFromPath(path).getUrlfragment()+"/403";
+ if (path != null && !path.endsWith("/403")) {
+ response.sendRedirect(HttpUtil.getWebappUri(request)+noRightPage);
+ return true;
+ }
+ }
NavigationItem item =
SiteManagement.getNavigationItemFromPath(path);
if (SecureUtil.isAllowedToSee(item)) {
log.debug("Page: allowed to see");
return super.doRender(request, response, path);
- }
-
- Cloud cloud = CloudUtil.getCloudFromThread();
+ }
+
if (cloud != null) {
Node node = cloud.getNode(item.getId());
UserRole role = NavigationUtil.getRole(cloud, node, false);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40735 - CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/META-INF
Author: kevinshen Date: 2010-01-27 06:41:54 +0100 (Wed, 27 Jan 2010) New Revision: 40735 Modified: CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/META-INF/context.xml Log: CMSC-1539 CAS single sign-on implementation Modified: CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/META-INF/context.xml === --- CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/META-INF/context.xml 2010-01-27 03:59:45 UTC (rev 40734) +++ CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/META-INF/context.xml 2010-01-27 05:41:54 UTC (rev 40735) @@ -114,7 +114,7 @@ - + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40733 - CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation
Author: kevinshen Date: 2010-01-27 02:00:27 +0100 (Wed, 27 Jan 2010) New Revision: 40733 Added: CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/community.jsp Modified: CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/submenu.jsp Log: CMSC-1626 SS0 - Demo views are depending on community Added: CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/community.jsp === --- CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/community.jsp (rev 0) +++ CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/community.jsp 2010-01-27 01:00:27 UTC (rev 40733) @@ -0,0 +1 @@ +<%...@taglib uri="http://finalist.com/cmsc/community"; prefix="community" %> Modified: CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/submenu.jsp === --- CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/submenu.jsp 2010-01-26 23:25:24 UTC (rev 40732) +++ CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/submenu.jsp 2010-01-27 01:00:27 UTC (rev 40733) @@ -1,7 +1,7 @@ <%...@include file="/WEB-INF/templates/portletglobals.jsp" %> <%...@taglib uri="http://java.sun.com/jsp/jstl/functions"; prefix="fn" %> - <%...@taglib uri="http://finalist.com/cmsc/community"; prefix="community" %> + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40724 - CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl
Author: kevinshen
Date: 2010-01-26 09:18:48 +0100 (Tue, 26 Jan 2010)
New Revision: 40724
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecurePortalServlet.java
Log:
CMSC-1539 CAS single sign-on implementation refactor code
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecurePortalServlet.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecurePortalServlet.java
2010-01-26 08:18:28 UTC (rev 40723)
+++
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecurePortalServlet.java
2010-01-26 08:18:48 UTC (rev 40724)
@@ -49,6 +49,7 @@
if (Community.isAuthenticated()) {
String noRightPage =
SiteManagement.getSiteFromPath(path).getUrlfragment()+"/403";
response.sendRedirect(HttpUtil.getWebappUri(request)+noRightPage);
+ return true;
}
String locale = null;
if (request.getSession().getAttribute(CAS_LOGIN_LOCALE) != null) {
@@ -65,9 +66,10 @@
request.getSession().setAttribute(CAS_LOGIN_LOCALE,
site.getLanguage());
}
}
-
response.sendRedirect(getServletContext().getInitParameter(loginUrl)==null?getServletContext().getInitParameter(DEFAULT_LOGIN_URL):getServletContext().getInitParameter(loginUrl)+"?service="+HttpUtil.getWebappUri(request)+path);
- log.warn("Page: not allowed to see, no login page found!");
- return false;
+ String redirectUrl =
getServletContext().getInitParameter(loginUrl)==null?getServletContext().getInitParameter(DEFAULT_LOGIN_URL):getServletContext().getInitParameter(loginUrl)+"?service="+HttpUtil.getWebappUri(request)+path;
+ log.debug("Community logout url : "+redirectUrl);
+ response.sendRedirect(redirectUrl);
+ return true;
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40723 - CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/servlet
Author: kevinshen
Date: 2010-01-26 09:18:28 +0100 (Tue, 26 Jan 2010)
New Revision: 40723
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/servlet/CommunityLogoutServlet.java
Log:
CMSC-1539 CAS single sign-on implementation refactor code
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/servlet/CommunityLogoutServlet.java
===
---
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/servlet/CommunityLogoutServlet.java
2010-01-25 15:45:52 UTC (rev 40722)
+++
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/servlet/CommunityLogoutServlet.java
2010-01-26 08:18:28 UTC (rev 40723)
@@ -7,9 +7,12 @@
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
import org.apache.log4j.Logger;
+import com.finalist.cmsc.services.community.Community;
+
@SuppressWarnings("serial")
public class CommunityLogoutServlet extends HttpServlet {
@@ -28,13 +31,19 @@
if (request.getSession().getAttribute(CAS_LOGIN_LOCALE) != null) {
locale = (String)request.getSession().getAttribute(CAS_LOGIN_LOCALE);
}
- request.getSession().invalidate();
+ //
request.getSession(false).removeAttribute(HttpSessionContextIntegrationFilter.ACEGI_SECURITY_CONTEXT_KEY);
+ HttpSession session = request.getSession(false);
+ if (session != null) {
+ session.invalidate();
+ }
+
+ Community.logout();
+
String defaultLogoutUrl = CAS_SERVER_LOGOUT_URL;
if (locale != null) {
defaultLogoutUrl += "_"+locale;
}
+ log.debug("Community logout url : "+defaultLogoutUrl);
response.sendRedirect(getServletContext().getInitParameter(defaultLogoutUrl));
-
- log.error("There is no right casServerLogoutUrl in the context.xml");
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40709 - CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/secure
Author: kevinshen Date: 2010-01-25 08:12:21 +0100 (Mon, 25 Jan 2010) New Revision: 40709 Modified: CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/secure/selectGroup.jsp Log: CMSC-1539 CAS single sign-on implementation Modified: CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/secure/selectGroup.jsp === --- CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/secure/selectGroup.jsp 2010-01-23 10:56:03 UTC (rev 40708) +++ CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/secure/selectGroup.jsp 2010-01-25 07:12:21 UTC (rev 40709) @@ -18,8 +18,7 @@ - - + @@ -32,8 +31,7 @@ - - + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40683 - CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl
Author: kevinshen
Date: 2010-01-22 07:56:40 +0100 (Fri, 22 Jan 2010)
New Revision: 40683
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecurePortalServlet.java
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecureUtil.java
Log:
CMSC-1617 SSO -- Error message, to many redirects add a default login url
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecurePortalServlet.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecurePortalServlet.java
2010-01-22 06:54:18 UTC (rev 40682)
+++
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecurePortalServlet.java
2010-01-22 06:56:40 UTC (rev 40683)
@@ -28,6 +28,10 @@
protected boolean doRender(HttpServletRequest request,
HttpServletResponse response, String path) throws
IOException {
+ String useSSO = SecureUtil.getEnvironment("useSSO");
+ if(useSSO == null || "false".equalsIgnoreCase(useSSO)) {
+ return super.doRender(request, response, path);
+ }
NavigationItem item =
SiteManagement.getNavigationItemFromPath(path);
if (SecureUtil.isAllowedToSee(item)) {
log.debug("Page: allowed to see");
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecureUtil.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecureUtil.java
2010-01-22 06:54:18 UTC (rev 40682)
+++
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecureUtil.java
2010-01-22 06:56:40 UTC (rev 40683)
@@ -1,7 +1,14 @@
package com.finalist.cmsc.portalImpl;
+import java.util.Map;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
+import org.apache.log4j.Logger;
import org.mmbase.bridge.Cloud;
import org.mmbase.bridge.Node;
import org.mmbase.bridge.NodeIterator;
@@ -11,15 +18,15 @@
import com.finalist.cmsc.services.community.Community;
public class SecureUtil {
-
+ private static final Logger log = Logger.getLogger(SecureUtil.class);
+
public static boolean isAllowedToSee(NavigationItem item) {
Cloud cloud =
CloudProviderFactory.getCloudProvider().getCloud();
Node node = cloud.getNode(item.getId());
NodeList groups = node.getRelatedNodes("pagegroup");
if(groups.size() == 0) {
return true;
- }
-
+ }
for(NodeIterator i = groups.nodeIterator(); i.hasNext(); ) {
Node group = i.nextNode();
if(Community.hasAuthority(group.getStringValue("name"))) {
@@ -28,4 +35,30 @@
}
return false;
}
+ public static String getEnvironment(String name) {
+ String value = null;
+ Context env = null;
+ Context context = null;
+ try {
+ context = new InitialContext();
+ env = (Context) context.lookup("java:comp/env");
+ }
+ catch (NamingException e) {
+ log.error("Get env error"+e);
+ }
+ try {
+ if(env != null) {
+Map environment = env.getEnvironment();
+if (environment != null) {
+ value = (String) environment.get(name);
+}
+if (value == null) {
+ value = (String) env.lookup(name);
+}
+ }
+ } catch (NamingException e) {
+ log.error("Get environment "+name+" error :"+e);
+ }
+ return value;
+ }
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40682 - CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib
Author: kevinshen
Date: 2010-01-22 07:54:18 +0100 (Fri, 22 Jan 2010)
New Revision: 40682
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/IsLoggedInTag.java
Log:
CMSC-1621 SSO - isloggedIn tag broken
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/IsLoggedInTag.java
===
---
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/IsLoggedInTag.java
2010-01-22 06:38:58 UTC (rev 40681)
+++
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/IsLoggedInTag.java
2010-01-22 06:54:18 UTC (rev 40682)
@@ -22,20 +22,15 @@
HttpServletRequest req = (HttpServletRequest) ctx.getRequest();
org.acegisecurity.Authentication authentication =
SecurityContextHolder.getContext().getAuthentication();
+ String value = "false";
if(authentication != null) {
- if (var != null) {
-if (authentication.getName() != null) {
- req.setAttribute(var,"true");
-} else {
- req.removeAttribute(var);
-}
- }
- else {
-ctx.getOut().print("true");
- }
+ value = "true";
}
+ if (var != null) {
+ req.setAttribute(var, value);
+ }
else {
- ctx.getOut().print("false");
+ ctx.getOut().print(value);
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40681 - CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules
Author: kevinshen Date: 2010-01-22 07:38:58 +0100 (Fri, 22 Jan 2010) New Revision: 40681 Modified: CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp Log: CMSC-1626 SS0 - Demo views are depending on community Modified: CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp === --- CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp 2010-01-22 06:38:33 UTC (rev 40680) +++ CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp 2010-01-22 06:38:58 UTC (rev 40681) @@ -1,5 +1,9 @@ <%...@page language="java" contentType="text/html;charset=UTF-8"%> <%...@include file="../globals.jsp"%> + + <%...@taglib uri="http://finalist.com/cmsc/community"; prefix="community" %> + + http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> @@ -44,21 +48,21 @@ - - - + + + + - - - + - - + + + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40680 - CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation
Author: kevinshen Date: 2010-01-22 07:38:33 +0100 (Fri, 22 Jan 2010) New Revision: 40680 Modified: CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/submenu.jsp Log: CMSC-1626 SS0 - Demo views are depending on community Modified: CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/submenu.jsp === --- CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/submenu.jsp 2010-01-22 05:39:22 UTC (rev 40679) +++ CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/submenu.jsp 2010-01-22 06:38:33 UTC (rev 40680) @@ -1,6 +1,9 @@ <%...@include file="/WEB-INF/templates/portletglobals.jsp" %> <%...@taglib uri="http://java.sun.com/jsp/jstl/functions"; prefix="fn" %> -<%...@taglib uri="http://finalist.com/cmsc/community"; prefix="community" %> + + <%...@taglib uri="http://finalist.com/cmsc/community"; prefix="community" %> + + @@ -14,7 +17,7 @@ - + class="selected"> ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40679 - in CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community: servlet taglib
Author: kevinshen
Date: 2010-01-22 06:39:22 +0100 (Fri, 22 Jan 2010)
New Revision: 40679
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/servlet/CommunityLogoutServlet.java
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/LogLinkTag.java
Log:
CMSC-1617 SSO -- Error message, to many redirects add a default login url
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/servlet/CommunityLogoutServlet.java
===
---
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/servlet/CommunityLogoutServlet.java
2010-01-22 05:38:50 UTC (rev 40678)
+++
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/servlet/CommunityLogoutServlet.java
2010-01-22 05:39:22 UTC (rev 40679)
@@ -13,6 +13,8 @@
@SuppressWarnings("serial")
public class CommunityLogoutServlet extends HttpServlet {
+ private static final String CAS_SERVER_LOGOUT_URL = "casServerLogoutUrl";
+ private static final String CAS_LOGIN_LOCALE = "cas_login_locale";
private static final Logger log =
Logger.getLogger(CommunityLogoutServlet.class);
@Override
public void init(ServletConfig config) throws ServletException {
@@ -23,11 +25,11 @@
public void service(HttpServletRequest request, HttpServletResponse
response) throws IOException {
String locale = null;
- if (request.getSession().getAttribute("cas_login_locale") != null) {
- locale =
(String)request.getSession().getAttribute("cas_login_locale");
+ if (request.getSession().getAttribute(CAS_LOGIN_LOCALE) != null) {
+ locale = (String)request.getSession().getAttribute(CAS_LOGIN_LOCALE);
}
request.getSession().invalidate();
- String defaultLogoutUrl = "casServerLogoutUrl";
+ String defaultLogoutUrl = CAS_SERVER_LOGOUT_URL;
if (locale != null) {
defaultLogoutUrl += "_"+locale;
}
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/LogLinkTag.java
===
---
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/LogLinkTag.java
2010-01-22 05:38:50 UTC (rev 40678)
+++
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/LogLinkTag.java
2010-01-22 05:39:22 UTC (rev 40679)
@@ -5,10 +5,13 @@
import org.acegisecurity.context.SecurityContextHolder;
+import com.finalist.cmsc.beans.om.Site;
+import com.finalist.cmsc.services.sitemanagement.SiteManagement;
import com.finalist.cmsc.util.HttpUtil;
public class LogLinkTag extends AbstractSSOTag {
+ private static final String CAS_SERVER_LOGIN_URL = "casServerLoginUrl";
private static final String CAS_LOGIN_LOCALE = "cas_login_locale";
private String referurl;
@@ -38,12 +41,20 @@
}
org.acegisecurity.Authentication authentication =
SecurityContextHolder.getContext().getAuthentication();
if(authentication == null) {
- String defaultLoginUrl = "casServerLoginUrl";
+ String LoginUrl = CAS_SERVER_LOGIN_URL;
if(locale != null) {
-defaultLoginUrl += "_"+locale;
+LoginUrl += "_"+locale;
+req.getSession().setAttribute(CAS_LOGIN_LOCALE, locale);
}
- link = getParameter(defaultLoginUrl)+"?service="+backUrl;
- req.getSession().setAttribute(CAS_LOGIN_LOCALE, locale);
+ else {
+String path = getPath();
+Site site = SiteManagement.getSiteFromPath(path);
+if(site != null && site.getLanguage() != null) {
+ LoginUrl += "_"+site.getLanguage();
+ req.getSession().setAttribute(CAS_LOGIN_LOCALE,
site.getLanguage());
+}
+ }
+ link =
getParameter(LoginUrl)==null?getParameter(CAS_SERVER_LOGIN_URL):getParameter(LoginUrl)+"?service="+backUrl;
}
else {
link = HttpUtil.getWebappUri(req)+"LogoutServlet";
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40678 - CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl
Author: kevinshen
Date: 2010-01-22 06:38:50 +0100 (Fri, 22 Jan 2010)
New Revision: 40678
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecurePortalServlet.java
Log:
CMSC-1617 SSO -- Error message, to many redirects add a default login url
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecurePortalServlet.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecurePortalServlet.java
2010-01-22 02:48:19 UTC (rev 40677)
+++
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecurePortalServlet.java
2010-01-22 05:38:50 UTC (rev 40678)
@@ -12,6 +12,7 @@
import org.mmbase.bridge.util.CloudUtil;
import com.finalist.cmsc.beans.om.NavigationItem;
+import com.finalist.cmsc.beans.om.Site;
import com.finalist.cmsc.navigation.NavigationUtil;
import com.finalist.cmsc.security.SecurityUtil;
import com.finalist.cmsc.security.UserRole;
@@ -21,7 +22,8 @@
@SuppressWarnings("serial")
public class SecurePortalServlet extends PortalServlet {
-
+ private static final String CAS_LOGIN_LOCALE = "cas_login_locale";
+ private static final String DEFAULT_LOGIN_URL = "casServerLoginUrl";
private static Log log = LogFactory.getLog(SecurePortalServlet.class);
protected boolean doRender(HttpServletRequest request,
@@ -45,14 +47,21 @@
response.sendRedirect(HttpUtil.getWebappUri(request)+noRightPage);
}
String locale = null;
- if (request.getSession().getAttribute("cas_login_locale") != null) {
- locale =
(String)request.getSession().getAttribute("cas_login_locale");
- }
- String defaultLoginUrl = "casServerLoginUrl";
+ if (request.getSession().getAttribute(CAS_LOGIN_LOCALE) != null) {
+ locale = (String)request.getSession().getAttribute(CAS_LOGIN_LOCALE);
+ }
+ String loginUrl = DEFAULT_LOGIN_URL;
if (locale != null) {
- defaultLoginUrl += "_"+locale;
+ loginUrl += "_"+locale;
}
-
response.sendRedirect(getServletContext().getInitParameter(defaultLoginUrl)+"?service="+HttpUtil.getWebappUri(request)+path);
+ else {
+ Site site = SiteManagement.getSiteFromPath(path);
+ if(site != null && site.getLanguage() != null) {
+loginUrl += "_"+site.getLanguage();
+request.getSession().setAttribute(CAS_LOGIN_LOCALE,
site.getLanguage());
+ }
+ }
+
response.sendRedirect(getServletContext().getInitParameter(loginUrl)==null?getServletContext().getInitParameter(DEFAULT_LOGIN_URL):getServletContext().getInitParameter(loginUrl)+"?service="+HttpUtil.getWebappUri(request)+path);
log.warn("Page: not allowed to see, no login page found!");
return false;
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40677 - in CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org: war-community/src/webapp/WEB-INF war-live/src/webapp/WEB-INF war-staging/src/webapp/WEB-INF
Author: kevinshen Date: 2010-01-22 03:48:19 +0100 (Fri, 22 Jan 2010) New Revision: 40677 Modified: CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/WEB-INF/web.xml CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/web.xml CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-staging/src/webapp/WEB-INF/web.xml Log: CMSC-1565 Extend stylesheet feature with stylesheet data from database Modified: CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/WEB-INF/web.xml === --- CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/WEB-INF/web.xml 2010-01-22 02:39:00 UTC (rev 40676) +++ CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/WEB-INF/web.xml 2010-01-22 02:48:19 UTC (rev 40677) @@ -359,7 +359,11 @@ true - + + Returns css text + stylesheet + com.finalist.cmsc.servlet.StylesheetServlet + + + stylesheet + /stylesheet/* + jforum Modified: CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/web.xml === --- CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/web.xml 2010-01-22 02:39:00 UTC (rev 40676) +++ CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/web.xml 2010-01-22 02:48:19 UTC (rev 40677) @@ -274,6 +274,11 @@ 1 + + Returns css text + stylesheet + com.finalist.cmsc.servlet.StylesheetServlet + version @@ -307,7 +312,10 @@ xmlcontent /editors/repository/xml - + + stylesheet + /stylesheet/* + html text/html Modified: CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-staging/src/webapp/WEB-INF/web.xml === --- CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-staging/src/webapp/WEB-INF/web.xml 2010-01-22 02:39:00 UTC (rev 40676) +++ CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-staging/src/webapp/WEB-INF/web.xml 2010-01-22 02:48:19 UTC (rev 40677) @@ -275,6 +275,15 @@ 1 + + Returns css text + stylesheet + com.finalist.cmsc.servlet.StylesheetServlet + + + stylesheet + /stylesheet/* + version ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40676 - CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/demo/includes
Author: kevinshen Date: 2010-01-22 03:39:00 +0100 (Fri, 22 Jan 2010) New Revision: 40676 Modified: CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/demo/includes/header.jsp Log: CMSC-1565 Extend stylesheet feature with stylesheet data from database Modified: CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/demo/includes/header.jsp === --- CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/demo/includes/header.jsp 2010-01-22 02:38:54 UTC (rev 40675) +++ CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/demo/includes/header.jsp 2010-01-22 02:39:00 UTC (rev 40676) @@ -13,7 +13,14 @@ - + + + + + + + +
[MMBASE SCM] r40675 - in CMSContainer/trunk/CMSContainer: cmsc/edit-webapp/src/webapp/WEB-INF cmsc/sitemanagement/src/webapp/editors/config/stylesheet cmsc/utilities/src/java/com/finalist/cmsc/servlet
Author: kevinshen
Date: 2010-01-22 03:38:54 +0100 (Fri, 22 Jan 2010)
New Revision: 40675
Modified:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/web.xml
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/stylesheet/edit_stylesheet.xml
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/stylesheet/load_stylesheet.xml
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/servlet/StylesheetServlet.java
CMSContainer/trunk/CMSContainer/migration/migration_1.7_to_1.8.txt
Log:
CMSC-1565 Extend stylesheet feature with stylesheet data from database
Modified:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/web.xml
===
--- CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/web.xml
2010-01-22 00:43:29 UTC (rev 40674)
+++ CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/web.xml
2010-01-22 02:38:54 UTC (rev 40675)
@@ -277,7 +277,6 @@
Returns css text
stylesheet
com.finalist.cmsc.servlet.StylesheetServlet
- 1
@@ -315,7 +314,7 @@
stylesheet
- *.css
+ /stylesheet/*
Modified:
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/stylesheet/edit_stylesheet.xml
===
---
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/stylesheet/edit_stylesheet.xml
2010-01-22 00:43:29 UTC (rev 40674)
+++
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/stylesheet/edit_stylesheet.xml
2010-01-22 02:38:54 UTC (rev 40675)
@@ -15,7 +15,7 @@
Omschrijving
描述
-
+
Resource
Style Sheet
样式表
@@ -32,4 +32,10 @@
可覆盖
+
+ Text
+ Text
+ 脚本
+
+
\ No newline at end of file
Modified:
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/stylesheet/load_stylesheet.xml
===
---
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/stylesheet/load_stylesheet.xml
2010-01-22 00:43:29 UTC (rev 40674)
+++
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/stylesheet/load_stylesheet.xml
2010-01-22 02:38:54 UTC (rev 40675)
@@ -2,8 +2,9 @@
http://www.mmbase.org/dtd/wizard-schema_1_0.dtd";>
-
-
-
-
+
+
+
+
+
\ No newline at end of file
Modified:
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/servlet/StylesheetServlet.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/servlet/StylesheetServlet.java
2010-01-22 00:43:29 UTC (rev 40674)
+++
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/servlet/StylesheetServlet.java
2010-01-22 02:38:54 UTC (rev 40675)
@@ -14,6 +14,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.mmbase.bridge.Node;
import org.mmbase.servlet.BridgeServlet;
/**
@@ -29,19 +30,28 @@
@Override
protected void doGet(HttpServletRequest request, HttpServletResponse
response) throws IOException {
- doRedirect(request, response);
+ renderText(request, response);
}
@Override
protected void doPost(HttpServletRequest request, HttpServletResponse
response) throws IOException {
- doRedirect(request, response);
+ renderText(request, response);
}
- private void doRedirect(HttpServletRequest request, HttpServletResponse
response) throws IOException {
- String text = null;
- text = request.getParameter("text");
+ private void renderText(HttpServletRequest request, HttpServletResponse
response) throws IOException {
+ String pathInfo = request.getPathInfo();
+ response.setContentType("text/css");
+ String number = null;
+ if (pathInfo != null) {
+ number = pathInfo.replaceAll("/|.css", "");
+ }
+ if (number != null) {
+ if (number.matches("[0-9]+")) {
+Node stylesheet= getAnonymousCloud().getNode(number);
+String text = stylesheet.getStringValue("text");
+response.getWriter().print(text);
+ }
+ }
- response.setContentType("text/css");
- respons
[MMBASE SCM] r40625 - CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib
Author: kevinshen
Date: 2010-01-20 10:47:54 +0100 (Wed, 20 Jan 2010)
New Revision: 40625
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/IsLoggedInTag.java
Log:
CMSC-1621 SSO - isloggedIn tag broken
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/IsLoggedInTag.java
===
---
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/IsLoggedInTag.java
2010-01-20 09:33:04 UTC (rev 40624)
+++
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/IsLoggedInTag.java
2010-01-20 09:47:54 UTC (rev 40625)
@@ -12,6 +12,10 @@
private String var;
+ public void setVar(String var) {
+ this.var = var;
+ }
+
@Override
protected void doTagLogic() throws JspException, IOException {
PageContext ctx = (PageContext) getJspContext();
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40624 - CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard
Author: kevinshen
Date: 2010-01-20 10:33:04 +0100 (Wed, 20 Jan 2010)
New Revision: 40624
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard/WizardController.java
Log:
CMSC-1619 When a contentelement is saved, all assets are put on "Being edited"
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard/WizardController.java
===
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard/WizardController.java
2010-01-20 09:31:39 UTC (rev 40623)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard/WizardController.java
2010-01-20 09:33:04 UTC (rev 40624)
@@ -265,7 +265,7 @@
node.commit();
}
if (wizardConfig.wiz.committed()) {
-addWorkFlowItem(node);
+ // addWorkFlowItem(node);
//add version for asset element
try {
Versioning.addVersion(node);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40623 - CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard
Author: kevinshen
Date: 2010-01-20 10:31:39 +0100 (Wed, 20 Jan 2010)
New Revision: 40623
Modified:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard/WizardController.java
Log:
CMSC-1619 When a contentelement is saved, all assets are put on "Being edited"
Modified:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard/WizardController.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard/WizardController.java
2010-01-20 09:27:24 UTC (rev 40622)
+++
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard/WizardController.java
2010-01-20 09:31:39 UTC (rev 40623)
@@ -265,7 +265,7 @@
node.commit();
}
if (wizardConfig.wiz.committed()) {
-addWorkFlowItem(node);
+ // addWorkFlowItem(node);
//add version for asset element
try {
Versioning.addVersion(node);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40605 - CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl
Author: kevinshen
Date: 2010-01-19 07:53:13 +0100 (Tue, 19 Jan 2010)
New Revision: 40605
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecurePortalServlet.java
Log:
CMSC-1617 SSO -- Error message, to many redirects add a default login url
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecurePortalServlet.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecurePortalServlet.java
2010-01-19 06:50:59 UTC (rev 40604)
+++
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecurePortalServlet.java
2010-01-19 06:53:13 UTC (rev 40605)
@@ -15,6 +15,7 @@
import com.finalist.cmsc.navigation.NavigationUtil;
import com.finalist.cmsc.security.SecurityUtil;
import com.finalist.cmsc.security.UserRole;
+import com.finalist.cmsc.services.community.Community;
import com.finalist.cmsc.services.sitemanagement.SiteManagement;
import com.finalist.cmsc.util.HttpUtil;
@@ -30,7 +31,8 @@
log.debug("Page: allowed to see");
return super.doRender(request, response, path);
}
- Cloud cloud = CloudUtil.getCloudFromThread();
+
+ Cloud cloud = CloudUtil.getCloudFromThread();
if (cloud != null) {
Node node = cloud.getNode(item.getId());
UserRole role = NavigationUtil.getRole(cloud, node, false);
@@ -38,7 +40,19 @@
return super.doRender(request, response, path);
}
}
-
response.sendRedirect(getServletContext().getInitParameter("casServerLoginUrl")+"?service="+HttpUtil.getWebappUri(request)+path);
+ if (Community.isAuthenticated()) {
+ String noRightPage =
SiteManagement.getSiteFromPath(path).getUrlfragment()+"/403";
+ response.sendRedirect(HttpUtil.getWebappUri(request)+noRightPage);
+ }
+ String locale = null;
+ if (request.getSession().getAttribute("cas_login_locale") != null) {
+ locale =
(String)request.getSession().getAttribute("cas_login_locale");
+ }
+ String defaultLoginUrl = "casServerLoginUrl";
+ if (locale != null) {
+ defaultLoginUrl += "_"+locale;
+ }
+
response.sendRedirect(getServletContext().getInitParameter(defaultLoginUrl)+"?service="+HttpUtil.getWebappUri(request)+path);
log.warn("Page: not allowed to see, no login page found!");
return false;
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40604 - CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/META-INF
Author: kevinshen Date: 2010-01-19 07:50:59 +0100 (Tue, 19 Jan 2010) New Revision: 40604 Modified: CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/META-INF/context.xml Log: CMSC-1617 SSO -- Error message, to many redirects add a default login url add a default login/logout url Modified: CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/META-INF/context.xml === --- CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/META-INF/context.xml 2010-01-19 06:49:10 UTC (rev 40603) +++ CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/META-INF/context.xml 2010-01-19 06:50:59 UTC (rev 40604) @@ -131,11 +131,13 @@ + https://replace.with.cashost/single-sign-on/login_en"; override="false"/> https://replace.with.cashost/single-sign-on/login_en"; override="false"/> https://replace.with.cashost/single-sign-on/login_nl"; override="false"/> http://replace.with.cmschost"; override="false"/> https://replace.with.cashost/single-sign-on"; override="false"/> + https://replace.with.cashost/single-sign-on/logout_en"; override="false"/> https://replace.with.cashost/single-sign-on/logout_en"; override="false"/> https://replace.with.cashost/single-sign-on/logout_nl"; override="false"/> ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40603 - in CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community: servlet taglib
Author: kevinshen
Date: 2010-01-19 07:49:10 +0100 (Tue, 19 Jan 2010)
New Revision: 40603
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/servlet/CommunityLogoutServlet.java
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/LogLinkTag.java
Log:
CMSC-1617 SSO -- Error message, to many redirects
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/servlet/CommunityLogoutServlet.java
===
---
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/servlet/CommunityLogoutServlet.java
2010-01-19 02:18:40 UTC (rev 40602)
+++
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/servlet/CommunityLogoutServlet.java
2010-01-19 06:49:10 UTC (rev 40603)
@@ -27,7 +27,11 @@
locale =
(String)request.getSession().getAttribute("cas_login_locale");
}
request.getSession().invalidate();
-
response.sendRedirect(getServletContext().getInitParameter("casServerLogoutUrl"+"_"+(locale==null?"":locale)));
+ String defaultLogoutUrl = "casServerLogoutUrl";
+ if (locale != null) {
+ defaultLogoutUrl += "_"+locale;
+ }
+
response.sendRedirect(getServletContext().getInitParameter(defaultLogoutUrl));
log.error("There is no right casServerLogoutUrl in the context.xml");
}
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/LogLinkTag.java
===
---
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/LogLinkTag.java
2010-01-19 02:18:40 UTC (rev 40602)
+++
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/LogLinkTag.java
2010-01-19 06:49:10 UTC (rev 40603)
@@ -38,7 +38,11 @@
}
org.acegisecurity.Authentication authentication =
SecurityContextHolder.getContext().getAuthentication();
if(authentication == null) {
- link =
getParameter("casServerLoginUrl"+"_"+locale)+"?service="+backUrl;
+ String defaultLoginUrl = "casServerLoginUrl";
+ if(locale != null) {
+defaultLoginUrl += "_"+locale;
+ }
+ link = getParameter(defaultLoginUrl)+"?service="+backUrl;
req.getSession().setAttribute(CAS_LOGIN_LOCALE, locale);
}
else {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40602 - CMSContainer/trunk/CMSContainer_Modules/community/src/webapp/WEB-INF
Author: kevinshen Date: 2010-01-19 03:18:40 +0100 (Tue, 19 Jan 2010) New Revision: 40602 Modified: CMSContainer/trunk/CMSContainer_Modules/community/src/webapp/WEB-INF/web.xml Log: CMSC-1613 SSO - login fails second time you loggin. Modified: CMSContainer/trunk/CMSContainer_Modules/community/src/webapp/WEB-INF/web.xml === --- CMSContainer/trunk/CMSContainer_Modules/community/src/webapp/WEB-INF/web.xml 2010-01-18 20:16:19 UTC (rev 40601) +++ CMSContainer/trunk/CMSContainer_Modules/community/src/webapp/WEB-INF/web.xml 2010-01-19 02:18:40 UTC (rev 40602) @@ -108,56 +108,33 @@ SecurityFilterChainProxy /* - + Filter catch all requests. @@ -230,7 +207,9 @@ Pluto Driver CmscPortalServlet - com.finalist.cmsc.portalImpl.PortalServlet + + + com.finalist.cmsc.portalImpl.SecurePortalServlet charset utf-8 @@ -242,7 +221,7 @@ All portlets are handled through this servlet. Portlet servlet CmscPortletServlet - com.finalist.cmsc.portalImpl.SecurePortletServlet + com.finalist.cmsc.portalImpl.PortletServlet 3 @@ -361,7 +340,7 @@ true - +
[MMBASE SCM] r40595 - in CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc: community/filter services/community/security
Author: kevinshen
Date: 2010-01-18 10:44:54 +0100 (Mon, 18 Jan 2010)
New Revision: 40595
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/filter/SingleSignOnFilter.java
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security/AuthenticationHibernateService.java
Log:
CMSC-1613 SSO - login fails second time you loggin.
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/filter/SingleSignOnFilter.java
===
---
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/filter/SingleSignOnFilter.java
2010-01-17 19:33:52 UTC (rev 40594)
+++
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/filter/SingleSignOnFilter.java
2010-01-18 09:44:54 UTC (rev 40595)
@@ -87,10 +87,11 @@
}
private void addPerson(String idStoreId, Authentication ldapAuthentication)
{
- Person person =
personService.getPersonByUserId(ldapAuthentication.getUserId());
+
Person personLDAP= personLDAPService.getPersonByUserId(idStoreId);
-
- if (person != null) {
+ Authentication authentication =
authenticationService.findAuthentication(ldapAuthentication.getUserId());
+ if (authentication != null) {
+ Person person =
personService.getPersonByUserId(ldapAuthentication.getUserId());
//update the information of person
person.setFirstName(personLDAP.getFirstName());
person.setLastName(personLDAP.getLastName());
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security/AuthenticationHibernateService.java
===
---
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security/AuthenticationHibernateService.java
2010-01-17 19:33:52 UTC (rev 40594)
+++
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security/AuthenticationHibernateService.java
2010-01-18 09:44:54 UTC (rev 40595)
@@ -150,7 +150,7 @@
@SuppressWarnings("unchecked")
private Authentication findAuthenticationByCriteria(Criteria criteria) {
List authenticationList = criteria.list();
- return authenticationList.size() == 1 ? (Authentication)
authenticationList.get(0) : null;
+ return authenticationList.size() >= 1 ? (Authentication)
authenticationList.get(0) : null;
}
private String encodePassword(String password, String salt) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40583 - CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/META-INF
Author: kevinshen Date: 2010-01-15 10:11:16 +0100 (Fri, 15 Jan 2010) New Revision: 40583 Modified: CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/META-INF/context.xml Log: CMSC-1616 SSO - more then one SSO login link Modified: CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/META-INF/context.xml === --- CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/META-INF/context.xml 2010-01-15 09:09:41 UTC (rev 40582) +++ CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/META-INF/context.xml 2010-01-15 09:11:16 UTC (rev 40583) @@ -131,9 +131,11 @@ - https://replace.with.cashost/single-sign-on/login"; override="false"/> + https://replace.with.cashost/single-sign-on/login_en"; override="false"/> + https://replace.with.cashost/single-sign-on/login_nl"; override="false"/> http://replace.with.cmschost"; override="false"/> https://replace.with.cashost/single-sign-on"; override="false"/> - https://replace.with.cashost/single-sign-on/logout"; override="false"/> + https://replace.with.cashost/single-sign-on/logout_en"; override="false"/> + https://replace.with.cashost/single-sign-on/logout_nl"; override="false"/> ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40582 - in CMSContainer/trunk/CMSContainer_Modules/community/src: java/com/finalist/cmsc/community/servlet java/com/finalist/cmsc/community/taglib tld
Author: kevinshen
Date: 2010-01-15 10:09:41 +0100 (Fri, 15 Jan 2010)
New Revision: 40582
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/servlet/CommunityLogoutServlet.java
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/LogLinkTag.java
CMSContainer/trunk/CMSContainer_Modules/community/src/tld/community.tld
Log:
CMSC-1616 SSO - more then one SSO login link
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/servlet/CommunityLogoutServlet.java
===
---
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/servlet/CommunityLogoutServlet.java
2010-01-15 08:10:03 UTC (rev 40581)
+++
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/servlet/CommunityLogoutServlet.java
2010-01-15 09:09:41 UTC (rev 40582)
@@ -8,9 +8,12 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.log4j.Logger;
+
@SuppressWarnings("serial")
public class CommunityLogoutServlet extends HttpServlet {
+ private static final Logger log =
Logger.getLogger(CommunityLogoutServlet.class);
@Override
public void init(ServletConfig config) throws ServletException {
super.init(config);
@@ -18,7 +21,14 @@
@Override
public void service(HttpServletRequest request, HttpServletResponse
response) throws IOException {
+
+ String locale = null;
+ if (request.getSession().getAttribute("cas_login_locale") != null) {
+ locale =
(String)request.getSession().getAttribute("cas_login_locale");
+ }
request.getSession().invalidate();
-
response.sendRedirect(getServletContext().getInitParameter("casServerLogoutUrl"));
+
response.sendRedirect(getServletContext().getInitParameter("casServerLogoutUrl"+"_"+(locale==null?"":locale)));
+
+ log.error("There is no right casServerLogoutUrl in the context.xml");
}
}
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/LogLinkTag.java
===
---
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/LogLinkTag.java
2010-01-15 08:10:03 UTC (rev 40581)
+++
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/LogLinkTag.java
2010-01-15 09:09:41 UTC (rev 40582)
@@ -9,12 +9,19 @@
public class LogLinkTag extends AbstractSSOTag {
+ private static final String CAS_LOGIN_LOCALE = "cas_login_locale";
private String referurl;
+ private String locale;
public void setReferurl(String referurl) {
this.referurl = referurl;
}
+
+ public void setLocale(String locale) {
+ this.locale = locale;
+ }
+
@Override
protected String getValue() {
PageContext ctx = (PageContext) getJspContext();
@@ -31,7 +38,8 @@
}
org.acegisecurity.Authentication authentication =
SecurityContextHolder.getContext().getAuthentication();
if(authentication == null) {
- link = getParameter("casServerLoginUrl")+"?service="+backUrl;
+ link =
getParameter("casServerLoginUrl"+"_"+locale)+"?service="+backUrl;
+ req.getSession().setAttribute(CAS_LOGIN_LOCALE, locale);
}
else {
link = HttpUtil.getWebappUri(req)+"LogoutServlet";
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/tld/community.tld
===
--- CMSContainer/trunk/CMSContainer_Modules/community/src/tld/community.tld
2010-01-15 08:10:03 UTC (rev 40581)
+++ CMSContainer/trunk/CMSContainer_Modules/community/src/tld/community.tld
2010-01-15 09:09:41 UTC (rev 40582)
@@ -122,6 +122,12 @@
false
false
+
+ locale
+ JSP variable name to value of locale.
+ false
+ false
+
remoteUser
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40581 - CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/filter
Author: kevinshen
Date: 2010-01-15 09:10:03 +0100 (Fri, 15 Jan 2010)
New Revision: 40581
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/filter/SingleSignOnFilter.java
Log:
CMSC-1612 SSO - Initial data sync fails on none mandatory fields
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/filter/SingleSignOnFilter.java
===
---
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/filter/SingleSignOnFilter.java
2010-01-14 18:02:34 UTC (rev 40580)
+++
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/filter/SingleSignOnFilter.java
2010-01-15 08:10:03 UTC (rev 40581)
@@ -101,7 +101,7 @@
}
else {
Authentication newAuthentication =
authenticationService.createAuthentication(ldapAuthentication);
- Person newPerson =
personService.createPerson(personLDAP.getFirstName(), "",
personLDAP.getLastName(), newAuthentication.getId(),
RegisterStatus.ACTIVE.getName(), new Date());
+ Person newPerson =
personService.createPerson(personLDAP.getFirstName()==null?"":personLDAP.getFirstName(),
"", personLDAP.getLastName()==null?"":personLDAP.getLastName(),
newAuthentication.getId(), RegisterStatus.ACTIVE.getName(), new Date());
newPerson.setEmail(personLDAP.getEmail());
personService.updatePerson(newPerson);
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40549 - CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
Author: kevinshen
Date: 2010-01-13 06:01:07 +0100 (Wed, 13 Jan 2010)
New Revision: 40549
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonLDAPService.java
Log:
CMSC-1539 CAS single sign-on implementation
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonLDAPService.java
===
---
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonLDAPService.java
2010-01-12 20:15:49 UTC (rev 40548)
+++
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonLDAPService.java
2010-01-13 05:01:07 UTC (rev 40549)
@@ -15,7 +15,6 @@
import com.finalist.cmsc.services.AbstractLDAPService;
import com.finalist.cmsc.services.community.domain.PersonExportImportVO;
-import com.finalist.cmsc.services.community.security.AuthenticationService;
import com.finalist.cmsc.services.community.security.Authority;
/**
@@ -26,7 +25,6 @@
public static final String RELATION_BASE_DN =
"ou=Relations,ou=idstore,dc=nai,dc=nl";
public static final String RELATION_CLASS_NAME = "naiIDStorePerson";
- private AuthenticationService authenticationService;
/**
* {...@inheritdoc}
*/
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40445 - CMSContainer/trunk/CMSContainer_Modules/community
Author: kevinshen
Date: 2010-01-11 04:33:46 +0100 (Mon, 11 Jan 2010)
New Revision: 40445
Added:
CMSContainer/trunk/CMSContainer_Modules/community/SSO_SIMPLE_GUIDE.txt
Log:
CMSC-1539 CAS single sign-on implementation Add SSO's guide
Added: CMSContainer/trunk/CMSContainer_Modules/community/SSO_SIMPLE_GUIDE.txt
===
--- CMSContainer/trunk/CMSContainer_Modules/community/SSO_SIMPLE_GUIDE.txt
(rev 0)
+++ CMSContainer/trunk/CMSContainer_Modules/community/SSO_SIMPLE_GUIDE.txt
2010-01-11 03:33:46 UTC (rev 40445)
@@ -0,0 +1,136 @@
+If you want to use SSO in community, Firstly you should setup ID-store.
+and then perform the following steps.
+
+1. Change the context.xml. Ensure the following elements are there. and
replace the values with the real values.
+
+
+
+
+
+
+ ldap://replace.with.ldaphost";
type="java.lang.String" />
+
+
+
+
+
+ https://replace.with.cashost/single-sign-on/login"; override="false"/>
+ https://replace.with.cmschost";
override="false"/>
+ https://replace.with.cashost/single-sign-on"; override="false"/>
+
+ https://replace.with.cashost/single-sign-on/logout"; override="false"/>
+
+2. Change web.xml.
+
+ 2.1 Uncomment the CAS filters
+
+
+ CAS Validation Filter
+
org.jasig.cas.client.validation.Saml11TicketValidationFilter
+
+
+SSO Filter
+
com.finalist.cmsc.community.filter.SingleSignOnFilter
+
+
+ CAS HttpServletRequest Wrapper Filter
+
org.jasig.cas.client.util.HttpServletRequestWrapperFilter
+
+
+ CAS Validation Filter
+ /*
+
+
+CAS HttpServletRequest Wrapper Filter
+/*
+
+
+ SSO Filter
+ /*
+
+
+ 2.2 Uncomment the logout servlet .
+
+
+ Returns xml content
+ CommunityLogoutServlet
+
com.finalist.cmsc.community.servlet.CommunityLogoutServlet
+ 5
+
+
+ CommunityLogoutServlet
+ /LogoutServlet
+
+
+ 2.3 Change the portal servlet from PortalServlet to SecurePortalServlet.
+
+Pluto Driver
+CmscPortalServlet
+
com.finalist.cmsc.portalImpl.SecurePortalServlet
+
+charset
+utf-8
+
+4
+
+
+ 2.4 Comment the PortalFilter and its mapping
+
+PortalFilter
+
com.finalist.cmsc.login.filter.PortalFilter
+
+
+ 2.5 Ensure the following filter preceding the CAS filter
+
+
+ SecurityFilterChainProxy
+ org.acegisecurity.util.FilterToBeanProxy
+
+targetClass
+org.acegisecurity.util.FilterChainProxy
+
+
+
+ SecurityFilterChainProxy
+ /*
+
+
+3. Change the sprint-community.xml, uncomment the following beans
+
+
+
+
+
+
+
+
+
+ $env{ldap.url}
+
+
+
+
+
+
+
+
java.naming.security.authentication
+ $env{ldap.type}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 4. Uncomment the in the
edit_page.xml
+and uncomment the in
the load_page.xml
+
+
+
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40444 - in CMSContainer/trunk: CMSContainer/cmsc/basicmodel/config/applications CMSContainer/cmsc/portlets/config/applications CMSContainer/cmsc/sitemanagement/config/applications CMSCon
Author: kevinshen Date: 2010-01-11 04:00:20 +0100 (Mon, 11 Jan 2010) New Revision: 40444 Modified: CMSContainer/trunk/CMSContainer/cmsc/basicmodel/config/applications/basecontentelements.xml CMSContainer/trunk/CMSContainer/cmsc/portlets/config/applications/cmscportlets.xml CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/applications/sitemanagement.xml CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/basecontentelements.xml CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/cmscimpl.xml CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/cmscportlets.xml CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/sitemanagement.xml CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/config/applications/cmscimpl.xml CMSContainer/trunk/CMSContainer_Demo/i18n-demo/war/src/webapp/WEB-INF/config/applications/cmscimpl.xml CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-community-archetype/src/main/resources/archetype-resources/src/webapp/WEB-INF/config/applications/cmscimpl.xml CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war-live/src/webapp/WEB-INF/config/applications/basecontentelements.xml CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war-live/src/webapp/WEB-INF/config/applications/cmscportlets.xml CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war-live/src/webapp/WEB-INF/config/applications/sitemanagement.xml CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war/src/webapp/WEB-INF/config/applications/cmscimpl.xml CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-single-archetype/src/main/resources/archetype-resources/src/webapp/WEB-INF/config/applications/cmscimpl.xml CMSContainer/trunk/CMSContainer_Demo/www.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/basecontentelements.xml CMSContainer/trunk/CMSContainer_Demo/www.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/cmscportlets.xml CMSContainer/trunk/CMSContainer_Demo/www.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/sitemanagement.xml CMSContainer/trunk/CMSContainer_Modules/alias/config/applications/alias.xml CMSContainer/trunk/CMSContainer_Modules/fileupload/config/applications/fileupload.xml CMSContainer/trunk/CMSContainer_Modules/pagewizard/config/applications/pagewizard.xml CMSContainer/trunk/CMSContainer_Modules/rssfeed/config/applications/rssfeed.xml CMSContainer/trunk/CMSContainer_Modules/subsite/config/applications/subsite.xml CMSContainer/trunk/CMSContainer_Modules/workflow/config/applications/workflow.xml CMSContainer/trunk/CMSContainer_Portlets/portlets-googlemap/config/googlemap.xml CMSContainer/trunk/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/login/filter/PortalFilter.java CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter.xml CMSContainer/trunk/CMSContainer_Templates/double/war-live/src/webapp/WEB-INF/config/applications/basecontentelements.xml CMSContainer/trunk/CMSContainer_Templates/double/war-live/src/webapp/WEB-INF/config/applications/cmscportlets.xml CMSContainer/trunk/CMSContainer_Templates/double/war-live/src/webapp/WEB-INF/config/applications/sitemanagement.xml Log: CMSC-1539 CAS single sign-on implementation add new relation from page to pagegroup in sitemanagement.xml, upgrade the version Modified: CMSContainer/trunk/CMSContainer/cmsc/basicmodel/config/applications/basecontentelements.xml === --- CMSContainer/trunk/CMSContainer/cmsc/basicmodel/config/applications/basecontentelements.xml 2010-01-10 12:46:04 UTC (rev 40443) +++ CMSContainer/trunk/CMSContainer/cmsc/basicmodel/config/applications/basecontentelements.xml 2010-01-11 03:00:20 UTC (rev 40444) @@ -4,7 +4,7 @@ - + Modified: CMSContainer/trunk/CMSContainer/cmsc/portlets/config/applications/cmscportlets.xml === --- CMSContainer/trunk/CMSContainer/cmsc/portlets/config/applications/cmscportlets.xml 2010-01-10 12:46:04 UTC (rev 40443) +++ CMSContainer/trunk/CMSContainer/cmsc/portlets/config/applications/cmscportlets.xml 2010-01-11 03:00:20 UTC (rev 40444) @@ -3,7 +3,7 @@ - + Modified: CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/applications/sitemanagement.xml
[MMBASE SCM] r40413 - CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/WEB-INF
Author: kevinshen Date: 2010-01-08 08:13:38 +0100 (Fri, 08 Jan 2010) New Revision: 40413 Modified: CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/WEB-INF/web.xml Log: CMSC-1539 CAS single sign-on implementation Modified: CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/WEB-INF/web.xml === --- CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/WEB-INF/web.xml 2010-01-08 06:28:23 UTC (rev 40412) +++ CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/WEB-INF/web.xml 2010-01-08 07:13:38 UTC (rev 40413) @@ -91,10 +91,6 @@ org.springframework.web.context.ContextLoaderListener - - - org.jasig.cas.client.session.SingleSignOutHttpSessionListener - SecurityFilterChainProxy @@ -109,21 +105,14 @@ /*
[MMBASE SCM] r40411 - CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl
Author: kevinshen
Date: 2010-01-08 07:11:45 +0100 (Fri, 08 Jan 2010)
New Revision: 40411
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecurePortalServlet.java
Log:
CMSC-1539 CAS single sign-on implementation
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecurePortalServlet.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecurePortalServlet.java
2010-01-07 18:52:39 UTC (rev 40410)
+++
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecurePortalServlet.java
2010-01-08 06:11:45 UTC (rev 40411)
@@ -30,16 +30,17 @@
log.debug("Page: allowed to see");
return super.doRender(request, response, path);
}
- Cloud cloud = CloudUtil.getCloudFromThread();
- Node node = cloud.getNode(item.getId());
- UserRole role = NavigationUtil.getRole(cloud, node, false);
- if (SecurityUtil.isWriter(role)) {
-return super.doRender(request, response, path);
+ Cloud cloud = CloudUtil.getCloudFromThread();
+ if (cloud != null) {
+ Node node = cloud.getNode(item.getId());
+ UserRole role = NavigationUtil.getRole(cloud, node, false);
+ if (SecurityUtil.isWriter(role)) {
+return super.doRender(request, response, path);
+ }
}
response.sendRedirect(getServletContext().getInitParameter("casServerLoginUrl")+"?service="+HttpUtil.getWebappUri(request)+path);
-
- log.warn("Page: not allowed to see, no login page found!");
- return false;
+ log.warn("Page: not allowed to see, no login page found!");
+ return false;
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40309 - in CMSContainer/trunk/CMSContainer/cmsc/sitemanagement: config/builders/sitemanagement src/webapp/editors/config src/webapp/editors/config/pagegroup
Author: kevinshen Date: 2010-01-04 08:02:38 +0100 (Mon, 04 Jan 2010) New Revision: 40309 Added: CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/builders/sitemanagement/pagegroup.xml CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/pagegroup/ CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/pagegroup/search_page_related_pagegroup.xml Log: CMSC-1539 CAS single sign-on implementation Added: CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/builders/sitemanagement/pagegroup.xml === --- CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/builders/sitemanagement/pagegroup.xml (rev 0) +++ CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/builders/sitemanagement/pagegroup.xml 2010-01-04 07:02:38 UTC (rev 40309) @@ -0,0 +1,46 @@ + +http://www.mmbase.org/xmlns/builder"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://www.mmbase.org/xmlns/builder +http://www.mmbase.org/xmlns/builder.xsd"; + extends="object" maintainer="finalist.com" name="pagegroup" version="1"> + + active + 70 + + Pagina groep + Page group + Pagina groep + Page groep + + + + + + + + + + + + + + + Groep naam + Group name + + + + 2 + 2 + 2 + + + http://www.mmbase.org/xmlns/datatypes"; /> + + name + STRING + + + + Added: CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/pagegroup/search_page_related_pagegroup.xml === --- CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/pagegroup/search_page_related_pagegroup.xml (rev 0) +++ CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/pagegroup/search_page_related_pagegroup.xml 2010-01-04 07:02:38 UTC (rev 40309) @@ -0,0 +1,18 @@ + +http://www.mmbase.org/dtd/wizard-schema_1_0.dtd";> + + Groepen met toegang + Groups with access + + + Name + Naam + + + + + + + + + \ No newline at end of file ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40379 - CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/META-INF
Author: kevinshen Date: 2010-01-07 10:38:23 +0100 (Thu, 07 Jan 2010) New Revision: 40379 Modified: CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/META-INF/context.xml Log: CMSC-1539 CAS single sign-on implementation Modified: CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/META-INF/context.xml === --- CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/META-INF/context.xml 2010-01-07 09:37:40 UTC (rev 40378) +++ CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/META-INF/context.xml 2010-01-07 09:38:23 UTC (rev 40379) @@ -126,8 +126,7 @@ - ldap://192.168.4.67:389"; type="java.lang.String" /> - + ldap://192.168.4.67"; type="java.lang.String" /> ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40378 - CMSContainer/trunk/CMSContainer_Modules/community/src/webapp/WEB-INF
Author: kevinshen
Date: 2010-01-07 10:37:40 +0100 (Thu, 07 Jan 2010)
New Revision: 40378
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/webapp/WEB-INF/spring-community.xml
CMSContainer/trunk/CMSContainer_Modules/community/src/webapp/WEB-INF/web.xml
Log:
CMSC-1539 CAS single sign-on implementation
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/webapp/WEB-INF/spring-community.xml
===
---
CMSContainer/trunk/CMSContainer_Modules/community/src/webapp/WEB-INF/spring-community.xml
2010-01-07 09:07:53 UTC (rev 40377)
+++
CMSContainer/trunk/CMSContainer_Modules/community/src/webapp/WEB-INF/spring-community.xml
2010-01-07 09:37:40 UTC (rev 40378)
@@ -98,7 +98,6 @@
$env{ldap.url}
-
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/webapp/WEB-INF/web.xml
===
---
CMSContainer/trunk/CMSContainer_Modules/community/src/webapp/WEB-INF/web.xml
2010-01-07 09:07:53 UTC (rev 40377)
+++
CMSContainer/trunk/CMSContainer_Modules/community/src/webapp/WEB-INF/web.xml
2010-01-07 09:37:40 UTC (rev 40378)
@@ -361,9 +361,8 @@
true
-
+
- Returns xml content
CommunityLogoutServlet
com.finalist.cmsc.community.servlet.CommunityLogoutServlet
5
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40377 - CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/WEB-INF
Author: kevinshen Date: 2010-01-07 10:07:53 +0100 (Thu, 07 Jan 2010) New Revision: 40377 Modified: CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/WEB-INF/web.xml Log: CMSC-1539 CAS single sign-on implementation Modified: CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/WEB-INF/web.xml === --- CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/WEB-INF/web.xml 2010-01-07 08:23:14 UTC (rev 40376) +++ CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/WEB-INF/web.xml 2010-01-07 09:07:53 UTC (rev 40377) @@ -374,6 +374,19 @@ true + + + +
[MMBASE SCM] r40376 - CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl
Author: kevinshen
Date: 2010-01-07 09:23:14 +0100 (Thu, 07 Jan 2010)
New Revision: 40376
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecurePortalServlet.java
Log:
CMSC-1539 CAS single sign-on implementation
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecurePortalServlet.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecurePortalServlet.java
2010-01-07 08:17:19 UTC (rev 40375)
+++
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecurePortalServlet.java
2010-01-07 08:23:14 UTC (rev 40376)
@@ -7,8 +7,14 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.mmbase.bridge.Cloud;
+import org.mmbase.bridge.Node;
+import org.mmbase.bridge.util.CloudUtil;
import com.finalist.cmsc.beans.om.NavigationItem;
+import com.finalist.cmsc.navigation.NavigationUtil;
+import com.finalist.cmsc.security.SecurityUtil;
+import com.finalist.cmsc.security.UserRole;
import com.finalist.cmsc.services.sitemanagement.SiteManagement;
import com.finalist.cmsc.util.HttpUtil;
@@ -24,9 +30,14 @@
log.debug("Page: allowed to see");
return super.doRender(request, response, path);
}
-
-
response.sendRedirect(this.getServletContext().getInitParameter("casServerLoginUrl")+"?service="+HttpUtil.getWebappUri(request)+path);
-
+ Cloud cloud = CloudUtil.getCloudFromThread();
+ Node node = cloud.getNode(item.getId());
+ UserRole role = NavigationUtil.getRole(cloud, node, false);
+ if (SecurityUtil.isWriter(role)) {
+return super.doRender(request, response, path);
+ }
+
response.sendRedirect(getServletContext().getInitParameter("casServerLoginUrl")+"?service="+HttpUtil.getWebappUri(request)+path);
+
log.warn("Page: not allowed to see, no login page found!");
return false;
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40373 - in CMSContainer/trunk/CMSContainer_Modules/community/src: java/com/finalist/cmsc/community java/com/finalist/cmsc/community/filter java/com/finalist/cmsc/community/servlet java/c
Author: kevinshen
Date: 2010-01-07 08:31:48 +0100 (Thu, 07 Jan 2010)
New Revision: 40373
Added:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/servlet/
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/servlet/CommunityLogoutServlet.java
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/filter/SingleSignOnFilter.java
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/AbstractSSOTag.java
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/LogLinkTag.java
CMSContainer/trunk/CMSContainer_Modules/community/src/tld/community.tld
CMSContainer/trunk/CMSContainer_Modules/community/src/webapp/WEB-INF/web.xml
Log:
CMSC-1539 CAS single sign-on implementation
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/filter/SingleSignOnFilter.java
===
---
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/filter/SingleSignOnFilter.java
2010-01-07 07:08:56 UTC (rev 40372)
+++
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/filter/SingleSignOnFilter.java
2010-01-07 07:31:48 UTC (rev 40373)
@@ -112,12 +112,12 @@
Set < String > authoritiesDB
=authorityService.getAuthorityNamesForUser(ldapAuthentication.getUserId());
for (Authority authority : ldapAuthentication.getAuthorities()) {
- if (!allDBAuthorities.contains(authority)) {
+ if (!allDBAuthorities.contains(authority.getName())) {
authorityService.createAuthority(null, authority.getName());
authenticationService.addAuthorityToUser(ldapAuthentication.getUserId(),
authority.getName());
}
else {
-if (!authoritiesDB.contains(authority)) {
+if (!authoritiesDB.contains(authority.getName())) {
authenticationService.addAuthorityToUser(ldapAuthentication.getUserId(),
authority.getName());
}
}
Added:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/servlet/CommunityLogoutServlet.java
===
---
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/servlet/CommunityLogoutServlet.java
(rev 0)
+++
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/servlet/CommunityLogoutServlet.java
2010-01-07 07:31:48 UTC (rev 40373)
@@ -0,0 +1,24 @@
+package com.finalist.cmsc.community.servlet;
+
+import java.io.IOException;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+...@suppresswarnings("serial")
+public class CommunityLogoutServlet extends HttpServlet {
+
+ @Override
+ public void init(ServletConfig config) throws ServletException {
+ super.init(config);
+ }
+
+ @Override
+ public void service(HttpServletRequest request, HttpServletResponse
response) throws IOException {
+ request.getSession().invalidate();
+
response.sendRedirect(getServletContext().getInitParameter("casServerLogoutUrl"));
+ }
+}
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/AbstractSSOTag.java
===
---
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/AbstractSSOTag.java
2010-01-07 07:08:56 UTC (rev 40372)
+++
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/AbstractSSOTag.java
2010-01-07 07:31:48 UTC (rev 40373)
@@ -13,6 +13,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import com.finalist.cmsc.util.ServerUtil;
+import com.finalist.pluto.portalImpl.core.PortalEnvironment;
+import com.finalist.pluto.portalImpl.core.PortalURL;
+
public abstract class AbstractSSOTag extends CommunityTagSupport{
private static final Log log = LogFactory.getLog(UseSSOTag.class);
@@ -73,6 +77,18 @@
return value;
}
+ protected String getPath() {
+ PageContext ctx = (PageContext) getJspContext();
+ HttpServletRequest request = (HttpServletRequest) ctx.getRequest();
+ PortalEnvironment env = PortalEnvironment.getPortalEnvironment(request);
+ PortalURL currentURL = env.getRequestedPortalURL();
+ String path = currentURL.getGlobalNavigationAsString();
+ if (ServerUtil.useServerName()) {
+ pa
[MMBASE SCM] r40311 - in CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community: filter taglib
Author: kevinshen
Date: 2010-01-04 09:10:35 +0100 (Mon, 04 Jan 2010)
New Revision: 40311
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/filter/SingleSignOnFilter.java
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/LogLinkTag.java
Log:
CMSC-1539 CAS single sign-on implementation
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/filter/SingleSignOnFilter.java
===
---
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/filter/SingleSignOnFilter.java
2010-01-04 07:11:52 UTC (rev 40310)
+++
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/filter/SingleSignOnFilter.java
2010-01-04 08:10:35 UTC (rev 40311)
@@ -11,9 +11,8 @@
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
-import org.acegisecurity.AuthenticationManager;
-import org.acegisecurity.context.SecurityContextHolder;
import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
import org.apache.commons.lang.StringUtils;
@@ -27,29 +26,31 @@
public class SingleSignOnFilter implements Filter{
+ private static final String SESSION_KEY_SUBJECT = "session_key_subject";
+
public void destroy() {
}
public void doFilter(ServletRequest sRequest, ServletResponse sResponse,
FilterChain filterChain) throws IOException, ServletException {
- org.acegisecurity.Authentication authentication =
SecurityContextHolder.getContext().getAuthentication();
- AuthenticationService authenticationService =
(AuthenticationService)ApplicationContextFactory.getBean("authenticationService");
- PersonService personLDAPService =
(PersonService)ApplicationContextFactory.getBean("personLDAPService");
- AuthenticationService authenticationLDAPService =
(AuthenticationService)ApplicationContextFactory.getBean("authenticationLDAPService");
+ // org.acegisecurity.Authentication authentication =
SecurityContextHolder.getContext().getAuthentication();
+ if (sRequest instanceof HttpServletRequest) {
+ HttpServletRequest request = (HttpServletRequest)sRequest;
+ org.acegisecurity.Authentication authentication =
(org.acegisecurity.Authentication)request.getSession().getAttribute(SESSION_KEY_SUBJECT);
- PersonService personService =
(PersonService)ApplicationContextFactory.getBean("personService");
-
-
- AuthorityService aus = (AuthorityService)
ApplicationContextFactory.getBean("authorityService");
- AuthorityService ldapAus = (AuthorityService)
ApplicationContextFactory.getBean("authorityLDAPService");
- AuthenticationManager authenticationManager =
(AuthenticationManager)ApplicationContextFactory.getBean("authenticationManager");
- UsernamePasswordAuthenticationToken authRequest = null;
- if(authentication == null) {
- if (sRequest instanceof HttpServletRequest) {
-HttpServletRequest request = (HttpServletRequest)sRequest;
+ if(authentication == null) {
String userId = request.getRemoteUser();
+
if (StringUtils.isNotEmpty(userId)) {
+ AuthenticationService authenticationService =
(AuthenticationService)ApplicationContextFactory.getBean("authenticationService");
+ PersonService personLDAPService =
(PersonService)ApplicationContextFactory.getBean("personLDAPService");
+ AuthenticationService authenticationLDAPService =
(AuthenticationService)ApplicationContextFactory.getBean("authenticationLDAPService");
+ PersonService personService =
(PersonService)ApplicationContextFactory.getBean("personService");
+
+ AuthorityService aus = (AuthorityService)
ApplicationContextFactory.getBean("authorityService");
+ AuthorityService ldapAus = (AuthorityService)
ApplicationContextFactory.getBean("authorityLDAPService");
+ UsernamePasswordAuthenticationToken authRequest = null;
Authentication tempAuthentication =
authenticationLDAPService.findAuthentication(userId);
Person person =
personService.getPersonByUserId(tempAuthentication.getUserId());
Person newPerson= personLDAPService.getPersonByUserId(userId);
@@ -69,9 +70,9 @@
else {
Authentication newAuthentication =
authenticationService.createAuthentication(tempAuthentication);
personServic
[MMBASE SCM] r40119 - CMSContainer/trunk/CMSContainer_Modules/publish-remote/src/java/org/mmbase/remotepublishing
Author: kevinshen
Date: 2009-12-04 02:45:49 +0100 (Fri, 04 Dec 2009)
New Revision: 40119
Modified:
CMSContainer/trunk/CMSContainer_Modules/publish-remote/src/java/org/mmbase/remotepublishing/PublishQueue.java
Log:
CMSC-1593 Publishqueue thread dies if youpublish during database backup
Modified:
CMSContainer/trunk/CMSContainer_Modules/publish-remote/src/java/org/mmbase/remotepublishing/PublishQueue.java
===
---
CMSContainer/trunk/CMSContainer_Modules/publish-remote/src/java/org/mmbase/remotepublishing/PublishQueue.java
2009-12-03 20:57:16 UTC (rev 40118)
+++
CMSContainer/trunk/CMSContainer_Modules/publish-remote/src/java/org/mmbase/remotepublishing/PublishQueue.java
2009-12-04 01:45:49 UTC (rev 40119)
@@ -75,6 +75,9 @@
log.warn("Failed to take node from queue ", e1);
// ignore current node, continue on next one.
}
+ catch (Throwable e) {
+ log.error("Throwable error : " + e.getMessage());
+ }
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40080 - CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
Author: kevinshen
Date: 2009-12-02 02:38:25 +0100 (Wed, 02 Dec 2009)
New Revision: 40080
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/asset.jsp
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.jsp
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
Log:
CMSC-1581 Content/Asset channel explorer: select all checkbox is missing label.
Adding a bit of padding between the checkbox and the label
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/asset.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/asset.jsp
2009-12-01 23:26:14 UTC (rev 40079)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/asset.jsp
2009-12-02 01:38:25 UTC (rev 40080)
@@ -132,7 +132,7 @@
<% if (role != null &&
SecurityUtil.isWriter(role)) { %>
- <% } %>
+ <% } %>
')" class="headerlink">
')" class="headerlink">
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
2009-12-01 23:26:14 UTC (rev 40079)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
2009-12-02 01:38:25 UTC (rev 40080)
@@ -406,7 +406,7 @@
"/>
-
+
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.jsp
2009-12-01 23:26:14 UTC (rev 40079)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.jsp
2009-12-02 01:38:25 UTC (rev 40080)
@@ -111,7 +111,7 @@
<% if (role != null && SecurityUtil.isWriter(role)) { %>
-
+
<% } %>
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
2009-12-01 23:26:14 UTC (rev 40079)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
2009-12-02 01:38:25 UTC (rev 40080)
@@ -421,11 +421,11 @@
" />
" />
"/>
-
+
-
+
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
