[MMBASE SCM] r43054 - in CMSContainer/branches/b1_5: CMSContainer/maven-base CMSContainer_Demo/demo.cmscontainer.org/maven-base CMSContainer_Modules/maven-base CMSContainer_Portlets/maven-base CMSCont
Author: fpunt Date: 2010-08-06 09:57:12 +0200 (Fri, 06 Aug 2010) New Revision: 43054 Modified: CMSContainer/branches/b1_5/CMSContainer/maven-base/project.properties CMSContainer/branches/b1_5/CMSContainer_Demo/demo.cmscontainer.org/maven-base/project.properties CMSContainer/branches/b1_5/CMSContainer_Modules/maven-base/project.properties CMSContainer/branches/b1_5/CMSContainer_Portlets/maven-base/project.properties CMSContainer/branches/b1_5/CMSContainer_Templates/double/maven-base/project.properties CMSContainer/branches/b1_5/CMSContainer_Templates/single/maven-base/project.properties Log: Releasing 1.4.5 Modified: CMSContainer/branches/b1_5/CMSContainer/maven-base/project.properties === --- CMSContainer/branches/b1_5/CMSContainer/maven-base/project.properties 2010-08-05 20:19:24 UTC (rev 43053) +++ CMSContainer/branches/b1_5/CMSContainer/maven-base/project.properties 2010-08-06 07:57:12 UTC (rev 43054) @@ -7,7 +7,7 @@ maven.multiproject.type=mmbase-module -cmsc.version=1.5.15-SNAPSHOT +cmsc.version=1.5.15 mmbase.version=1.8.7-20090803 # maven build does not yet generate a rmmci. Did not create one by hand Modified: CMSContainer/branches/b1_5/CMSContainer_Demo/demo.cmscontainer.org/maven-base/project.properties === --- CMSContainer/branches/b1_5/CMSContainer_Demo/demo.cmscontainer.org/maven-base/project.properties 2010-08-05 20:19:24 UTC (rev 43053) +++ CMSContainer/branches/b1_5/CMSContainer_Demo/demo.cmscontainer.org/maven-base/project.properties 2010-08-06 07:57:12 UTC (rev 43054) @@ -5,11 +5,11 @@ # See http://www.MMBase.org/license # -application.version=1.5.15-SNAPSHOT +application.version=1.5.15 -cmsc.version=1.5.15-SNAPSHOT -cmscportlets.version=1.5.15-SNAPSHOT -cmscmodules.version=1.5.15-SNAPSHOT +cmsc.version=1.5.15 +cmscportlets.version=1.5.15 +cmscmodules.version=1.5.15 mmbase.version=1.8.7-20090803 # maven build does not yet generate a rmmci. Did not create one by hand Modified: CMSContainer/branches/b1_5/CMSContainer_Modules/maven-base/project.properties === --- CMSContainer/branches/b1_5/CMSContainer_Modules/maven-base/project.properties 2010-08-05 20:19:24 UTC (rev 43053) +++ CMSContainer/branches/b1_5/CMSContainer_Modules/maven-base/project.properties 2010-08-06 07:57:12 UTC (rev 43054) @@ -7,8 +7,8 @@ maven.multiproject.type=mmbase-module -cmscmodules.version=1.5.15-SNAPSHOT -cmsc.version=1.5.15-SNAPSHOT +cmscmodules.version=1.5.15 +cmsc.version=1.5.15 mmbase.version=1.8.7-20090803 # maven build does not yet generate a rmmci. Did not create one by hand Modified: CMSContainer/branches/b1_5/CMSContainer_Portlets/maven-base/project.properties === --- CMSContainer/branches/b1_5/CMSContainer_Portlets/maven-base/project.properties 2010-08-05 20:19:24 UTC (rev 43053) +++ CMSContainer/branches/b1_5/CMSContainer_Portlets/maven-base/project.properties 2010-08-06 07:57:12 UTC (rev 43054) @@ -7,8 +7,8 @@ maven.multiproject.type=mmbase-module -cmscportlets.version=1.5.15-SNAPSHOT -cmsc.version=1.5.15-SNAPSHOT +cmscportlets.version=1.5.15 +cmsc.version=1.5.15 mmbase.version=1.8.7-20090803 Modified: CMSContainer/branches/b1_5/CMSContainer_Templates/double/maven-base/project.properties === --- CMSContainer/branches/b1_5/CMSContainer_Templates/double/maven-base/project.properties 2010-08-05 20:19:24 UTC (rev 43053) +++ CMSContainer/branches/b1_5/CMSContainer_Templates/double/maven-base/project.properties 2010-08-06 07:57:12 UTC (rev 43054) @@ -7,10 +7,10 @@ application.version=1.0-SNAPSHOT -cmsc.version=1.5.15-SNAPSHOT +cmsc.version=1.5.15 -cmscportlets.version=1.5.15-SNAPSHOT -cmscmodules.version=1.5.15-SNAPSHOT +cmscportlets.version=1.5.15 +cmscmodules.version=1.5.15 mmbase.version=1.8.7-20090803 # maven build does not yet generate a rmmci. Did not create one by hand Modified: CMSContainer/branches/b1_5/CMSContainer_Templates/single/maven-base/project.properties === --- CMSContainer/branches/b1_5/CMSContainer_Templates/single/maven-base/project.properties 2010-08-05 20:19:24 UTC (rev 43053) +++ CMSContainer/branches/b1_5/CMSContainer_Templates/single/maven-base/project.properties 2010-08-06 07:57:12 UTC (rev 43054) @@ -7,9 +7,9 @@ application.version=1.0-SNAPSHOT -cmsc.version=1.5.15-SNAPSHOT -cmscportlets.version=1.5.15-SNAPSHOT -cmscmodules.version=1.5.15-SNAPSHOT +cmsc.version=1.5.15 +cmscportlets.version=1.5.15 +cmscmodules.version=1.5.15 mmbase.version=1.8.7-20090803 # maven build does not yet generate a rmmci. Did not create one by hand
[MMBASE SCM] r43055 - CMSContainer/tags
Author: fpunt Date: 2010-08-06 10:40:56 +0200 (Fri, 06 Aug 2010) New Revision: 43055 Added: CMSContainer/tags/v1_5_15/ Log: Releasing 1.5.15 Copied: CMSContainer/tags/v1_5_15 (from rev 43054, CMSContainer/branches/b1_5/CMSContainer_Demo) ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r43056 - CMSContainer/tags
Author: fpunt Date: 2010-08-06 10:41:59 +0200 (Fri, 06 Aug 2010) New Revision: 43056 Removed: CMSContainer/tags/v1_5_15/ Log: Releasing 1.5.15 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r43057 - CMSContainer/tags
Author: fpunt Date: 2010-08-06 10:42:32 +0200 (Fri, 06 Aug 2010) New Revision: 43057 Added: CMSContainer/tags/v1_5_15/ Log: Releasing 1.5.15 Copied: CMSContainer/tags/v1_5_15 (from rev 43056, CMSContainer/branches/b1_5) ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r43058 - in CMSContainer/branches/b1_5: CMSContainer/maven-base CMSContainer_Demo/demo.cmscontainer.org/maven-base CMSContainer_Modules/maven-base CMSContainer_Portlets/maven-base CMSCont
Author: fpunt Date: 2010-08-06 10:44:27 +0200 (Fri, 06 Aug 2010) New Revision: 43058 Modified: CMSContainer/branches/b1_5/CMSContainer/maven-base/project.properties CMSContainer/branches/b1_5/CMSContainer_Demo/demo.cmscontainer.org/maven-base/project.properties CMSContainer/branches/b1_5/CMSContainer_Modules/maven-base/project.properties CMSContainer/branches/b1_5/CMSContainer_Portlets/maven-base/project.properties CMSContainer/branches/b1_5/CMSContainer_Templates/double/maven-base/project.properties CMSContainer/branches/b1_5/CMSContainer_Templates/single/maven-base/project.properties Log: Releasing 1.5.15 Modified: CMSContainer/branches/b1_5/CMSContainer/maven-base/project.properties === --- CMSContainer/branches/b1_5/CMSContainer/maven-base/project.properties 2010-08-06 08:42:32 UTC (rev 43057) +++ CMSContainer/branches/b1_5/CMSContainer/maven-base/project.properties 2010-08-06 08:44:27 UTC (rev 43058) @@ -7,7 +7,7 @@ maven.multiproject.type=mmbase-module -cmsc.version=1.5.15 +cmsc.version=1.5.16-SNAPSHOT mmbase.version=1.8.7-20090803 # maven build does not yet generate a rmmci. Did not create one by hand Modified: CMSContainer/branches/b1_5/CMSContainer_Demo/demo.cmscontainer.org/maven-base/project.properties === --- CMSContainer/branches/b1_5/CMSContainer_Demo/demo.cmscontainer.org/maven-base/project.properties 2010-08-06 08:42:32 UTC (rev 43057) +++ CMSContainer/branches/b1_5/CMSContainer_Demo/demo.cmscontainer.org/maven-base/project.properties 2010-08-06 08:44:27 UTC (rev 43058) @@ -5,11 +5,11 @@ # See http://www.MMBase.org/license # -application.version=1.5.15 +application.version=1.5.16-SNAPSHOT -cmsc.version=1.5.15 -cmscportlets.version=1.5.15 -cmscmodules.version=1.5.15 +cmsc.version=1.5.16-SNAPSHOT +cmscportlets.version=1.5.16-SNAPSHOT +cmscmodules.version=1.5.16-SNAPSHOT mmbase.version=1.8.7-20090803 # maven build does not yet generate a rmmci. Did not create one by hand Modified: CMSContainer/branches/b1_5/CMSContainer_Modules/maven-base/project.properties === --- CMSContainer/branches/b1_5/CMSContainer_Modules/maven-base/project.properties 2010-08-06 08:42:32 UTC (rev 43057) +++ CMSContainer/branches/b1_5/CMSContainer_Modules/maven-base/project.properties 2010-08-06 08:44:27 UTC (rev 43058) @@ -7,8 +7,8 @@ maven.multiproject.type=mmbase-module -cmscmodules.version=1.5.15 -cmsc.version=1.5.15 +cmscmodules.version=1.5.16-SNAPSHOT +cmsc.version=1.5.16-SNAPSHOT mmbase.version=1.8.7-20090803 # maven build does not yet generate a rmmci. Did not create one by hand Modified: CMSContainer/branches/b1_5/CMSContainer_Portlets/maven-base/project.properties === --- CMSContainer/branches/b1_5/CMSContainer_Portlets/maven-base/project.properties 2010-08-06 08:42:32 UTC (rev 43057) +++ CMSContainer/branches/b1_5/CMSContainer_Portlets/maven-base/project.properties 2010-08-06 08:44:27 UTC (rev 43058) @@ -7,8 +7,8 @@ maven.multiproject.type=mmbase-module -cmscportlets.version=1.5.15 -cmsc.version=1.5.15 +cmscportlets.version=1.5.16-SNAPSHOT +cmsc.version=1.5.16-SNAPSHOT mmbase.version=1.8.7-20090803 Modified: CMSContainer/branches/b1_5/CMSContainer_Templates/double/maven-base/project.properties === --- CMSContainer/branches/b1_5/CMSContainer_Templates/double/maven-base/project.properties 2010-08-06 08:42:32 UTC (rev 43057) +++ CMSContainer/branches/b1_5/CMSContainer_Templates/double/maven-base/project.properties 2010-08-06 08:44:27 UTC (rev 43058) @@ -7,10 +7,10 @@ application.version=1.0-SNAPSHOT -cmsc.version=1.5.15 +cmsc.version=1.5.16-SNAPSHOT -cmscportlets.version=1.5.15 -cmscmodules.version=1.5.15 +cmscportlets.version=1.5.16-SNAPSHOT +cmscmodules.version=1.5.16-SNAPSHOT mmbase.version=1.8.7-20090803 # maven build does not yet generate a rmmci. Did not create one by hand Modified: CMSContainer/branches/b1_5/CMSContainer_Templates/single/maven-base/project.properties === --- CMSContainer/branches/b1_5/CMSContainer_Templates/single/maven-base/project.properties 2010-08-06 08:42:32 UTC (rev 43057) +++ CMSContainer/branches/b1_5/CMSContainer_Templates/single/maven-base/project.properties 2010-08-06 08:44:27 UTC (rev 43058) @@ -7,9 +7,9 @@ application.version=1.0-SNAPSHOT -cmsc.version=1.5.15 -cmscportlets.version=1.5.15 -cmscmodules.version=1.5.15 +cmsc.version=1.5.16-SNAPSHOT +cmscportlets.version=1.5.16-SNAPSHOT +cmscmodules.version=1.5.16-SNAPSHOT mmbase.version=1.8.7-20090803 # maven build does not yet generate a rmmci. Did not create one by hand
[MMBASE SCM] r43048 - CMSContainer/trunk/CMSContainer/migration
Author: fpunt Date: 2010-08-05 13:12:53 +0200 (Thu, 05 Aug 2010) New Revision: 43048 Added: CMSContainer/trunk/CMSContainer/migration/migration_1.8.4_to_1.8.5.txt Log: [CMSC-1728] Fixed problems with related content portlet Added: CMSContainer/trunk/CMSContainer/migration/migration_1.8.4_to_1.8.5.txt === --- CMSContainer/trunk/CMSContainer/migration/migration_1.8.4_to_1.8.5.txt (rev 0) +++ CMSContainer/trunk/CMSContainer/migration/migration_1.8.4_to_1.8.5.txt 2010-08-05 11:12:53 UTC (rev 43048) @@ -0,0 +1,12 @@ +Migration document: + +Part: core +From version: 1.8.4 +To version: 1.8.5 + +Name: Fix related portlets +Goal: the node parameters of these +Type: Manual script +--- Start script --- +run the publishnode.jsp maintenance page first on staging and later on live +--- End script --- \ No newline at end of file ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r43049 - CMSContainer/trunk/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance
Author: fpunt
Date: 2010-08-05 13:13:18 +0200 (Thu, 05 Aug 2010)
New Revision: 43049
Added:
CMSContainer/trunk/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance/portletparameter.jsp
Log:
[CMSC-1728] Fixed problems with related content portlet
Added:
CMSContainer/trunk/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance/portletparameter.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance/portletparameter.jsp
(rev 0)
+++
CMSContainer/trunk/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance/portletparameter.jsp
2010-08-05 11:13:18 UTC (rev 43049)
@@ -0,0 +1,107 @@
+%...@page language=java contentType=text/html;charset=UTF-8%
+%...@page import=com.finalist.cmsc.util.ThreadUtil %
+%...@include file=globals.jsp %
+
+%...@page import=org.mmbase.remotepublishing.PublishManager%
+%...@page import=org.mmbase.remotepublishing.CloudInfo%
+
+mm:content type=text/html encoding=UTF-8 expires=0
+mm:cloud jspvar=cloud loginpage=../editors/login.jsp rank=administrator
+!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Strict//EN
http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd;
+html:html xhtml=true
+cmscedit:head title=threads.title /
+body
+bPortlet parameter instead of node parameters:/bbr/
+ mm:list path=portletparameter,portlet,page
constraints=portletparameter.key='relatedPage'
+ c:set var=pageNumbermm:field name=page.number//c:set
+ c:set var=portletNumbermm:field
name=portlet.number//c:set
+ c:set var=portletParameterNumbermm:field
name=portletparameter.number//c:set
+
+ mm:node number=${pageNumber}
+ mm:field name=path/
+ /mm:node
+
+ mm:remove referid=portlet/
+ mm:node number=${portletNumber} id=portlet
+ mm:field name=title/
+ /mm:node
+
+ c:set var=size value=0/
+ mm:list path=portlet,nodeparameter
constraints=portlet.number = ${portletNumber}
+ mm:firstc:set
var=sizemm:size//c:set/mm:first
+ /mm:list
+ c:if test=${size == 0}
+ c:set var=keymm:field
name=portletparameter.key//c:set
+ c:set var=valuemm:field
name=portletparameter.value//c:set
+ c:set var=nodetypemm:node number=${value}
notfound=skipmm:nodeinfo type=type//mm:node/c:set
+ c:if test=${nodetype != 'page' nodetype !=
'site'}
+ mm:listnodes type=remotenodes
constraints=sourcenumber=${value}
+ c:set var=valuemm:field
name=destinationnumber//c:set
+ /mm:listnodes
+ /c:if
+ mm:remove referid=nodeparameter/
+ mm:createnode type=nodeparameter id=nodeparameter
+ mm:setfield name=key${key}/mm:setfield
+ mm:setfield name=value${value}/mm:setfield
+ /mm:createnode
+
+ mm:createrelation role=parameterrel source=portlet
destination=nodeparameter/
+
+ %try{ %
+ mm:deletenode number=${portletParameterNumber}
deleterelations=true/
+ % }catch (Exception e) {
+ } %
+ // created node parameter and removed portlet parameter
+ /c:if
+ c:if test=${size 0}
+ bAlready has node parameter, fix by hand!/b
+ /c:if
+ br/
+ /mm:list
+
+% if (ServerUtil.isStaging()) { %
+ br/br/bRelated portlets with no node parameters (only on
staging):/bbr/
+ mm:list path=portletdefinition,portlet,page
constraints=portletdefinition.definition='relatedcontentportlet'
+ c:set var=pageNumbermm:field
name=page.number//c:set
+ c:set var=portletNumbermm:field
name=portlet.number//c:set
+
+ c:set var=size value=0/
+ mm:list path=portlet,nodeparameter
constraints=portlet.number = ${portletNumber}
+ mm:firstc:set
var=sizemm:size//c:set/mm:first
+ /mm:list
+
+ c:if test=${size == 0}
+ mm:node number=${pageNumber}
+ mm:field name=path/
+ /mm:node
+
+ mm:remove referid=portlet/
+ mm:node number=${portletNumber} id=portlet
[MMBASE SCM] r43050 - CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets
Author: fpunt
Date: 2010-08-05 13:13:33 +0200 (Thu, 05 Aug 2010)
New Revision: 43050
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/RelatedContentPortlet.java
Log:
[CMSC-1728] Fixed problems with related content portlet
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/RelatedContentPortlet.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/RelatedContentPortlet.java
2010-08-05 11:13:18 UTC (rev 43049)
+++
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/RelatedContentPortlet.java
2010-08-05 11:13:33 UTC (rev 43050)
@@ -40,7 +40,7 @@
@Override
protected void saveParameters(ActionRequest request, String portletId) {
- setPortletParameter(portletId, RELATED_PAGE,
request.getParameter(RELATED_PAGE));
+ setPortletNodeParameter(portletId, RELATED_PAGE,
request.getParameter(RELATED_PAGE));
setPortletParameter(portletId, RELATED_WINDOW,
request.getParameter(RELATED_WINDOW));
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r43042 - CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets
Author: fpunt
Date: 2010-08-04 10:08:11 +0200 (Wed, 04 Aug 2010)
New Revision: 43042
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/RelatedContentPortlet.java
Log:
[CMSC-1725]
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/RelatedContentPortlet.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/RelatedContentPortlet.java
2010-08-03 11:51:26 UTC (rev 43041)
+++
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/RelatedContentPortlet.java
2010-08-04 08:08:11 UTC (rev 43042)
@@ -35,7 +35,8 @@
/**
* This regex pattern is used to match the elementId from a renderURL.
*/
- private static final String RENDERURL_ELEMENTID_PATTERN = _([0-9]+);
+ private static final String RENDERURL_ELEMENTID_WINDOW_REPLACE = WINDOW;
+ private static final String RENDERURL_ELEMENTID_PATTERN =
RENDERURL_ELEMENTID_WINDOW_REPLACE+_elementId/1_([0-9]+);
@Override
protected void saveParameters(ActionRequest request, String portletId) {
@@ -97,7 +98,7 @@
protected String getRelatedElementId(RenderRequest request, String
relatedPage, String relatedWindow) {
String elementId = getElementIdFromContentURL(request);
if (StringUtils.isEmpty(elementId)) {
- elementId = getElementIdFromRenderURL(request);
+ elementId = getElementIdFromRenderURL(request, relatedWindow);
if (StringUtils.isEmpty(elementId)) {
if (StringUtils.isNotEmpty(relatedPage)
StringUtils.isNotEmpty(relatedWindow)) {
elementId = getElementIdFromScreen(request,
relatedPage, relatedWindow);
@@ -131,9 +132,9 @@
return null;
}
- private String getElementIdFromRenderURL(RenderRequest req) {
+ private String getElementIdFromRenderURL(RenderRequest req, String
relatedWindow) {
String requestURL = getServletRequest(req).getRequestURL().toString();
- Pattern pattern = Pattern.compile(RENDERURL_ELEMENTID_PATTERN);
+ Pattern pattern =
Pattern.compile(RENDERURL_ELEMENTID_PATTERN.replaceAll(RENDERURL_ELEMENTID_WINDOW_REPLACE,
relatedWindow));
Matcher matcher = pattern.matcher(requestURL);
String value = null;
while (matcher.find() matcher.groupCount() = 1) {
@@ -141,6 +142,7 @@
}
return value;
}
+
private HttpServletRequest getServletRequest(RenderRequest req) {
return (HttpServletRequest) ((PortletRequestImpl) req).getRequest();
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r43043 - CMSContainer/trunk/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/portlet
Author: fpunt
Date: 2010-08-04 10:14:27 +0200 (Wed, 04 Aug 2010)
New Revision: 43043
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/portlet/TagPortlet.java
CMSContainer/trunk/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/portlet/TagRelatedPortlet.java
Log:
[CMSC-1726]
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/portlet/TagPortlet.java
===
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/portlet/TagPortlet.java
2010-08-04 08:08:11 UTC (rev 43042)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/portlet/TagPortlet.java
2010-08-04 08:14:27 UTC (rev 43043)
@@ -29,5 +29,4 @@
protected void saveParameters(ActionRequest request, String portletId) {
setPortletParameter(portletId, tag,
request.getParameter(tag));
}
-
-}
+}
\ No newline at end of file
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/portlet/TagRelatedPortlet.java
===
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/portlet/TagRelatedPortlet.java
2010-08-04 08:08:11 UTC (rev 43042)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/portlet/TagRelatedPortlet.java
2010-08-04 08:14:27 UTC (rev 43043)
@@ -64,14 +64,16 @@
}
private String getIdFromScreen(RenderRequest req, String relatedPage,
String relatedWindow, String var) {
- Integer pageId = Integer.valueOf(relatedPage);
- NavigationItem item = SiteManagement.getNavigationItem(pageId);
- if (item instanceof Page) {
- Page page = (Page) item;
- int portletId = page.getPortlet(relatedWindow);
- Portlet portlet = SiteManagement.getPortlet(portletId);
- if (portlet != null) {
- return portlet.getParameterValue(var);
+ if(relatedPage != null relatedPage.length() 0) {
+ Integer pageId = Integer.valueOf(relatedPage);
+ NavigationItem item =
SiteManagement.getNavigationItem(pageId);
+ if (item instanceof Page) {
+ Page page = (Page) item;
+ int portletId = page.getPortlet(relatedWindow);
+ Portlet portlet =
SiteManagement.getPortlet(portletId);
+ if (portlet != null) {
+ return portlet.getParameterValue(var);
+ }
}
}
return null;
@@ -81,16 +83,18 @@
protected void doEditDefaults(RenderRequest req, RenderResponse res)
throws IOException, PortletException {
String relatedPage =
req.getPreferences().getValue(RELATED_PAGE, null);
- Integer pageid = Integer.valueOf(relatedPage);
- String pagepath = SiteManagement.getPath(pageid, true);
-
- if (pagepath != null) {
- SetString positions =
SiteManagement.getPagePositions(pageid
- .toString());
- ListString orderedPositions = new
ArrayListString(positions);
- Collections.sort(orderedPositions);
- setAttribute(req, relatedPagepositions, new
ArrayListString(
- orderedPositions));
+ if(relatedPage != null relatedPage.length() 0) {
+ Integer pageid = Integer.valueOf(relatedPage);
+ String pagepath = SiteManagement.getPath(pageid, true);
+
+ if (pagepath != null) {
+ SetString positions =
SiteManagement.getPagePositions(pageid
+ .toString());
+ ListString orderedPositions = new
ArrayListString(positions);
+ Collections.sort(orderedPositions);
+ setAttribute(req, relatedPagepositions, new
ArrayListString(
+ orderedPositions));
+ }
}
super.doEditDefaults(req, res);
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r43044 - CMSContainer/trunk/CMSContainer_Portlets/portlets-tagcloud/resources/com/finalist/portlets/tagcloud/portlet
Author: fpunt Date: 2010-08-04 10:14:57 +0200 (Wed, 04 Aug 2010) New Revision: 43044 Modified: CMSContainer/trunk/CMSContainer_Portlets/portlets-tagcloud/resources/com/finalist/portlets/tagcloud/portlet/TagCloudPortlet.properties CMSContainer/trunk/CMSContainer_Portlets/portlets-tagcloud/resources/com/finalist/portlets/tagcloud/portlet/TagCloudPortlet_nl.properties CMSContainer/trunk/CMSContainer_Portlets/portlets-tagcloud/resources/com/finalist/portlets/tagcloud/portlet/TagPortlet.properties CMSContainer/trunk/CMSContainer_Portlets/portlets-tagcloud/resources/com/finalist/portlets/tagcloud/portlet/TagPortlet_nl.properties CMSContainer/trunk/CMSContainer_Portlets/portlets-tagcloud/resources/com/finalist/portlets/tagcloud/portlet/TagRelatedPortlet.properties CMSContainer/trunk/CMSContainer_Portlets/portlets-tagcloud/resources/com/finalist/portlets/tagcloud/portlet/TagRelatedPortlet_nl.properties Log: CMSC-1726 Modified: CMSContainer/trunk/CMSContainer_Portlets/portlets-tagcloud/resources/com/finalist/portlets/tagcloud/portlet/TagCloudPortlet.properties === --- CMSContainer/trunk/CMSContainer_Portlets/portlets-tagcloud/resources/com/finalist/portlets/tagcloud/portlet/TagCloudPortlet.properties 2010-08-04 08:14:27 UTC (rev 43043) +++ CMSContainer/trunk/CMSContainer_Portlets/portlets-tagcloud/resources/com/finalist/portlets/tagcloud/portlet/TagCloudPortlet.properties 2010-08-04 08:14:57 UTC (rev 43044) @@ -23,4 +23,7 @@ edit_defaults.pageselect=Select edit_defaults.window=Portlet +edit_defaults.portletset=Portlet Settings +edit_defaults.define=Definition + edit_defaults.save=Save Modified: CMSContainer/trunk/CMSContainer_Portlets/portlets-tagcloud/resources/com/finalist/portlets/tagcloud/portlet/TagCloudPortlet_nl.properties === --- CMSContainer/trunk/CMSContainer_Portlets/portlets-tagcloud/resources/com/finalist/portlets/tagcloud/portlet/TagCloudPortlet_nl.properties 2010-08-04 08:14:27 UTC (rev 43043) +++ CMSContainer/trunk/CMSContainer_Portlets/portlets-tagcloud/resources/com/finalist/portlets/tagcloud/portlet/TagCloudPortlet_nl.properties 2010-08-04 08:14:57 UTC (rev 43044) @@ -21,4 +21,7 @@ edit_defaults.erase=Wis +edit_defaults.portletset=Portlet instellingen +edit_defaults.define=Definitie + edit_defaults.save=Save Modified: CMSContainer/trunk/CMSContainer_Portlets/portlets-tagcloud/resources/com/finalist/portlets/tagcloud/portlet/TagPortlet.properties === --- CMSContainer/trunk/CMSContainer_Portlets/portlets-tagcloud/resources/com/finalist/portlets/tagcloud/portlet/TagPortlet.properties 2010-08-04 08:14:27 UTC (rev 43043) +++ CMSContainer/trunk/CMSContainer_Portlets/portlets-tagcloud/resources/com/finalist/portlets/tagcloud/portlet/TagPortlet.properties 2010-08-04 08:14:57 UTC (rev 43044) @@ -13,5 +13,7 @@ edit_defaults.pageselect=Select edit_defaults.window=Portlet +edit_defaults.portletset=Portlet Settings +edit_defaults.define=Definition edit_defaults.save=Save Modified: CMSContainer/trunk/CMSContainer_Portlets/portlets-tagcloud/resources/com/finalist/portlets/tagcloud/portlet/TagPortlet_nl.properties === --- CMSContainer/trunk/CMSContainer_Portlets/portlets-tagcloud/resources/com/finalist/portlets/tagcloud/portlet/TagPortlet_nl.properties 2010-08-04 08:14:27 UTC (rev 43043) +++ CMSContainer/trunk/CMSContainer_Portlets/portlets-tagcloud/resources/com/finalist/portlets/tagcloud/portlet/TagPortlet_nl.properties 2010-08-04 08:14:57 UTC (rev 43044) @@ -9,4 +9,7 @@ edit_defaults.erase=Wis +edit_defaults.portletset=Portlet instellingen +edit_defaults.define=Definitie + edit_defaults.save=Save Modified: CMSContainer/trunk/CMSContainer_Portlets/portlets-tagcloud/resources/com/finalist/portlets/tagcloud/portlet/TagRelatedPortlet.properties === --- CMSContainer/trunk/CMSContainer_Portlets/portlets-tagcloud/resources/com/finalist/portlets/tagcloud/portlet/TagRelatedPortlet.properties 2010-08-04 08:14:27 UTC (rev 43043) +++ CMSContainer/trunk/CMSContainer_Portlets/portlets-tagcloud/resources/com/finalist/portlets/tagcloud/portlet/TagRelatedPortlet.properties 2010-08-04 08:14:57 UTC (rev 43044) @@ -11,5 +11,8 @@ edit_defaults.pageselect=Select edit_defaults.window=Portlet +edit_defaults.portletset=Portlet Settings +edit_defaults.define=Definition +edit_defaults.relateportlet=Relate to portlet settings edit_defaults.save=Save Modified: CMSContainer/trunk/CMSContainer_Portlets/portlets-tagcloud/resources/com/finalist/portlets/tagcloud/portlet/TagRelatedPortlet_nl.properties === --- CMSContainer/trunk
[MMBASE SCM] r43046 - CMSContainer/tags
Author: fpunt Date: 2010-08-04 14:27:56 +0200 (Wed, 04 Aug 2010) New Revision: 43046 Added: CMSContainer/tags/v1_8_4/ Log: Releasing 1.8.4 Copied: CMSContainer/tags/v1_8_4 (from rev 43045, CMSContainer/trunk) ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r43035 - CMSContainer/branches/b1_5/CMSContainer/cmsc/taglib/src/tld
Author: fpunt Date: 2010-08-03 10:54:13 +0200 (Tue, 03 Aug 2010) New Revision: 43035 Modified: CMSContainer/branches/b1_5/CMSContainer/cmsc/taglib/src/tld/cmsc.tld Log: [CMSC-1724] Add minimum length to remove html tag Modified: CMSContainer/branches/b1_5/CMSContainer/cmsc/taglib/src/tld/cmsc.tld === --- CMSContainer/branches/b1_5/CMSContainer/cmsc/taglib/src/tld/cmsc.tld 2010-08-02 14:30:20 UTC (rev 43034) +++ CMSContainer/branches/b1_5/CMSContainer/cmsc/taglib/src/tld/cmsc.tld 2010-08-03 08:54:13 UTC (rev 43035) @@ -994,6 +994,14 @@ requiredfalse/required rtexprvaluetrue/rtexprvalue /attribute +attribute +descriptionThe minimum length allowed. This is not a guarantee, but otherwise the tag might clip off a big +chunck when clipping on a '.' +/description +nameminlength/name +requiredfalse/required +rtexprvaluetrue/rtexprvalue +/attribute /tag tag descriptionSort a list/description ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r43036 - CMSContainer/trunk/CMSContainer/cmsc/taglib/src/tld
Author: fpunt Date: 2010-08-03 10:54:25 +0200 (Tue, 03 Aug 2010) New Revision: 43036 Modified: CMSContainer/trunk/CMSContainer/cmsc/taglib/src/tld/cmsc.tld Log: [CMSC-1724] Add minimum length to remove html tag Modified: CMSContainer/trunk/CMSContainer/cmsc/taglib/src/tld/cmsc.tld === --- CMSContainer/trunk/CMSContainer/cmsc/taglib/src/tld/cmsc.tld 2010-08-03 08:54:13 UTC (rev 43035) +++ CMSContainer/trunk/CMSContainer/cmsc/taglib/src/tld/cmsc.tld 2010-08-03 08:54:25 UTC (rev 43036) @@ -1018,6 +1018,14 @@ requiredfalse/required rtexprvaluetrue/rtexprvalue /attribute +attribute +descriptionThe minimum length allowed. This is not a guarantee, but otherwise the tag might clip off a big +chunck when clipping on a '.' +/description +nameminlength/name +requiredfalse/required +rtexprvaluetrue/rtexprvalue +/attribute /tag tag descriptionSort a list/description ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r43037 - CMSContainer/branches/b1_5/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib
Author: fpunt
Date: 2010-08-03 10:54:37 +0200 (Tue, 03 Aug 2010)
New Revision: 43037
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/RemoveHtmlTag.java
Log:
[CMSC-1724] Add minimum length to remove html tag
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/RemoveHtmlTag.java
===
---
CMSContainer/branches/b1_5/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/RemoveHtmlTag.java
2010-08-03 08:54:25 UTC (rev 43036)
+++
CMSContainer/branches/b1_5/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/RemoveHtmlTag.java
2010-08-03 08:54:37 UTC (rev 43037)
@@ -9,6 +9,7 @@
private String html;
private String var;
private Integer maxlength;
+ private Integer minlength = 0;
public void setHtml(String html) {
@@ -26,18 +27,23 @@
}
+ public void setMinlength(Integer minlength) {
+ this.minlength = minlength;
+ }
+
+
@Override
public void doTag() {
PageContext ctx = (PageContext) getJspContext();
HttpServletRequest request = (HttpServletRequest) ctx.getRequest();
- html = removeHtml(maxlength, html);
+ html = removeHtml(maxlength, minlength, html);
request.setAttribute(var, html);
}
- private static String removeHtml(Integer maxlength, String html) {
+ private static String removeHtml(Integer maxlength, Integer minlength,
String html) {
StringBuffer result = new StringBuffer();
int startIndex = 0;
boolean keepGoing = true;
@@ -57,10 +63,10 @@
String resultHtml = result.toString();
if (maxlength != null resultHtml.length() maxlength) {
int cropIndex = resultHtml.lastIndexOf(., maxlength);
- if (cropIndex == -1) {
+ if (cropIndex minlength) {
cropIndex = resultHtml.lastIndexOf( , maxlength);
}
- if (cropIndex == -1) {
+ if (cropIndex minlength) {
cropIndex = maxlength;
}
resultHtml = resultHtml.substring(0, cropIndex) + ...;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r43038 - CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib
Author: fpunt
Date: 2010-08-03 10:54:49 +0200 (Tue, 03 Aug 2010)
New Revision: 43038
Modified:
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/RemoveHtmlTag.java
Log:
[CMSC-1724] Add minimum length to remove html tag
Modified:
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/RemoveHtmlTag.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/RemoveHtmlTag.java
2010-08-03 08:54:37 UTC (rev 43037)
+++
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/RemoveHtmlTag.java
2010-08-03 08:54:49 UTC (rev 43038)
@@ -9,6 +9,7 @@
private String html;
private String var;
private Integer maxlength;
+ private Integer minlength = 0;
public void setHtml(String html) {
@@ -26,18 +27,23 @@
}
+ public void setMinlength(Integer minlength) {
+ this.minlength = minlength;
+ }
+
+
@Override
public void doTag() {
PageContext ctx = (PageContext) getJspContext();
HttpServletRequest request = (HttpServletRequest) ctx.getRequest();
- html = removeHtml(maxlength, html);
+ html = removeHtml(maxlength, minlength, html);
request.setAttribute(var, html);
}
- private static String removeHtml(Integer maxlength, String html) {
+ private static String removeHtml(Integer maxlength, Integer minlength,
String html) {
StringBuffer result = new StringBuffer();
int startIndex = 0;
boolean keepGoing = true;
@@ -57,10 +63,10 @@
String resultHtml = result.toString();
if (maxlength != null resultHtml.length() maxlength) {
int cropIndex = resultHtml.lastIndexOf(., maxlength);
- if (cropIndex == -1) {
+ if (cropIndex minlength) {
cropIndex = resultHtml.lastIndexOf( , maxlength);
}
- if (cropIndex == -1) {
+ if (cropIndex minlength) {
cropIndex = maxlength;
}
resultHtml = resultHtml.substring(0, cropIndex) + ...;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r43029 - CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms
Author: fpunt
Date: 2010-08-02 16:28:02 +0200 (Mon, 02 Aug 2010)
New Revision: 43029
Modified:
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms/NavigatorAction.java
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms/SiteCreate.java
Log:
[CMSC-1723] Sort sites in navigation tree
Modified:
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms/NavigatorAction.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms/NavigatorAction.java
2010-08-02 14:00:36 UTC (rev 43028)
+++
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms/NavigatorAction.java
2010-08-02 14:28:02 UTC (rev 43029)
@@ -18,6 +18,7 @@
import org.apache.struts.action.*;
import org.mmbase.bridge.*;
+import org.mmbase.security.Rank;
import com.finalist.cmsc.mmbase.TreeUtil;
import com.finalist.cmsc.navigation.*;
@@ -30,14 +31,31 @@
@Override
public ActionForward execute(ActionMapping mapping, ActionForm form,
HttpServletRequest request,
- HttpServletResponse response, Cloud cloud) throws Exception {
+ HttpServletResponse response, Cloud cloud) throws Exception {
+
+ String doParam = request.getParameter(do);
+ if(doParam != null doParam.equals(sortSite)
cloud.getUser().getRank() == Rank.ADMIN) {
+ doSiteSort(cloud, request.getParameter(id1),
request.getParameter(id2));
+ }
- JstlUtil.setResourceBundle(request, cmsc-site);
+ JstlUtil.setResourceBundle(request, cmsc-site);
return super.execute(mapping, form, request, response, cloud);
}
- @Override
+ private void doSiteSort(Cloud cloud, String id1, String id2) {
+ Node node1 = cloud.getNode(id1);
+ int pos1 = node1.getIntValue(pos);
+ Node node2 = cloud.getNode(id2);
+ int pos2 = node2.getIntValue(pos);
+ node1.setIntValue(pos, pos2);
+ node1.commit();
+ node2.setIntValue(pos, pos1);
+ node2.commit();
+ }
+
+
+ @Override
protected Node getRootNode(Cloud cloud) {
return null;
}
Modified:
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms/SiteCreate.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms/SiteCreate.java
2010-08-02 14:00:36 UTC (rev 43028)
+++
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms/SiteCreate.java
2010-08-02 14:28:02 UTC (rev 43029)
@@ -17,6 +17,7 @@
import org.apache.struts.action.ActionMapping;
import org.mmbase.bridge.Cloud;
import org.mmbase.bridge.Node;
+import org.mmbase.bridge.NodeList;
import com.finalist.cmsc.navigation.*;
import com.finalist.cmsc.security.Role;
@@ -44,6 +45,8 @@
}
Node newSite = cloud.getNode(ewnodelastedited);
+ newSite.setIntValue(pos, getMaxPos(cloud)+1);
+ newSite.commit();
Node layoutNode = PagesUtil.getLayout(newSite);
PagesUtil.linkPortlets(newSite, layoutNode);
@@ -59,6 +62,16 @@
}
}
+ private int getMaxPos(Cloud cloud) {
+ NodeList list = cloud.getNodeManager(site).getList(null,
pos, down);
+ if(list.size() 0) {
+ return list.get(0).getIntValue(pos);
+ }
+ else {
+ return 0;
+ }
+ }
+
@Override
public String getRequiredRankStr() {
return ADMINISTRATOR;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r43030 - CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/tree
Author: fpunt
Date: 2010-08-02 16:28:21 +0200 (Mon, 02 Aug 2010)
New Revision: 43030
Modified:
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/tree/SiteTreeItemRenderer.java
Log:
[CMSC-1723] Sort sites in navigation tree
Modified:
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/tree/SiteTreeItemRenderer.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/tree/SiteTreeItemRenderer.java
2010-08-02 14:28:02 UTC (rev 43029)
+++
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/tree/SiteTreeItemRenderer.java
2010-08-02 14:28:21 UTC (rev 43030)
@@ -9,7 +9,12 @@
*/
package com.finalist.cmsc.navigation.tree;
+import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
+
+import org.mmbase.bridge.Cloud;
import org.mmbase.bridge.Node;
+import org.mmbase.bridge.NodeList;
+import org.mmbase.security.Rank;
import com.finalist.cmsc.navigation.*;
import com.finalist.cmsc.security.SecurityUtil;
@@ -65,12 +70,34 @@
../workflow/masspublish.jsp?number= + id));
}
}
+ Cloud cloud = parentNode.getCloud();
+ if (cloud.getUser().getRank() == Rank.ADMIN) {
+int pos = cloud.getNode(id).getIntValue(pos);
+if(!firstSite(cloud, pos)) {
+ element.addOption(renderer.createTreeOption(up.png,
site.page.sorting.up,
+ javascript:siteSortUp('+id+');));
+}
+if(!lastSite(cloud, pos)) {
+ element.addOption(renderer.createTreeOption(down.png,
site.page.sorting.down,
+ javascript:siteSortDown('+id+');));
+}
+ }
element.addOption(renderer.createTreeOption(rights.png,
site.page.rights,
../usermanagement/pagerights.jsp?number= + id));
return element;
}
+ private boolean firstSite(Cloud cloud, int pos) {
+ NodeList list =
cloud.getNodeManager(SiteUtil.SITE).getList(pos +pos, null, null);
+ return (list.size() == 0);
+ }
+
+ private boolean lastSite(Cloud cloud, int pos) {
+ NodeList list =
cloud.getNodeManager(SiteUtil.SITE).getList(pos +pos, null, null);
+ return (list.size() == 0);
+ }
+
public void addParentOption(NavigationRenderer renderer, TreeElement
element, String parentId) {
// has no parent
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r43031 - CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation
Author: fpunt
Date: 2010-08-02 16:28:37 +0200 (Mon, 02 Aug 2010)
New Revision: 43031
Modified:
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/SiteUtil.java
Log:
[CMSC-1723] Sort sites in navigation tree
Modified:
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/SiteUtil.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/SiteUtil.java
2010-08-02 14:28:21 UTC (rev 43030)
+++
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/SiteUtil.java
2010-08-02 14:28:37 UTC (rev 43031)
@@ -56,7 +56,7 @@
public static NodeList getSites(Cloud cloud) {
NodeManager sitesManager = cloud.getNodeManager(SITE);
- return sitesManager.getList(sitesManager.createQuery());
+ return sitesManager.getList(null, pos, null);
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r43032 - CMSContainer/trunk/CMSContainer/migration
Author: fpunt Date: 2010-08-02 16:28:59 +0200 (Mon, 02 Aug 2010) New Revision: 43032 Modified: CMSContainer/trunk/CMSContainer/migration/migration_1.8.3_to_1.8.4.txt Log: [CMSC-1723] Sort sites in navigation tree Modified: CMSContainer/trunk/CMSContainer/migration/migration_1.8.3_to_1.8.4.txt === --- CMSContainer/trunk/CMSContainer/migration/migration_1.8.3_to_1.8.4.txt 2010-08-02 14:28:37 UTC (rev 43031) +++ CMSContainer/trunk/CMSContainer/migration/migration_1.8.3_to_1.8.4.txt 2010-08-02 14:28:59 UTC (rev 43032) @@ -32,3 +32,19 @@ - compare project's overwrites near /war/src/webapp/mmbase/edit/wizard/xinha/* - take over fixes in CMSc to project! --- End script --- + + + + +Name: Hand-sortable sites +Goal: Add pos field to site builder +Type: SQL Script +--- Start script --- +ALTER TABLE mm_site ADD COLUMN pos int(11); +ALTER TABLE live_site ADD COLUMN pos int(11); + +CREATE TABLE temp_site_pos (number int(11), pos int(11)); +INSERT INTO temp_site_pos SELECT a.number, (SELECT count(*) FROM mm_site b WHERE a.number b.number) FROM mm_site a; +UPDATE mm_site SET pos = (SELECT pos FROM temp_site_pos WHERE mm_site.number = temp_site_pos.number); +DROP TABLE temp_site_pos; +--- End script --- ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r43033 - in CMSContainer/trunk/CMSContainer/cmsc/sitemanagement: config/builders/sitemanagement resources src/webapp/editors/site
Author: fpunt
Date: 2010-08-02 16:29:21 +0200 (Mon, 02 Aug 2010)
New Revision: 43033
Modified:
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/builders/sitemanagement/site.xml
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/resources/cmsc-site.properties
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/resources/cmsc-site_nl.properties
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site/selector.jsp
Log:
[CMSC-1723] Sort sites in navigation tree
Modified:
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/builders/sitemanagement/site.xml
===
---
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/builders/sitemanagement/site.xml
2010-08-02 14:28:59 UTC (rev 43032)
+++
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/builders/sitemanagement/site.xml
2010-08-02 14:29:21 UTC (rev 43033)
@@ -118,5 +118,24 @@
maxLength value=40/
/datatype
/field
+ field name=pos
+ descriptions
+ description xml:lang=enPosition number,
useful for ordering the relations/description
+ description xml:lang=nlPostitie of
volgordenummer, te gebruiken voor het sorteren van de relaties/description
+ /descriptions
+ gui
+ guiname xml:lang=enPosition/guiname
+ guiname xml:lang=frPlacent/guiname
+ guiname xml:lang=nlPositie/guiname
+ /gui
+ editor
+ positions
+ input9/input
+ list9/list
+ search9/search
+ /positions
+ /editor
+ datatype base=integer
xmlns=http://www.mmbase.org/xmlns/datatypes; /
+/field
/fieldlist
/builder
Modified:
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/resources/cmsc-site.properties
===
---
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/resources/cmsc-site.properties
2010-08-02 14:28:59 UTC (rev 43032)
+++
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/resources/cmsc-site.properties
2010-08-02 14:29:21 UTC (rev 43033)
@@ -10,6 +10,8 @@
site.page.cut=Cut
site.page.copy=Copy
site.page.paste=Paste
+site.page.sorting.up=Site up
+site.page.sorting.down=Site down
site.page.rights=User Rights
site.page.wizard=Page wizard
site.page.publish=Publish
Modified:
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/resources/cmsc-site_nl.properties
===
---
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/resources/cmsc-site_nl.properties
2010-08-02 14:28:59 UTC (rev 43032)
+++
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/resources/cmsc-site_nl.properties
2010-08-02 14:29:21 UTC (rev 43033)
@@ -10,6 +10,8 @@
site.page.cut=Knippen
site.page.copy=Kopi#235;ren
site.page.paste=Plakken
+site.page.sorting.up=Site omhoog
+site.page.sorting.down=Site naar beneden
site.page.rights=Gebruikersrechten
site.page.wizard=Pagina-wizard
site.page.publish=Publiceer
Modified:
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site/selector.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site/selector.jsp
2010-08-02 14:28:59 UTC (rev 43032)
+++
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site/selector.jsp
2010-08-02 14:29:21 UTC (rev 43033)
@@ -55,6 +55,46 @@
ajaxTreeLoader.initTree(treeNumbers[count],
treeDivs[count], undefined, undefined, true);
}
}
+
+function siteSortUp(id) {
+var tree = document.getElementById(tree);
+var aboveId = null;
+var passed = false;
+for(var count = 0; count tree.childNodes.length; count++) {
+ var node = tree.childNodes[count];
+ if(!passed node != null node.id !=
undefined) {
+ if(node.id == tree+id) {
+ passed = true;
+ }
+ else if(node.id.indexOf(tree) == 0) {
+ aboveId =
node.id.substring(4,node.id.length);
+ }
+ }
+}
+siteSortSwap(id, aboveId);
+}
+
+function siteSortDown(id
[MMBASE SCM] r43008 - CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha
Author: fpunt
Date: 2010-07-29 13:37:41 +0200 (Thu, 29 Jul 2010)
New Revision: 43008
Modified:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/my-htmlarea.js
Log:
[CMSC-1722] Inserting images in richtext did not work in IE8
Modified:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/my-htmlarea.js
===
---
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/my-htmlarea.js
2010-07-29 11:37:11 UTC (rev 43007)
+++
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/my-htmlarea.js
2010-07-29 11:37:41 UTC (rev 43008)
@@ -438,7 +438,7 @@
}
var img = image;
if (!img) {
- if ( Xinha.is_ie ) {
+ if ( Xinha.is_ie Xinha.ie_version 8 ) {
var sel = editor._getSelection();
var range = editor._createRange(sel);
editor._doc.execCommand(insertimage, false, param.f_url);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r43009 - CMSContainer/trunk/CMSContainer/migration
Author: fpunt Date: 2010-07-29 13:39:45 +0200 (Thu, 29 Jul 2010) New Revision: 43009 Modified: CMSContainer/trunk/CMSContainer/migration/migration_1.8.3_to_1.8.4.txt Log: [CMSC-1722] Inserting images in richtext did not work in IE8 Modified: CMSContainer/trunk/CMSContainer/migration/migration_1.8.3_to_1.8.4.txt === --- CMSContainer/trunk/CMSContainer/migration/migration_1.8.3_to_1.8.4.txt 2010-07-29 11:37:41 UTC (rev 43008) +++ CMSContainer/trunk/CMSContainer/migration/migration_1.8.3_to_1.8.4.txt 2010-07-29 11:39:45 UTC (rev 43009) @@ -23,3 +23,12 @@ + + +Name: Compare project's overwrite in insert-inline link and Xinha env with CMSc versions +Goal: add fixes to project +Type: manual action +--- Start script --- +- compare project's overwrites near /war/src/webapp/mmbase/edit/wizard/xinha/* +- take over fixes in CMSc to project! +--- End script --- ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r42959 - CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha
Author: fpunt
Date: 2010-07-21 16:17:02 +0200 (Wed, 21 Jul 2010)
New Revision: 42959
Modified:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/my-htmlarea.js
Log:
[CMSC-1721] Fixed, problems with adding links in IE
Modified:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/my-htmlarea.js
===
---
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/my-htmlarea.js
2010-07-20 11:15:11 UTC (rev 42958)
+++
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/my-htmlarea.js
2010-07-21 14:17:02 UTC (rev 42959)
@@ -387,25 +387,27 @@
}
}
}
-a.href = param.f_href.trim();
- a.target = param.f_target.trim();
- a.title = param.f_tooltip.trim();
+ if(a != null) {
+ a.href = param.f_href.trim();
+ a.target = param.f_target.trim();
+ a.title = param.f_tooltip.trim();
-if (Xinha.is_ie) {
- a.destination = param.f_destination.trim();
- if (!a.destination a.relationID) {
-a.relationID = ;
- }
-}
-else {
- a.setAttribute(destination, param.f_destination.trim());
- if (!a.getAttribute(destination)
a.getAttribute(relationID)) {
-a.removeAttribute(relationID);
- }
-}
- if(!Xinha.is_ie){
-editor.selectNodeContents(a);
- }
+ if (Xinha.is_ie) {
+ a.destination = param.f_destination.trim();
+ if (!a.destination a.relationID) {
+ a.relationID = ;
+ }
+ }
+ else {
+ a.setAttribute(destination, param.f_destination.trim());
+ if (!a.getAttribute(destination)
a.getAttribute(relationID)) {
+ a.removeAttribute(relationID);
+ }
+ }
+ if(!Xinha.is_ie){
+ editor.selectNodeContents(a);
+ }
+ }
editor.updateToolbar();
},
outparam);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r42815 - CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets
Author: fpunt
Date: 2010-07-06 13:59:25 +0200 (Tue, 06 Jul 2010)
New Revision: 42815
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/RelatedContentPortlet.java
Log:
[CMSC-1718] Fixed, related content on a page with a number in the site failed.
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/RelatedContentPortlet.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/RelatedContentPortlet.java
2010-07-06 10:13:01 UTC (rev 42814)
+++
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/RelatedContentPortlet.java
2010-07-06 11:59:25 UTC (rev 42815)
@@ -135,10 +135,11 @@
String requestURL = getServletRequest(req).getRequestURL().toString();
Pattern pattern = Pattern.compile(RENDERURL_ELEMENTID_PATTERN);
Matcher matcher = pattern.matcher(requestURL);
- if (matcher.find() matcher.groupCount() = 1) {
- return matcher.group(1);
+ String value = null;
+ while (matcher.find() matcher.groupCount() = 1) {
+ value = matcher.group(1);
}
- return null;
+ return value;
}
private HttpServletRequest getServletRequest(RenderRequest req) {
return (HttpServletRequest) ((PortletRequestImpl) req).getRequest();
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r42539 - CMSContainer/trunk/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search
Author: fpunt
Date: 2010-06-14 09:42:45 +0200 (Mon, 14 Jun 2010)
New Revision: 42539
Modified:
CMSContainer/trunk/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search/RedirectServlet.java
CMSContainer/trunk/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search/SearchServiceMMBaseImpl.java
Log:
[CMSC-1703]
Modified:
CMSContainer/trunk/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search/RedirectServlet.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search/RedirectServlet.java
2010-06-11 15:47:53 UTC (rev 42538)
+++
CMSContainer/trunk/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search/RedirectServlet.java
2010-06-14 07:42:45 UTC (rev 42539)
@@ -105,7 +105,11 @@
}
if (pageInfo != null) {
-PortalURL u = new PortalURL(pageInfo.getHost(), request,
pageInfo.getPath());
+String host = null;
+if(ServerUtil.useServerName()) {
+host = pageInfo.getHost();
+}
+PortalURL u = new PortalURL(host, request, pageInfo.getPath());
String elementId = String.valueOf(node.getNumber());
// When contentelement and the same number then it is a
contentportlet
if (! ( contentelement.equals(pageInfo.getParametername())
Modified:
CMSContainer/trunk/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search/SearchServiceMMBaseImpl.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search/SearchServiceMMBaseImpl.java
2010-06-11 15:47:53 UTC (rev 42538)
+++
CMSContainer/trunk/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search/SearchServiceMMBaseImpl.java
2010-06-14 07:42:45 UTC (rev 42539)
@@ -319,10 +319,7 @@
}
}
- String host = null;
- if (ServerUtil.useServerName()) {
-host = SiteManagement.getSite(page);
- }
+ String host = SiteManagement.getSite(page);
String pagePath = SiteManagement.getPath(page,
!ServerUtil.useServerName());
Layout layout = SiteManagement.getLayout(page.getLayout());
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r42548 - CMSContainer/trunk/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext
Author: fpunt Date: 2010-06-14 17:48:32 +0200 (Mon, 14 Jun 2010) New Revision: 42548 Modified: CMSContainer/trunk/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/RichTextGetProcessor.java Log: [CMSC-1703] Let the content URL work properly between sites on the staging server Modified: CMSContainer/trunk/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/RichTextGetProcessor.java === --- CMSContainer/trunk/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/RichTextGetProcessor.java 2010-06-14 15:31:26 UTC (rev 42547) +++ CMSContainer/trunk/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/RichTextGetProcessor.java 2010-06-14 15:48:32 UTC (rev 42548) @@ -265,6 +265,7 @@ name = destinationNode.getStringValue(name); } } + url = getContentUrl(destinationNode); } } ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r42485 - in CMSContainer/trunk/CMSContainer/cmsc: richtext/src/java/com/finalist/cmsc/richtext search/src/java/com/finalist/cmsc/services/search taglib/src/java/com/finalist/cmsc/taglib/p
Author: fpunt
Date: 2010-06-09 11:59:16 +0200 (Wed, 09 Jun 2010)
New Revision: 42485
Modified:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/RichTextGetProcessor.java
CMSContainer/trunk/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search/RedirectServlet.java
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/portlet/BasicURLTag.java
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/portlet/RenderURLTag.java
Log:
[CMSC-1701]
Modified:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/RichTextGetProcessor.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/RichTextGetProcessor.java
2010-06-09 09:30:49 UTC (rev 42484)
+++
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/RichTextGetProcessor.java
2010-06-09 09:59:16 UTC (rev 42485)
@@ -9,6 +9,7 @@
*/
package com.finalist.cmsc.richtext;
+import java.net.URLEncoder;
import java.util.*;
import org.apache.commons.lang.StringUtils;
@@ -25,6 +26,9 @@
import org.w3c.dom.NodeList;
import com.finalist.cmsc.mmbase.ResourcesUtil;
+import com.finalist.cmsc.navigation.NavigationInfo;
+import com.finalist.cmsc.navigation.NavigationUtil;
+import com.finalist.cmsc.util.ServerUtil;
@SuppressWarnings(serial)
public class RichTextGetProcessor implements ParameterizedProcessorFactory {
@@ -260,6 +264,10 @@
}
}
url = getContentUrl(destinationNode);
+ if(!ServerUtil.useServerName() url.contains(/content/))
{
+ NavigationInfo info =
NavigationUtil.getNavigationInfo(cloud);
+// url +=
?server=+URLEncoder.encode(request.getServerName());
+ }
}
}
Modified:
CMSContainer/trunk/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search/RedirectServlet.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search/RedirectServlet.java
2010-06-09 09:30:49 UTC (rev 42484)
+++
CMSContainer/trunk/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search/RedirectServlet.java
2010-06-09 09:59:16 UTC (rev 42485)
@@ -10,6 +10,7 @@
package com.finalist.cmsc.services.search;
import java.io.IOException;
+import java.net.URLEncoder;
import java.util.Map;
import javax.servlet.*;
Modified:
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/portlet/BasicURLTag.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/portlet/BasicURLTag.java
2010-06-09 09:30:49 UTC (rev 42484)
+++
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/portlet/BasicURLTag.java
2010-06-09 09:59:16 UTC (rev 42485)
@@ -1,6 +1,7 @@
package com.finalist.cmsc.taglib.portlet;
import java.io.IOException;
+import java.net.URLEncoder;
import javax.portlet.*;
import javax.servlet.http.HttpServletRequest;
@@ -131,6 +132,9 @@
if (absolute) {
urlString = HttpUtil.makeAbsolute((HttpServletRequest)
pageContext.getRequest(), urlString);
}
+ if(!ServerUtil.useServerName() urlString.contains(/content/)) {
+ urlString +=
?server=+URLEncoder.encode(pageContext.getRequest().getServerName());
+ }
if (var == null) {
try {
Modified:
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/portlet/RenderURLTag.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/portlet/RenderURLTag.java
2010-06-09 09:30:49 UTC (rev 42484)
+++
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/portlet/RenderURLTag.java
2010-06-09 09:59:16 UTC (rev 42485)
@@ -1,11 +1,14 @@
package com.finalist.cmsc.taglib.portlet;
+import java.net.URLEncoder;
+
import javax.portlet.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils;
+import com.finalist.cmsc.util.ServerUtil;
import com.finalist.pluto.PortletURLImpl;
/**
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r42486 - CMSContainer/trunk/CMSContainer/cmsc/richtext
Author: fpunt
Date: 2010-06-09 12:04:50 +0200 (Wed, 09 Jun 2010)
New Revision: 42486
Modified:
CMSContainer/trunk/CMSContainer/cmsc/richtext/pom.xml
Log:
Modified: CMSContainer/trunk/CMSContainer/cmsc/richtext/pom.xml
===
--- CMSContainer/trunk/CMSContainer/cmsc/richtext/pom.xml 2010-06-09
09:59:16 UTC (rev 42485)
+++ CMSContainer/trunk/CMSContainer/cmsc/richtext/pom.xml 2010-06-09
10:04:50 UTC (rev 42486)
@@ -21,6 +21,13 @@
classifierclasses/classifier
scopeprovided/scope
/dependency
+dependency
+groupIdorg.cmscontainer.core/groupId
+artifactIdcmsc-sitemanagement/artifactId
+version${project.version}/version
+classifierclasses/classifier
+scopeprovided/scope
+/dependency
/dependencies
build
testSourceDirectorysrc/tests/testSourceDirectory
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r42487 - in CMSContainer/trunk/CMSContainer/cmsc/richtext: . src/java/com/finalist/cmsc/richtext
Author: fpunt
Date: 2010-06-09 12:06:42 +0200 (Wed, 09 Jun 2010)
New Revision: 42487
Modified:
CMSContainer/trunk/CMSContainer/cmsc/richtext/pom.xml
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/RichTextGetProcessor.java
Log:
Modified: CMSContainer/trunk/CMSContainer/cmsc/richtext/pom.xml
===
--- CMSContainer/trunk/CMSContainer/cmsc/richtext/pom.xml 2010-06-09
10:04:50 UTC (rev 42486)
+++ CMSContainer/trunk/CMSContainer/cmsc/richtext/pom.xml 2010-06-09
10:06:42 UTC (rev 42487)
@@ -21,13 +21,6 @@
classifierclasses/classifier
scopeprovided/scope
/dependency
-dependency
-groupIdorg.cmscontainer.core/groupId
-artifactIdcmsc-sitemanagement/artifactId
-version${project.version}/version
-classifierclasses/classifier
-scopeprovided/scope
-/dependency
/dependencies
build
testSourceDirectorysrc/tests/testSourceDirectory
Modified:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/RichTextGetProcessor.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/RichTextGetProcessor.java
2010-06-09 10:04:50 UTC (rev 42486)
+++
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/RichTextGetProcessor.java
2010-06-09 10:06:42 UTC (rev 42487)
@@ -26,8 +26,6 @@
import org.w3c.dom.NodeList;
import com.finalist.cmsc.mmbase.ResourcesUtil;
-import com.finalist.cmsc.navigation.NavigationInfo;
-import com.finalist.cmsc.navigation.NavigationUtil;
import com.finalist.cmsc.util.ServerUtil;
@SuppressWarnings(serial)
@@ -265,7 +263,7 @@
}
url = getContentUrl(destinationNode);
if(!ServerUtil.useServerName() url.contains(/content/))
{
- NavigationInfo info =
NavigationUtil.getNavigationInfo(cloud);
+// NavigationInfo info =
NavigationUtil.getNavigationInfo(cloud);
// url +=
?server=+URLEncoder.encode(request.getServerName());
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r42489 - in CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib: . portlet
Author: fpunt
Date: 2010-06-09 14:54:35 +0200 (Wed, 09 Jun 2010)
New Revision: 42489
Modified:
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/ContentUrlTag.java
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/portlet/BasicURLTag.java
Log:
[CMSC-1701]
Modified:
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/ContentUrlTag.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/ContentUrlTag.java
2010-06-09 10:10:19 UTC (rev 42488)
+++
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/ContentUrlTag.java
2010-06-09 12:54:35 UTC (rev 42489)
@@ -22,6 +22,8 @@
import com.finalist.cmsc.mmbase.ResourcesUtil;
import com.finalist.cmsc.util.HttpUtil;
import com.finalist.cmsc.util.ServerUtil;
+import com.finalist.pluto.portalImpl.core.PortalEnvironment;
+import com.finalist.pluto.portalImpl.core.PortalURL;
@SuppressWarnings(serial)
public class ContentUrlTag extends NodeReferrerTag {
@@ -73,7 +75,11 @@
url = makeAbsolute(url);
}
if(!ServerUtil.useServerName()) {
- url +=
?server=+URLEncoder.encode(pageContext.getRequest().getServerName());
+ PortalEnvironment env =
PortalEnvironment.getPortalEnvironment((HttpServletRequest)pageContext.getRequest());
+ PortalURL currentURL = env.getRequestedPortalURL();
+ String path = currentURL.getGlobalNavigationAsString();
+ String server = (path.indexOf(/) != -1)?(path.substring(0,
path.indexOf(/))):path;
+ url += ?server=+server;
}
}
}
Modified:
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/portlet/BasicURLTag.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/portlet/BasicURLTag.java
2010-06-09 10:10:19 UTC (rev 42488)
+++
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/portlet/BasicURLTag.java
2010-06-09 12:54:35 UTC (rev 42489)
@@ -20,6 +20,8 @@
import com.finalist.cmsc.services.sitemanagement.SiteManagement;
import com.finalist.cmsc.util.HttpUtil;
import com.finalist.cmsc.util.ServerUtil;
+import com.finalist.pluto.portalImpl.core.PortalEnvironment;
+import com.finalist.pluto.portalImpl.core.PortalURL;
/**
* Supporting class for the CODEactionURL/CODE and CODErenderURL/CODE
@@ -133,7 +135,11 @@
urlString = HttpUtil.makeAbsolute((HttpServletRequest)
pageContext.getRequest(), urlString);
}
if(!ServerUtil.useServerName() urlString.contains(/content/)) {
- urlString +=
?server=+URLEncoder.encode(pageContext.getRequest().getServerName());
+ PortalEnvironment env =
PortalEnvironment.getPortalEnvironment((HttpServletRequest)pageContext.getRequest());
+ PortalURL currentURL = env.getRequestedPortalURL();
+ String path = currentURL.getGlobalNavigationAsString();
+ String server = (path.indexOf(/) != -1)?(path.substring(0,
path.indexOf(/))):path;
+ urlString += ?server=+server;
}
if (var == null) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r42491 - CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib
Author: fpunt
Date: 2010-06-09 16:37:48 +0200 (Wed, 09 Jun 2010)
New Revision: 42491
Modified:
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/ContentUrlTag.java
Log:
[CMSC-1701]
Modified:
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/ContentUrlTag.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/ContentUrlTag.java
2010-06-09 13:59:59 UTC (rev 42490)
+++
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/ContentUrlTag.java
2010-06-09 14:37:48 UTC (rev 42491)
@@ -76,10 +76,12 @@
}
if(!ServerUtil.useServerName()) {
PortalEnvironment env =
PortalEnvironment.getPortalEnvironment((HttpServletRequest)pageContext.getRequest());
- PortalURL currentURL = env.getRequestedPortalURL();
- String path = currentURL.getGlobalNavigationAsString();
- String server = (path.indexOf(/) != -1)?(path.substring(0,
path.indexOf(/))):path;
- url += ?server=+server;
+ if(env != null) {
+ PortalURL currentURL = env.getRequestedPortalURL();
+ String path = currentURL.getGlobalNavigationAsString();
+ String server = (path.indexOf(/) !=
-1)?(path.substring(0, path.indexOf(/))):path;
+ url += ?server=+server;
+ }
}
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r42469 - CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
Author: fpunt
Date: 2010-06-08 17:19:41 +0200 (Tue, 08 Jun 2010)
New Revision: 42469
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
Log:
CMSC-1627 Didnt work properly with switching between basic and advanced search
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
2010-06-08 14:35:29 UTC (rev 42468)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
2010-06-08 15:19:41 UTC (rev 42469)
@@ -126,6 +126,7 @@
html:hidden property=direction/
html:hidden property=index value=${param.index}/
input type=hidden name=deleteContentRequest/
+html:hidden property=overrideTypeName
value=${param.overrideTypeName}/
mm:present referid=returnurlinput type=hidden
name=returnurl value=mm:write referid=returnurl///mm:present
mm:compare referid=mode value=advanced
a href=# onclick=selectTab('basic');input
type=button class=button value=fmt:message key=search.simple.search
///a
@@ -179,13 +180,25 @@
td nowrap
c:if test=${not empty onlytype}
html:hidden property=contenttypes /
- input type=hidden value=${onlytype}
style=width:145px name=onlytype /Article
+ input type=hidden style=width:145px
value=${onlytype} name=onlytype /
+ c:choose
+ c:when test=${!empty
param.overrideTypeName}
+
${param.overrideTypeName}
+ input
name=overrideTypeName value=${param.overrideTypeName} type=hidden/
+ /c:when
+ c:when test=${onlytype !=
'contentelement'}
+
%=cloud.getNodeManager((String)request.getAttribute(onlytype)).getGUIName()%
+ /c:when
+ c:otherwise
+ fmt:message
key=searchform.contenttypes.all /
+ /c:otherwise
+ /c:choose
/c:if
c:if test=${empty onlytype}
- html:select property=contenttypes
style=width:145px onchange=selectContenttype('${searchinit}');
- html:option
value=contentelementlt;fmt:message key=searchform.contenttypes.all
/gt;/html:option
- html:optionsCollection name=typesList
value=value label=label/
- /html:select
+ html:select style=width:145px
property=contenttypes onchange=selectContenttype('${searchinit}');
+html:option
value=contentelementlt;fmt:message key=searchform.contenttypes.all
/gt;/html:option
+html:optionsCollection name=typesList
value=value label=label/
+ /html:select
/c:if
/td
/tr
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r42470 - in CMSContainer/trunk/CMSContainer/cmsc: search/src/java/com/finalist/cmsc/services/search taglib/src/java/com/finalist/cmsc/taglib
Author: fpunt
Date: 2010-06-08 17:44:22 +0200 (Tue, 08 Jun 2010)
New Revision: 42470
Modified:
CMSContainer/trunk/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search/RedirectServlet.java
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/ContentUrlTag.java
Log:
[CMSC-1701]
Modified:
CMSContainer/trunk/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search/RedirectServlet.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search/RedirectServlet.java
2010-06-08 15:19:41 UTC (rev 42469)
+++
CMSContainer/trunk/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search/RedirectServlet.java
2010-06-08 15:44:22 UTC (rev 42470)
@@ -100,7 +100,7 @@
pageInfo = Search.findDetailPageForContent(node,
request.getServerName());
}
else {
-pageInfo = Search.findDetailPageForContent(node);
+pageInfo = Search.findDetailPageForContent(node,
request.getParameter(server));
}
if (pageInfo != null) {
@@ -121,7 +121,7 @@
if (redirect != null) {
if (this.forwardRequest) {
-if (redirect.indexOf(://) -1
ServerUtil.useServerName()) {
+if (redirect.indexOf(://) -1
(ServerUtil.useServerName()) {
// not a valid forward dispatch url, but it might be
converted to one.
String currentHost = request.getServerName();
int hostIndex = redirect.indexOf(:// + currentHost);
Modified:
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/ContentUrlTag.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/ContentUrlTag.java
2010-06-08 15:19:41 UTC (rev 42469)
+++
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/ContentUrlTag.java
2010-06-08 15:44:22 UTC (rev 42470)
@@ -9,6 +9,8 @@
*/
package com.finalist.cmsc.taglib;
+import java.net.URLEncoder;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspTagException;
@@ -19,6 +21,7 @@
import com.finalist.cmsc.mmbase.ResourcesUtil;
import com.finalist.cmsc.util.HttpUtil;
+import com.finalist.cmsc.util.ServerUtil;
@SuppressWarnings(serial)
public class ContentUrlTag extends NodeReferrerTag {
@@ -69,6 +72,9 @@
if (absolute) {
url = makeAbsolute(url);
}
+if(!ServerUtil.useServerName()) {
+ url +=
?server=+URLEncoder.encode(pageContext.getRequest().getServerName());
+}
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r42471 - CMSContainer/trunk/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search
Author: fpunt
Date: 2010-06-08 17:48:04 +0200 (Tue, 08 Jun 2010)
New Revision: 42471
Modified:
CMSContainer/trunk/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search/RedirectServlet.java
Log:
[CMSC-1701]
Modified:
CMSContainer/trunk/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search/RedirectServlet.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search/RedirectServlet.java
2010-06-08 15:44:22 UTC (rev 42470)
+++
CMSContainer/trunk/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search/RedirectServlet.java
2010-06-08 15:48:04 UTC (rev 42471)
@@ -121,7 +121,7 @@
if (redirect != null) {
if (this.forwardRequest) {
-if (redirect.indexOf(://) -1
(ServerUtil.useServerName()) {
+if (redirect.indexOf(://) -1
(ServerUtil.useServerName())) {
// not a valid forward dispatch url, but it might be
converted to one.
String currentHost = request.getServerName();
int hostIndex = redirect.indexOf(:// + currentHost);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r42391 - CMSContainer/trunk/CMSContainer_Modules/publish-remote/config/builders/Publisher
Author: fpunt Date: 2010-06-02 17:11:23 +0200 (Wed, 02 Jun 2010) New Revision: 42391 Modified: CMSContainer/trunk/CMSContainer_Modules/publish-remote/config/builders/Publisher/publishqueue.xml Log: CMSC-1330 Modified: CMSContainer/trunk/CMSContainer_Modules/publish-remote/config/builders/Publisher/publishqueue.xml === --- CMSContainer/trunk/CMSContainer_Modules/publish-remote/config/builders/Publisher/publishqueue.xml 2010-06-02 14:39:46 UTC (rev 42390) +++ CMSContainer/trunk/CMSContainer_Modules/publish-remote/config/builders/Publisher/publishqueue.xml 2010-06-02 15:11:23 UTC (rev 42391) @@ -131,7 +131,7 @@ /editor datatype base=field xmlns=http://www.mmbase.org/xmlns/datatypes; required value=true/ -maxLength value=4096/ +maxLength value=16384/ /datatype /field /fieldlist ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r42392 - CMSContainer/trunk/CMSContainer_Modules/alias/resources
Author: fpunt Date: 2010-06-02 17:12:04 +0200 (Wed, 02 Jun 2010) New Revision: 42392 Modified: CMSContainer/trunk/CMSContainer_Modules/alias/resources/cmsc-modules-alias_nl.properties Log: CMSC-924 Modified: CMSContainer/trunk/CMSContainer_Modules/alias/resources/cmsc-modules-alias_nl.properties === --- CMSContainer/trunk/CMSContainer_Modules/alias/resources/cmsc-modules-alias_nl.properties 2010-06-02 15:11:23 UTC (rev 42391) +++ CMSContainer/trunk/CMSContainer_Modules/alias/resources/cmsc-modules-alias_nl.properties 2010-06-02 15:12:04 UTC (rev 42392) @@ -30,6 +30,7 @@ stacked.type.url=URL: content.status=Status +content.status.all=Alles content.status.draft=In bewerking content.status.waiting=Wacht op plaatsing en publicatie pagina content.status.finished=Voltooid ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r42394 - CMSContainer/trunk/CMSContainer_Modules/alias/resources
Author: fpunt Date: 2010-06-02 17:12:24 +0200 (Wed, 02 Jun 2010) New Revision: 42394 Modified: CMSContainer/trunk/CMSContainer_Modules/alias/resources/cmsc-modules-alias.properties Log: CMSC-924 Modified: CMSContainer/trunk/CMSContainer_Modules/alias/resources/cmsc-modules-alias.properties === --- CMSContainer/trunk/CMSContainer_Modules/alias/resources/cmsc-modules-alias.properties 2010-06-02 15:12:16 UTC (rev 42393) +++ CMSContainer/trunk/CMSContainer_Modules/alias/resources/cmsc-modules-alias.properties 2010-06-02 15:12:24 UTC (rev 42394) @@ -30,6 +30,7 @@ stacked.type.url=URL: content.status=Status +content.status.all=All content.status.draft=Being edited content.status.waiting=Waiting for placing or publication of page. content.status.finished=Finished ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r42396 - CMSContainer/tags
Author: fpunt Date: 2010-06-02 17:39:04 +0200 (Wed, 02 Jun 2010) New Revision: 42396 Added: CMSContainer/tags/v1_8_1/ Log: Releasing 1.8.1 Copied: CMSContainer/tags/v1_8_1 (from rev 42395, CMSContainer/trunk) ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r42310 - in CMSContainer/trunk: CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/WEB-INF CMSContainer_Demo/demo.cmscontain
Author: fpunt Date: 2010-05-31 10:04:44 +0200 (Mon, 31 May 2010) New Revision: 42310 Modified: CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/web.xml 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 CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-community-archetype/src/main/resources/archetype-resources/src/webapp/WEB-INF/web.xml CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war-live/src/webapp/WEB-INF/web.xml CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war-staging/src/webapp/WEB-INF/web.xml CMSContainer/trunk/CMSContainer_Demo/www.cmscontainer.org/war-live/src/webapp/WEB-INF/web.xml CMSContainer/trunk/CMSContainer_Demo/www.cmscontainer.org/war-staging/src/webapp/WEB-INF/web.xml CMSContainer/trunk/CMSContainer_Modules/community/src/webapp/WEB-INF/web.xml CMSContainer/trunk/CMSContainer_Templates/double/war-live/src/webapp/WEB-INF/web.xml CMSContainer/trunk/CMSContainer_Templates/double/war-staging/src/webapp/WEB-INF/web.xml Log: CMSC-1697 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-05-30 10:20:41 UTC (rev 42309) +++ CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/web.xml 2010-05-31 08:04:44 UTC (rev 42310) @@ -200,7 +200,7 @@ !-- The MMBase image serving servlet. -- servlet servlet-nameimages/servlet-name - servlet-classorg.mmbase.servlet.ImageServlet/servlet-class + servlet-classcom.finalist.cmsc.repository.ImageServlet/servlet-class init-param !-- Expire time of original images. Cached images never expire. -- param-nameexpire/param-name 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-05-30 10:20:41 UTC (rev 42309) +++ CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/WEB-INF/web.xml 2010-05-31 08:04:44 UTC (rev 42310) @@ -277,7 +277,7 @@ !-- The MMBase image serving servlet. -- servlet servlet-nameimages/servlet-name - servlet-classorg.mmbase.servlet.ImageServlet/servlet-class + servlet-classcom.finalist.cmsc.repository.ImageServlet/servlet-class init-param !-- Expire time of original images. Cached images never expire. -- param-nameexpire/param-name 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-05-30 10:20:41 UTC (rev 42309) +++ CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/web.xml 2010-05-31 08:04:44 UTC (rev 42310) @@ -201,7 +201,7 @@ !-- The MMBase image serving servlet. -- servlet servlet-nameimages/servlet-name - servlet-classorg.mmbase.servlet.ImageServlet/servlet-class + servlet-classcom.finalist.cmsc.repository.ImageServlet/servlet-class init-param !-- Expire time of original images. Cached images never expire. -- param-nameexpire/param-name 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-05-30 10:20:41 UTC (rev 42309) +++ CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-staging/src/webapp/WEB-INF/web.xml 2010-05-31 08:04:44 UTC (rev 42310) @@ -202,7 +202,7 @@ !-- The MMBase image serving servlet. -- servlet servlet-nameimages/servlet-name - servlet-classorg.mmbase.servlet.ImageServlet/servlet-class + servlet-classcom.finalist.cmsc.repository.ImageServlet/servlet-class init-param !-- Expire time of original images. Cached images never expire
[MMBASE SCM] r42305 - CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository
Author: fpunt
Date: 2010-05-28 11:39:38 +0200 (Fri, 28 May 2010)
New Revision: 42305
Added:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/ImageServlet.java
Log:
[CMSC-1697] Make the last modified feature work for the ImageServlet
Added:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/ImageServlet.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/ImageServlet.java
(rev 0)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/ImageServlet.java
2010-05-28 09:39:38 UTC (rev 42305)
@@ -0,0 +1,67 @@
+package com.finalist.cmsc.repository;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+
+import org.mmbase.bridge.Node;
+import org.mmbase.util.logging.Logger;
+import org.mmbase.util.logging.Logging;
+
+/**
+ * This class has been override because the getLastModified() from the version
in MMbase fails
+ * because it does not know how to handle icache nodes
+ *
+ * @author freek
+ */
+public class ImageServlet extends org.mmbase.servlet.ImageServlet {
+
+ private static final Object ICACHE_NODEMANAGER = icaches;
+
+ private static Logger log;
+
+ private String lastModifiedField = null;
+
+ /**
+* Also look at icache nodes
+*
+* {...@inheritdoc}
+**/
+ @Override
+ protected long getLastModified(HttpServletRequest req) {
+ if (lastModifiedField == null) return -1;
+ try {
+ QueryParts query = readQuery(req, null);
+ Node node = getServedNode(query, getNode(query));
+ if (node != null
node.getNodeManager().hasField(lastModifiedField)) {
+ return node.getDateValue(lastModifiedField).getTime();
+ } else if (node != null
node.getNodeManager().getName().equals(ICACHE_NODEMANAGER)) {
+ // get the image node
+ int imageNumber = node.getIntValue(id);
+ // return the last modified from the image node
+ return
node.getCloud().getNode(imageNumber).getDateValue(lastModifiedField).getTime();
+ } else {
+ return -1;
+ }
+ } catch (IOException ieo) {
+ return -1;
+ }
+ }
+
+
+ /**
+* This method has been override to get the lastmodified parameter
available here in the override image servlet
+* {...@inheritdoc}
+*/
+ @Override
+ public void init() throws ServletException {
+ super.init();
+ lastModifiedField = getInitParameter(lastmodifiedfield);
+ if (.equals(lastModifiedField)) lastModifiedField = null;
+ log = Logging.getLoggerInstance(ImageServlet.class);
+ if (lastModifiedField != null) {
+ log.service(Field ' + lastModifiedField + ' will be used to
calculate lastModified);
+ }
+ }
+}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r42239 - CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets
Author: fpunt
Date: 2010-05-19 10:02:08 +0200 (Wed, 19 May 2010)
New Revision: 42239
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/ContentChannelPortlet.java
Log:
attempt to fix CMSC-1693
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/ContentChannelPortlet.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/ContentChannelPortlet.java
2010-05-18 17:14:26 UTC (rev 42238)
+++
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/ContentChannelPortlet.java
2010-05-19 08:02:08 UTC (rev 42239)
@@ -133,8 +133,19 @@
}
}
+
- protected void addContentElements(RenderRequest req, String channel) {
+ @Override
+ public void processEditDefaults(ActionRequest request, ActionResponse
response) throws PortletException, IOException {
+ super.processEditDefaults(request, response);
+
+ if(request.getAttribute(MAX_ELEMENTS) == null) {
+ request.setAttribute(MAX_ELEMENTS,
DEFAULT_MAX_ELEMENTS);
+ }
+ }
+
+
+ protected void addContentElements(RenderRequest req, String channel) {
String elementId = req.getParameter(ELEMENT_ID);
if (StringUtils.isEmpty(elementId)) {
PortletPreferences preferences = req.getPreferences();
@@ -167,7 +178,6 @@
int maxElements = Integer.parseInt(preferences.getValue(MAX_ELEMENTS,
-1));
if (maxElements = 0) {
maxElements = DEFAULT_MAX_ELEMENTS;
-req.setAttribute(MAX_ELEMENTS, DEFAULT_MAX_ELEMENTS);
}
int elementsPerPage =
Integer.parseInt(preferences.getValue(ELEMENTS_PER_PAGE, -1));
if (elementsPerPage = 0) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r42240 - CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets
Author: fpunt
Date: 2010-05-19 10:19:50 +0200 (Wed, 19 May 2010)
New Revision: 42240
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/ContentChannelPortlet.java
Log:
attempt to fix CMSC-1693
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/ContentChannelPortlet.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/ContentChannelPortlet.java
2010-05-19 08:02:08 UTC (rev 42239)
+++
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/ContentChannelPortlet.java
2010-05-19 08:19:50 UTC (rev 42240)
@@ -136,11 +136,11 @@
@Override
- public void processEditDefaults(ActionRequest request, ActionResponse
response) throws PortletException, IOException {
- super.processEditDefaults(request, response);
+ public void doEditDefaults(RenderRequest req, RenderResponse res)
throws PortletException, IOException {
+ super.doEditDefaults(req, res);
- if(request.getAttribute(MAX_ELEMENTS) == null) {
- request.setAttribute(MAX_ELEMENTS,
DEFAULT_MAX_ELEMENTS);
+ if(req.getAttribute(MAX_ELEMENTS) == null) {
+ req.setAttribute(MAX_ELEMENTS, DEFAULT_MAX_ELEMENTS);
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r42241 - CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets
Author: fpunt
Date: 2010-05-19 10:52:47 +0200 (Wed, 19 May 2010)
New Revision: 42241
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/ContentChannelPortlet.java
Log:
attempt to fix CMSC-1693
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/ContentChannelPortlet.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/ContentChannelPortlet.java
2010-05-19 08:19:50 UTC (rev 42240)
+++
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/ContentChannelPortlet.java
2010-05-19 08:52:47 UTC (rev 42241)
@@ -137,11 +137,9 @@
@Override
public void doEditDefaults(RenderRequest req, RenderResponse res)
throws PortletException, IOException {
+ // set the default for the maximum elements
+ req.setAttribute(MAX_ELEMENTS, DEFAULT_MAX_ELEMENTS);
super.doEditDefaults(req, res);
-
- if(req.getAttribute(MAX_ELEMENTS) == null) {
- req.setAttribute(MAX_ELEMENTS, DEFAULT_MAX_ELEMENTS);
- }
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r42207 - in CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository: . select
Author: fpunt
Date: 2010-05-18 10:04:42 +0200 (Tue, 18 May 2010)
New Revision: 42207
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/index.jsp
Log:
NFK-337
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
2010-05-17 15:08:09 UTC (rev 42206)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
2010-05-18 08:04:42 UTC (rev 42207)
@@ -1,4 +1,4 @@
-%...@page language=java contentType=text/html;charset=utf-8
+%...@page language=java contentType=text/html;charset=utf-8
%%...@include file=globals.jsp
%%@ taglib prefix=edit tagdir=/WEB-INF/tags/edit
%%...@page import=com.finalist.cmsc.repository.AssetElementUtil,
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
2010-05-17 15:08:09 UTC (rev 42206)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
2010-05-18 08:04:42 UTC (rev 42207)
@@ -146,8 +146,12 @@
html:hidden property=contenttypes /
input type=hidden style=width:145px
value=${onlytype} name=onlytype /
c:choose
+
c:when test=${!empty param.overrideTypeName}
+
${param.overrideTypeName}
+
input name=overrideTypeName value=${param.overrideTypeName}
type=hidden/
+
/c:when
c:when test=${onlytype !=
'contentelement'}
-
%=CloudProviderFactory.getCloudProvider().getCloud().getNodeManager((String)request.getAttribute(onlytype)).getGUIName(NodeManager.GUI_SINGULAR,
request.getLocale())%
+
%=cloud.getNodeManager((String)request.getAttribute(onlytype)).getGUIName()%
/c:when
c:otherwise
fmt:message
key=searchform.contenttypes.all /
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/index.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/index.jsp
2010-05-17 15:08:09 UTC (rev 42206)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/index.jsp
2010-05-18 08:04:42 UTC (rev 42207)
@@ -50,6 +50,7 @@
mm:param name=contenttypes value=${type} /
mm:param name=onlytype value=${type} /
mm:param name=relationOriginNode
value=${relationOriginNode} /
+ mm:param name=overrideTypeName
value=${param.overrideTypeName} /
/mm:url
/mm:present
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r42213 - CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
Author: fpunt
Date: 2010-05-18 14:56:17 +0200 (Tue, 18 May 2010)
New Revision: 42213
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
Log:
[CMSC-1627] Fixed
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
2010-05-18 12:36:55 UTC (rev 42212)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
2010-05-18 12:56:17 UTC (rev 42213)
@@ -141,7 +141,7 @@
td style=width:80px width=80px
nowrapfmt:message key=searchform.searchfortitle //td
td style=width:217px width=217px
nowraphtml:text property=title style=width:145px value=${title}//td
td style=width:90px width=90px
nowrapfmt:message key=searchform.contenttype //td
- td nowrap
+ td
c:if test=${not empty onlytype}
html:hidden property=contenttypes /
input type=hidden style=width:145px
value=${onlytype} name=onlytype /
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r42214 - CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl
Author: fpunt
Date: 2010-05-18 16:14:01 +0200 (Tue, 18 May 2010)
New Revision: 42214
Modified:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl/wizard.xsl
Log:
CMSC-1692
Modified:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl/wizard.xsl
===
---
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl/wizard.xsl
2010-05-18 12:56:17 UTC (rev 42213)
+++
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl/wizard.xsl
2010-05-18 14:14:01 UTC (rev 42214)
@@ -566,7 +566,12 @@
xmlhttp.send(null);
}
]]
- ajaxFunction();
+ var oldInits = inits;
+ inits = function() {
+ oldInits();
+ajaxFunction();
+ }
+
function layoutsearch(value){
if(value != null){
doAdd(| + value, 'xsl:value-of
select=../comma...@name=apos;add-itemapos;]/@cmd /' );
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r42215 - CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
Author: fpunt
Date: 2010-05-18 16:32:10 +0200 (Tue, 18 May 2010)
New Revision: 42215
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchAction.java
Log:
CMSC-1691
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchAction.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchAction.java
2010-05-18 14:14:01 UTC (rev 42214)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchAction.java
2010-05-18 14:32:10 UTC (rev 42215)
@@ -124,7 +124,7 @@
// Search on Workflow status when needed, onlive basicly means not in
workflow rel
String workflowstate = searchForm.getWorkflowstate();
- if(!StringUtils.isEmpty(workflowstate)) {
+ if(!StringUtils.isEmpty(workflowstate) !0.equals(workflowstate)) {
NodeManager workflowNodeManager =
cloud.getNodeManager(workflowitem);
Step workflowStep = query.addRelationStep(workflowNodeManager,
workflowrel, SOURCE).getNext();
StepField workflowStatusField = query.createStepField(workflowStep,
workflowNodeManager.getField(status));
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r42225 - CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets
Author: fpunt
Date: 2010-05-18 17:15:08 +0200 (Tue, 18 May 2010)
New Revision: 42225
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/ContentChannelPortlet.java
Log:
attempt to fix CMSC-1693
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/ContentChannelPortlet.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/ContentChannelPortlet.java
2010-05-18 15:02:55 UTC (rev 42224)
+++
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/ContentChannelPortlet.java
2010-05-18 15:15:08 UTC (rev 42225)
@@ -167,6 +167,7 @@
int maxElements = Integer.parseInt(preferences.getValue(MAX_ELEMENTS,
-1));
if (maxElements = 0) {
maxElements = DEFAULT_MAX_ELEMENTS;
+req.setAttribute(MAX_ELEMENTS, DEFAULT_MAX_ELEMENTS);
}
int elementsPerPage =
Integer.parseInt(preferences.getValue(ELEMENTS_PER_PAGE, -1));
if (elementsPerPage = 0) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r42172 - CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources
Author: fpunt Date: 2010-05-17 10:38:50 +0200 (Mon, 17 May 2010) New Revision: 42172 Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties Log: CMSC-1690 Fixed translation Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties === --- CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties 2010-05-16 17:17:25 UTC (rev 42171) +++ CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties 2010-05-17 08:38:50 UTC (rev 42172) @@ -528,5 +528,5 @@ simple.editor.list.channel.field = geplaatst in simple.editor.introduction.text = Welkom in de vereenvoudigde schrijfomgeving, speciaal voor uw schrijfgemak. Er zijn twee tab-vensters beschikbaar: voor klad- en voltooide content. Druk op de 'maken' knop, om een nieuw artikel te schrijven. simple.editor.send = Stuur dit element naar de webmaster om gepubliceerd te worden -simple.editor.finish.success=Het element is succesvol verplaatst, zodat dit artikel gecontrolleerd en gepubliceerd kan worden. +simple.editor.finish.success=Het element is succesvol verplaatst, zodat dit artikel gecontroleerd en gepubliceerd kan worden. simple.editor.finish.failed=Dit element kon niet worden verplaatst naar de voltooide status. Neem contact op met uw beheerder. \ No newline at end of file ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r42173 - in CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins: . PasteText PasteText/lang
Author: fpunt
Date: 2010-05-17 10:39:17 +0200 (Mon, 17 May 2010)
New Revision: 42173
Added:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/PasteText/
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/PasteText/lang/
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/PasteText/lang/nl.js
Log:
CMSC-1686 Fixed translation
Added:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/PasteText/lang/nl.js
===
---
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/PasteText/lang/nl.js
(rev 0)
+++
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/PasteText/lang/nl.js
2010-05-17 08:39:17 UTC (rev 42173)
@@ -0,0 +1,6 @@
+// I18N constants
+// LANG: nl, ENCODING: UTF-8
+// Author: Maarten Molenschot, maar...@nrgmm.nl
+{
+ Paste as Plain Text: Plakken als platte tekst (geen opmaak)
+};
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r42174 - in CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins: . CharacterMap CharacterMap/lang
Author: fpunt
Date: 2010-05-17 10:39:30 +0200 (Mon, 17 May 2010)
New Revision: 42174
Added:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/CharacterMap/
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/CharacterMap/lang/
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/CharacterMap/lang/nl.js
Log:
CMSC-1686 Fixed translation
Added:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/CharacterMap/lang/nl.js
===
---
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/CharacterMap/lang/nl.js
(rev 0)
+++
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/CharacterMap/lang/nl.js
2010-05-17 08:39:30 UTC (rev 42174)
@@ -0,0 +1,11 @@
+// I18N constants
+// LANG: nl, ENCODING: UTF-8
+// Sponsored by http://www.systemconcept.de
+// Author: Holger Hees, hh...@systemconcept.de
+// (c) systemconcept.de 2004
+// Distributed under the same terms as HTMLArea itself.
+// This notice MUST stay intact for use (see license.txt).
+{
+ Insert special character: Speciaal teken invoegen,
+ Cancel: Annuleer
+};
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r42175 - CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/lang
Author: fpunt Date: 2010-05-17 10:39:40 +0200 (Mon, 17 May 2010) New Revision: 42175 Modified: CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/lang/nl.js Log: CMSC-1686 Fixed translation Modified: CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/lang/nl.js === --- CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/lang/nl.js 2010-05-17 08:39:30 UTC (rev 42174) +++ CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/lang/nl.js 2010-05-17 08:39:40 UTC (rev 42175) @@ -71,8 +71,8 @@ Heading 4: Kop 4, Insert Image: Afbeelding invoegen, Select all: Selecteer alles, - Clear Inline Font Specifications: Verwijder inline lettertypes, - Remove formatting: Verwijder formatering, + Clear Inline Font Specifications: Verwijder lettertypes, + Remove formatting: Verwijder opmaak, Toggle Borders: Schakel randen, Insert/Modify Embeded Code: Invoegen bewerken embed content, Embeded Code:: Embed Code:, ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r42184 - CMSContainer/trunk/CMSContainer/migration
Author: fpunt Date: 2010-05-17 14:19:10 +0200 (Mon, 17 May 2010) New Revision: 42184 Modified: CMSContainer/trunk/CMSContainer/migration/migration_1.7_to_1.8.txt Log: CMSC-1689 Fixed Modified: CMSContainer/trunk/CMSContainer/migration/migration_1.7_to_1.8.txt === --- CMSContainer/trunk/CMSContainer/migration/migration_1.7_to_1.8.txt 2010-05-17 12:06:15 UTC (rev 42183) +++ CMSContainer/trunk/CMSContainer/migration/migration_1.7_to_1.8.txt 2010-05-17 12:19:10 UTC (rev 42184) @@ -44,6 +44,9 @@ * * * + + + Name: Alter two fields of the table subscriptionrecord Goal: Change the type of the two fields Type: sql-script @@ -57,4 +60,18 @@ --- End script --- Exceptions/errors/other problems and what to do: * -* \ No newline at end of file +* + + +Name: Remove from workflow db script +Goal: Missing upgrade script for the 1.7 release, made to remove stuff from the workflow +Type: sql-script +--- Start script --- +create table temp (number int(11)); +insert into temp (select max(number) as x from mm_archive group by original_node); +update mm_archive set onlive = 1, publish = 1 where number in (select number from temp); +drop table temp; +--- 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] r42187 - in CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins: . SuperClean
Author: fpunt
Date: 2010-05-17 14:39:47 +0200 (Mon, 17 May 2010)
New Revision: 42187
Added:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/SuperClean/
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/SuperClean/SuperClean.js
Log:
CMSC-1688 Attempt to plugin newer super clean version
Added:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/SuperClean/SuperClean.js
===
---
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/SuperClean/SuperClean.js
(rev 0)
+++
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/SuperClean/SuperClean.js
2010-05-17 12:39:47 UTC (rev 42187)
@@ -0,0 +1,214 @@
+/* This compressed file is part of Xinha. For uncompressed sources, forum, and
bug reports, go to xinha.org */
+/* This file is part of version 0.95 released Mon, 12 May 2008 17:33:15 +0200
*/
+/* The URL of the most recent version of this file is
http://svn.xinha.webfactional.com/trunk/plugins/SuperClean/super-clean.js */
+function SuperClean(_1,_2){
+this.editor=_1;
+var _3=this;
+_1._superclean_on=false;
+_1.config.registerButton(superclean,this._lc(Clean up
HTML),_1.imgURL(ed_superclean.gif,SuperClean),true,function(e,_5,_6){
+_3._superClean(null,_6);
+});
+_1.config.addToolbarElement(superclean,killword,0);
+}
+SuperClean._pluginInfo={name:SuperClean,version:1.0,developer:James
Sleeman, Niko Sams,developer_url:http://www.gogo.co.nz/,c_owner:Gogo
Internet Services,license:htmlArea,sponsor:Gogo Internet
Services,sponsor_url:http://www.gogo.co.nz/};
+SuperClean.prototype._lc=function(_7){
+return Xinha._lc(_7,SuperClean);
+};
+SuperClean.prototype._superClean=function(_8,_9){
+var _a=this;
+var _b=function(){
+var _c=_a._dialog.hide();
+var _d=_a.editor;
+if(_c.word_clean){
+_d._wordClean();
+}
+var D=_d.getInnerHTML();
+for(var _f in _d.config.SuperClean.filters){
+if(_f==tidy||_f==word_clean){
+continue;
+}
+if(_c[_f]){
+D=SuperClean.filterFunctions[_f](D,_d);
+}
+}
+D=D.replace(/(style|class)=\s*/gi,);
+D=D.replace(/(font|span)\s*/gi,);
+_d.setHTML(D);
+if(_c.tidy){
+var _10=function(_11){
+eval(var response = +_11);
+switch(response.action){
+case setHTML:
+_d.setHTML(response.value);
+break;
+case alert:
+alert(_a._lc(response.value));
+break;
+}
+};
+Xinha._postback(_d.config.SuperClean.tidy_handler,{content:_d.getInnerHTML()},_10);
+}
+return true;
+};
+if(this.editor.config.SuperClean.show_dialog){
+var _12={};
+this._dialog.show(_12,_b);
+}else{
+var _13=this.editor;
+var _14=_13.getInnerHTML();
+for(var _15 in _13.config.SuperClean.filters){
+if(_15==tidy){
+continue;
+}
+_14=SuperClean.filterFunctions[_15](_14,_13);
+}
+_14=_14.replace(/(style|class)=\s*/gi,);
+_14=_14.replace(/(font|span)\s*/gi,);
+_13.setHTML(_14);
+if(_13.config.SuperClean.filters.tidy){
+SuperClean.filterFunctions.tidy(_14,_13);
+}
+}
+};
+Xinha.Config.prototype.SuperClean={tidy_handler:Xinha.getPluginDir(SuperClean)+/tidy.php,filters:{tidy:Xinha._lc(General
tidy up and correction of some
problems.,SuperClean),word_clean:Xinha._lc(Clean bad HTML from Microsoft
Word,SuperClean),remove_faces:Xinha._lc(Remove custom typefaces (font
\styles\).,SuperClean),remove_sizes:Xinha._lc(Remove custom font
sizes.,SuperClean),remove_colors:Xinha._lc(Remove custom text
colors.,SuperClean),remove_lang:Xinha._lc(Remove lang
attributes.,SuperClean),remove_fancy_quotes:{label:Xinha._lc(Replace
directional quote marks with non-directional quote
marks.,SuperClean),checked:false}},show_dialog:true};
+SuperClean.filterFunctions={};
+SuperClean.filterFunctions.remove_colors=function(D){
+D=D.replace(/color=?[^ ]*?/gi,);
+D=D.replace(/([^-])color:[^;}']+;?/gi,$1);
+return (D);
+};
+SuperClean.filterFunctions.remove_sizes=function(D){
+D=D.replace(/size=?[^ ]*?/gi,);
+D=D.replace(/font-size:[^;}']+;?/gi,);
+return (D);
+};
+SuperClean.filterFunctions.remove_faces=function(D){
+D=D.replace(/face=?[^ ]*?/gi,);
+D=D.replace(/font-family:[^;}']+;?/gi,);
+return (D);
+};
+SuperClean.filterFunctions.remove_lang=function(D){
+D=D.replace(/lang=?[^ ]*?/gi,);
+return (D);
+};
+SuperClean.filterFunctions.word_clean=function(_1a,_1b){
+_1b.setHTML(_1a);
+_1b._wordClean();
+return _1b.getInnerHTML();
+};
+SuperClean.filterFunctions.remove_fancy_quotes=function(D){
+D=D.replace(new RegExp(String.fromCharCode(8216),g),');
+D=D.replace(new RegExp(String.fromCharCode(8217),g),');
+D=D.replace(new RegExp(String.fromCharCode(8218),g),');
+D=D.replace(new RegExp(String.fromCharCode(8219),g),');
+D=D.replace(new RegExp(String.fromCharCode(8220),g),\);
+D=D.replace(new RegExp(String.fromCharCode(8221),g),\);
+D=D.replace(new RegExp(String.fromCharCode(8222),g),\);
+D=D.replace(new RegExp(String.fromCharCode(8223),g),\);
+return D;
+};
+SuperClean.filterFunctions.tidy
[MMBASE SCM] r42189 - in CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha: . plugins/SuperClean plugins/SuperClean/lang
Author: fpunt
Date: 2010-05-17 15:20:39 +0200 (Mon, 17 May 2010)
New Revision: 42189
Added:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/Xinha.css
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/SuperClean/lang/
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/SuperClean/lang/nl.js
Log:
CMSC-1688 Attempt to plugin newer super clean version
Added:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/Xinha.css
===
---
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/Xinha.css
(rev 0)
+++
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/Xinha.css
2010-05-17 13:20:39 UTC (rev 42189)
@@ -0,0 +1,3 @@
+/* This compressed file is part of Xinha. For uncompressed sources, forum, and
bug reports, go to xinha.org */
+/* This file is part of version 0.96beta2 released Fri, 20 Mar 2009 11:01:14
+0100 */
+.htmlarea{background:#fff;}.htmlarea td{margin:0;padding:0;}.htmlarea
.toolbarRow{width:1px;}.htmlarea
.toolbar{cursor:default;background:ButtonFace;padding:3px;border:1px
solid;border-color:ButtonHighlight ButtonShadow ButtonShadow
ButtonHighlight;}.htmlarea .toolbar
table{margin:0;font-family:Tahoma,Verdana,sans-serif;font-size:11px;}.htmlarea
.toolbar img{border:none;vertical-align:top;}.htmlarea .toolbar
.label{padding:0 3px;}.htmlarea .toolbar
.button{background:ButtonFace;color:ButtonText;border:1px solid
ButtonFace;padding:1px;margin:0;width:18px;height:18px;}.htmlarea .toolbar
a.button:hover{border:1px solid;border-color:ButtonHighlight ButtonShadow
ButtonShadow ButtonHighlight;}.htmlarea .toolbar
a.buttonDisabled:hover{border-color:ButtonFace;}.htmlarea .toolbar
.buttonActive,.htmlarea .toolbar .buttonPressed{padding:2px 0 0 2px;border:1px
solid;border-color:ButtonShadow ButtonHighlight ButtonHighlight
ButtonShadow;}.htmlarea .toolbar .buttonPressed{background:Butto
nHighlight;}.htmlarea .toolbar .indicator{padding:0
3px;overflow:hidden;width:20px;text-align:center;cursor:default;border:1px
solid ButtonShadow;}.htmlarea .toolbar .buttonDisabled img{filter:gray()
alpha(opacity = 25);-moz-opacity:.25;opacity:.25;}.htmlarea .toolbar
.separator{margin:0 3px;border-left:1px solid ButtonShadow;border-right:1px
solid ButtonHighlight;width:0;height:18px;padding:0;}.htmlarea .toolbar
.space{width:5px;}.htmlarea .toolbar select,.htmlarea .toolbar option{font:11px
Tahoma,Verdana,sans-serif;}.htmlarea .toolbar select,.htmlarea .toolbar
select:hover,.htmlarea .toolbar
select:active{position:relative;top:-2px;margin-bottom:-2px;color:ButtonText;}.htmlarea
iframe.xinha_iframe,.htmlarea textarea.xinha_textarea{border:none;}.htmlarea
.statusBar{border:1px solid;border-color:ButtonShadow ButtonHighlight
ButtonHighlight ButtonShadow;padding:2px
4px;background-color:ButtonFace;color:ButtonText;font:11px
Tahoma,Verdana,sans-serif;height:16px;overflow:hidden
;}.htmlarea .statusBar .statusBarTree a{padding:2px 5px;color:#00f;}.htmlarea
.statusBar .statusBarTree a:visited{color:#00f;}.htmlarea .statusBar
.statusBarTree
a:hover{background-color:Highlight;color:HighlightText;padding:1px
4px;border:1px solid
HighlightText;}.statusBarWidgetContainer{background-color:ButtonFace;}.dialog{color:ButtonText;background:ButtonFace;border:1px
outset;border-color:WindowFrame;}div.dialog{padding-bottom:10px;border-radius:8px
8px 0 0;-moz-border-radius:8px 8px 0
0;-webkit-border-top-left-radius:8px;-webkit-border-top-right-radius:8px;box-shadow:9px
9px 10px #444;-moz-box-shadow:9px 9px 10px #444;-webkit-box-shadow:9px 9px
10px #444;}div.dialog.modeless{box-shadow:4px 4px 5px #888;-moz-box-shadow:4px
4px 5px #888;-webkit-box-shadow:4px 4px 5px
#888;}div.dialog.chrome{-webkit-box-shadow:none!IMPORTANT;}.panels
div.dialog.panel{border-radius:0;-moz-border-radius:0;-webkit-border-radius:0;box-shadow:none;-moz-box-shadow:none;-webkit-box-shadow:none;
}.xinha_dialog_background{filter:alpha(opacity=0);-moz-opacity:0;opacity:0;border:none;}.xinha_dialog_background_modal_greyout{background-color:#666;filter:alpha(opacity=70)!IMPORTANT;-moz-opacity:.7;opacity:.7;}.xinha_dialog_background_modal{filter:alpha(opacity=0)!IMPORTANT;-moz-opacity:0;opacity:0;border:none;}body.xinha_dialog_background_modal_greyout{filter:alpha(opacity=100)!IMPORTANT;}body.xinha_dialog_background_modal{filter:alpha(opacity=0);}.dialog
.content{padding:2px;}.dialog,.dialog button,.dialog input,.dialog
select,.dialog textarea,.dialog table{font:11px
Tahoma,Verdana,sans-serif;}.dialog table{border-collapse:collapse;}.dialog
.title,.dialog h1{background:ActiveCaption;color:CaptionText;border-bottom:1px
solid #000;padding:1px 0 2px
5px;font-size:12px;font-weight:bold;cursor:default;letter-spacing:.01em;}.dialog
h1
[MMBASE SCM] r42190 - CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha
Author: fpunt
Date: 2010-05-17 15:40:56 +0200 (Mon, 17 May 2010)
New Revision: 42190
Modified:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/Xinha.css
Log:
CMSC-1688 Attempt to plugin newer super clean version
Modified:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/Xinha.css
===
---
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/Xinha.css
2010-05-17 13:20:39 UTC (rev 42189)
+++
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/Xinha.css
2010-05-17 13:40:56 UTC (rev 42190)
@@ -1,3 +1,3 @@
/* This compressed file is part of Xinha. For uncompressed sources, forum, and
bug reports, go to xinha.org */
/* This file is part of version 0.96beta2 released Fri, 20 Mar 2009 11:01:14
+0100 */
-.htmlarea{background:#fff;}.htmlarea td{margin:0;padding:0;}.htmlarea
.toolbarRow{width:1px;}.htmlarea
.toolbar{cursor:default;background:ButtonFace;padding:3px;border:1px
solid;border-color:ButtonHighlight ButtonShadow ButtonShadow
ButtonHighlight;}.htmlarea .toolbar
table{margin:0;font-family:Tahoma,Verdana,sans-serif;font-size:11px;}.htmlarea
.toolbar img{border:none;vertical-align:top;}.htmlarea .toolbar
.label{padding:0 3px;}.htmlarea .toolbar
.button{background:ButtonFace;color:ButtonText;border:1px solid
ButtonFace;padding:1px;margin:0;width:18px;height:18px;}.htmlarea .toolbar
a.button:hover{border:1px solid;border-color:ButtonHighlight ButtonShadow
ButtonShadow ButtonHighlight;}.htmlarea .toolbar
a.buttonDisabled:hover{border-color:ButtonFace;}.htmlarea .toolbar
.buttonActive,.htmlarea .toolbar .buttonPressed{padding:2px 0 0 2px;border:1px
solid;border-color:ButtonShadow ButtonHighlight ButtonHighlight
ButtonShadow;}.htmlarea .toolbar .buttonPressed{background:Butto
nHighlight;}.htmlarea .toolbar .indicator{padding:0
3px;overflow:hidden;width:20px;text-align:center;cursor:default;border:1px
solid ButtonShadow;}.htmlarea .toolbar .buttonDisabled img{filter:gray()
alpha(opacity = 25);-moz-opacity:.25;opacity:.25;}.htmlarea .toolbar
.separator{margin:0 3px;border-left:1px solid ButtonShadow;border-right:1px
solid ButtonHighlight;width:0;height:18px;padding:0;}.htmlarea .toolbar
.space{width:5px;}.htmlarea .toolbar select,.htmlarea .toolbar option{font:11px
Tahoma,Verdana,sans-serif;}.htmlarea .toolbar select,.htmlarea .toolbar
select:hover,.htmlarea .toolbar
select:active{position:relative;top:-2px;margin-bottom:-2px;color:ButtonText;}.htmlarea
iframe.xinha_iframe,.htmlarea textarea.xinha_textarea{border:none;}.htmlarea
.statusBar{border:1px solid;border-color:ButtonShadow ButtonHighlight
ButtonHighlight ButtonShadow;padding:2px
4px;background-color:ButtonFace;color:ButtonText;font:11px
Tahoma,Verdana,sans-serif;height:16px;overflow:hidden
;}.htmlarea .statusBar .statusBarTree a{padding:2px 5px;color:#00f;}.htmlarea
.statusBar .statusBarTree a:visited{color:#00f;}.htmlarea .statusBar
.statusBarTree
a:hover{background-color:Highlight;color:HighlightText;padding:1px
4px;border:1px solid
HighlightText;}.statusBarWidgetContainer{background-color:ButtonFace;}.dialog{color:ButtonText;background:ButtonFace;border:1px
outset;border-color:WindowFrame;}div.dialog{padding-bottom:10px;border-radius:8px
8px 0 0;-moz-border-radius:8px 8px 0
0;-webkit-border-top-left-radius:8px;-webkit-border-top-right-radius:8px;box-shadow:9px
9px 10px #444;-moz-box-shadow:9px 9px 10px #444;-webkit-box-shadow:9px 9px
10px #444;}div.dialog.modeless{box-shadow:4px 4px 5px #888;-moz-box-shadow:4px
4px 5px #888;-webkit-box-shadow:4px 4px 5px
#888;}div.dialog.chrome{-webkit-box-shadow:none!IMPORTANT;}.panels
div.dialog.panel{border-radius:0;-moz-border-radius:0;-webkit-border-radius:0;box-shadow:none;-moz-box-shadow:none;-webkit-box-shadow:none;
}.xinha_dialog_background{filter:alpha(opacity=0);-moz-opacity:0;opacity:0;border:none;}.xinha_dialog_background_modal_greyout{background-color:#666;filter:alpha(opacity=70)!IMPORTANT;-moz-opacity:.7;opacity:.7;}.xinha_dialog_background_modal{filter:alpha(opacity=0)!IMPORTANT;-moz-opacity:0;opacity:0;border:none;}body.xinha_dialog_background_modal_greyout{filter:alpha(opacity=100)!IMPORTANT;}body.xinha_dialog_background_modal{filter:alpha(opacity=0);}.dialog
.content{padding:2px;}.dialog,.dialog button,.dialog input,.dialog
select,.dialog textarea,.dialog table{font:11px
Tahoma,Verdana,sans-serif;}.dialog table{border-collapse:collapse;}.dialog
.title,.dialog h1{background:ActiveCaption;color:CaptionText;border-bottom:1px
solid #000;padding:1px 0 2px
5px;font-size:12px;font-weight:bold;cursor:default;letter-spacing:.01em;}.dialog
h1{margin:0;border-radius:8px 8px 0 0;-moz-border-radius:8px 8px 0
0;-webkit-border-top-left-radius:8px;-webkit-border-top-right-radius:8px;}.panel
s .dialog.panel h1{-moz-border-radius:0;-webkit-border-radius:0;}.dialog
[MMBASE SCM] r42191 - CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha
Author: fpunt
Date: 2010-05-17 15:41:15 +0200 (Mon, 17 May 2010)
New Revision: 42191
Modified:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/Xinha.css
Log:
CMSC-1688 Attempt to plugin newer super clean version
Modified:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/Xinha.css
===
---
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/Xinha.css
2010-05-17 13:40:56 UTC (rev 42190)
+++
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/Xinha.css
2010-05-17 13:41:15 UTC (rev 42191)
@@ -1,3 +1,3 @@
/* This compressed file is part of Xinha. For uncompressed sources, forum, and
bug reports, go to xinha.org */
/* This file is part of version 0.96beta2 released Fri, 20 Mar 2009 11:01:14
+0100 */
-.htmlarea{background:#fff;}.htmlarea td{margin:0;padding:0;}.htmlarea
.toolbarRow{width:1px;}.htmlarea
.toolbar{cursor:default;background:ButtonFace;padding:3px;border:1px
solid;border-color:ButtonHighlight ButtonShadow ButtonShadow
ButtonHighlight;}.htmlarea .toolbar
table{margin:0;font-family:Tahoma,Verdana,sans-serif;font-size:11px;}.htmlarea
.toolbar img{border:none;vertical-align:top;}.htmlarea .toolbar
.label{padding:0 3px;}.htmlarea .toolbar
.button{background:ButtonFace;color:ButtonText;border:1px solid
ButtonFace;padding:1px;margin:0;width:18px;height:18px;}.htmlarea .toolbar
a.button:hover{border:1px solid;border-color:ButtonHighlight ButtonShadow
ButtonShadow ButtonHighlight;}.htmlarea .toolbar
a.buttonDisabled:hover{border-color:ButtonFace;}.htmlarea .toolbar
.buttonActive,.htmlarea .toolbar .buttonPressed{padding:2px 0 0 2px;border:1px
solid;border-color:ButtonShadow ButtonHighlight ButtonHighlight
ButtonShadow;}.htmlarea .toolbar .buttonPressed{background:Butto
nHighlight;}.htmlarea .toolbar .indicator{padding:0
3px;overflow:hidden;width:20px;text-align:center;cursor:default;border:1px
solid ButtonShadow;}.htmlarea .toolbar .buttonDisabled img{filter:gray()
alpha(opacity = 25);-moz-opacity:.25;opacity:.25;}.htmlarea .toolbar
.separator{margin:0 3px;border-left:1px solid ButtonShadow;border-right:1px
solid ButtonHighlight;width:0;height:18px;padding:0;}.htmlarea .toolbar
.space{width:5px;}.htmlarea .toolbar select,.htmlarea .toolbar option{font:11px
Tahoma,Verdana,sans-serif;}.htmlarea .toolbar select,.htmlarea .toolbar
select:hover,.htmlarea .toolbar
select:active{position:relative;top:-2px;margin-bottom:-2px;color:ButtonText;}.htmlarea
iframe.xinha_iframe,.htmlarea textarea.xinha_textarea{border:none;}.htmlarea
.statusBar{border:1px solid;border-color:ButtonShadow ButtonHighlight
ButtonHighlight ButtonShadow;padding:2px
4px;background-color:ButtonFace;color:ButtonText;font:11px
Tahoma,Verdana,sans-serif;height:16px;overflow:hidden
;}.htmlarea .statusBar .statusBarTree a{padding:2px 5px;color:#00f;}.htmlarea
.statusBar .statusBarTree a:visited{color:#00f;}.htmlarea .statusBar
.statusBarTree
a:hover{background-color:Highlight;color:HighlightText;padding:1px
4px;border:1px solid
HighlightText;}.statusBarWidgetContainer{background-color:ButtonFace;}.dialog{color:ButtonText;background:ButtonFace;border:1px
outset;border-color:WindowFrame;}div.dialog{padding-bottom:10px;border-radius:8px
8px 0 0;-moz-border-radius:8px 8px 0
0;-webkit-border-top-left-radius:8px;-webkit-border-top-right-radius:8px;box-shadow:9px
9px 10px #444;-moz-box-shadow:9px 9px 10px #444;-webkit-box-shadow:9px 9px
10px #444;}div.dialog.modeless{box-shadow:4px 4px 5px #888;-moz-box-shadow:4px
4px 5px #888;-webkit-box-shadow:4px 4px 5px
#888;}div.dialog.chrome{-webkit-box-shadow:none!IMPORTANT;}.panels
div.dialog.panel{border-radius:0;-moz-border-radius:0;-webkit-border-radius:0;box-shadow:none;-moz-box-shadow:none;-webkit-box-shadow:none;
}.xinha_dialog_background{filter:alpha(opacity=0);-moz-opacity:0;opacity:0;border:none;}.xinha_dialog_background_modal_greyout{background-color:#666;filter:alpha(opacity=70)!IMPORTANT;-moz-opacity:.7;opacity:.7;}.xinha_dialog_background_modal{filter:alpha(opacity=0)!IMPORTANT;-moz-opacity:0;opacity:0;border:none;}body.xinha_dialog_background_modal_greyout{filter:alpha(opacity=100)!IMPORTANT;}body.xinha_dialog_background_modal{filter:alpha(opacity=0);}.dialog
.content{padding:2px;}.dialog,.dialog button,.dialog input,.dialog
select,.dialog textarea,.dialog table{font:11px
Tahoma,Verdana,sans-serif;}.dialog table{border-collapse:collapse;}.dialog
.title,.dialog h1{background:ActiveCaption;color:CaptionText;border-bottom:1px
solid #000;padding:1px 0 2px
5px;font-size:12px;font-weight:bold;cursor:default;letter-spacing:.01em;}.dialog
h1{margin:0;border-radius:8px 8px 0 0;-moz-border-radius:8px 8px 0
0;-webkit-border-top-left-radius:8px;-webkit-border-top-right-radius:8px;}.panel
s .dialog.panel h1{-moz-border-radius:0;-webkit-border-radius:0;}.dialog
[MMBASE SCM] r42100 - in CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha: . lang plugins/TableOperations plugins/TableOperations/lang plugins/cmscrichtext/lang
Author: fpunt
Date: 2010-05-04 15:49:12 +0200 (Tue, 04 May 2010)
New Revision: 42100
Added:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/TableOperations/lang/
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/TableOperations/lang/nl.js
Modified:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/lang/nl.js
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/my-htmlarea.js
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/cmscrichtext/lang/nl.js
Log:
[CMSC-1686] Fixed Dutch translations in Xinha richtext editor
Modified:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/lang/nl.js
===
---
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/lang/nl.js
2010-05-04 13:46:43 UTC (rev 42099)
+++
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/lang/nl.js
2010-05-04 13:49:12 UTC (rev 42100)
@@ -41,7 +41,7 @@
Undoes your last action: Ongedaan maken,
Redoes your last action: Herhalen,
Cut selection: Knippen,
- Copy selection: Kopi�ren,
+ Copy selection: Kopie maken,
Paste from clipboard: Plakken,
Direction left to right: Tekstrichting links naar rechts,
Direction right to left: Tekstrichting rechts naar links,
@@ -62,6 +62,7 @@
URL:: URL:,
You must enter the URL where this link points to: Geef de URL in waar de
link naar verwijst,
+ // Missing translations
Insert embed content: Embed content invoegen,
Normal: Standaard,
Heading 1: Kop 1,
@@ -71,13 +72,12 @@
Insert Image: Afbeelding invoegen,
Select all: Selecteer alles,
Clear Inline Font Specifications: Verwijder inline lettertypes,
- Remove formatting, Verwijder formatering,
- Toggle Borders, Schakel randen,
+ Remove formatting: Verwijder formatering,
+ Toggle Borders: Schakel randen,
Insert/Modify Embeded Code: Invoegen bewerken embed content,
Embeded Code:: Embed Code:,
Preview:: Voorbeeld:,
- 'Click New Url to enter URL': 'Klik op Nieuwe Url om URL in te voeren',
- New Url: Nieuwe Url,
+ Click \New Url\ to enter URL: Klik op \Nieuwe Url\ om URL in te
voeren,
Size: Formaat,
Width:: Breedte:,
Height:: Hoogte:,
@@ -85,25 +85,22 @@
Would you like to clear font typefaces?: Wilt u alle font lettertypes
verwijderen?,
Would you like to clear font sizes?: Wilt u alle font formaten
verwijderen?,
Would you like to clear font colours?: Wilt u alle font kleuren
verwijderen?,
- The editor provides the following key combinations: De editor bied de
volgende knop combinaties,
- new paragraph: nieuwe paragraaf,
- insert linebreak: nieuwe regel afbreking,
+ Keyboard shortcuts: Toetsenbord snelkoppelingen,
+ The editor provides the following key combinations:: De editor bied de
volgende knop combinaties:,
+ new paragraph: Nieuwe paragraaf,
+ insert linebreak: Nieuwe regel afbreking,
Select all: Selecteer alles,
Set format to paragraph: Formateer naar paragraaf,
Clean content pasted from Word: Schoon uit Word geplakte content op,
Headings: Koppen,
Close: Sluiten,
- Rows: Rijen,
- Cols: Kolommen,
- Width: Breedte,
+ Rows:: Rijen:,
+ Cols:: Kolommen:,
Percent: Procent,
Layout: Opmaak,
- Border Thickness: Rand dikte,
+ Border thickness:: Rand dikte:,
Spacing: Ruimte,
- Cell Spacing: Cel ruimte,
- Cell padding: Cel opvulling,
- Frame and border: Frame en randen,
- Enkel aan de bovenen onderkant: Enkel aan de boven en onderkant,
- marge: Marge
-
+ Cell Spacing:: Cel ruimte:,
+ Cell padding:: Cel opvulling:,
+ Frame and borders: Frame en randen
}
Modified:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/my-htmlarea.js
===
---
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/my-htmlarea.js
2010-05-04 13:46:43 UTC (rev 42099)
+++
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/my-htmlarea.js
2010-05-04 13:49:12 UTC (rev 42100)
@@ -270,7 +270,11 @@
}
}
}
+function i18n(str) {
+return (Xinha._lc(str, 'cmscrichtext'));
+ }
+
Xinha.prototype._createLink = function(link) {
var editor = this;
var outparam = null;
@@ -313,7 +317,7 @@
}
else titleNoLink = sel_value;
outparam = {
- f_href : Click \New Url\ to enter URL,
+ f_href : i18n(Click \New Url\ to enter URL),
f_destination : null,
f_title : titleNoLink,
f_tooltip : '',
Added:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp
[MMBASE SCM] r42039 - CMSContainer/branches/b1_7/CMSContainer/migration
Author: fpunt Date: 2010-04-26 13:35:25 +0200 (Mon, 26 Apr 2010) New Revision: 42039 Modified: CMSContainer/branches/b1_7/CMSContainer/migration/migration_1.6_to_1.7.txt Log: CMSC-1672 Fixed Modified: CMSContainer/branches/b1_7/CMSContainer/migration/migration_1.6_to_1.7.txt === --- CMSContainer/branches/b1_7/CMSContainer/migration/migration_1.6_to_1.7.txt 2010-04-26 09:02:28 UTC (rev 42038) +++ CMSContainer/branches/b1_7/CMSContainer/migration/migration_1.6_to_1.7.txt 2010-04-26 11:35:25 UTC (rev 42039) @@ -274,3 +274,27 @@ * * * + + +Name: convert community to new style using filter +Goal: +Type: changes in web.xml files. +--- Start --- +In both the staging and live web.xml: +Put the following text just below the Set Character Encoding Filter /filter: + !--JavaEE authentication for Community Module-- + filter + filter-namePortalFilter/filter-name + filter-classcom.finalist.cmsc.login.filter.PortalFilter/filter-class + /filter +Put the following text just below the CharacterEncoding /filter-mapping: + !--JavaEE authentication for Community Module-- + filter-mapping + filter-namePortalFilter/filter-name + url-pattern/*/url-pattern + /filter-mapping +--- End --- +Exceptions/errors/other problems and what to do: +* +* +* ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r42037 - CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources
Author: fpunt
Date: 2010-04-26 10:12:27 +0200 (Mon, 26 Apr 2010)
New Revision: 42037
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
Log:
CMSC-1657 Added missing language texts
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
2010-04-23 11:16:44 UTC (rev 42036)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
2010-04-26 08:12:27 UTC (rev 42037)
@@ -118,6 +118,7 @@
content.status.approved=Approved
content.status.published=In publication queue
content.status.onlive=On live
+content.status.all=All
collection.title=Collection
collection.channel=Channel b {0} /b.
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
2010-04-23 11:16:44 UTC (rev 42036)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
2010-04-26 08:12:27 UTC (rev 42037)
@@ -117,6 +117,7 @@
content.status.approved=Goed- br / gekeurd
content.status.published=In publicatie wachtrij
content.status.onlive=Op live
+content.status.all=Alle
collection.title=Verzameling
collection.channel=U bekijkt nu b {0} /b.
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r42066 - CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/EmbedCode/popups
Author: fpunt Date: 2010-04-28 13:38:31 +0200 (Wed, 28 Apr 2010) New Revision: 42066 Modified: CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/EmbedCode/popups/embed_code.html Log: CMSC-1686 Working on Dutch translations Modified: CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/EmbedCode/popups/embed_code.html === --- CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/EmbedCode/popups/embed_code.html 2010-04-28 09:54:24 UTC (rev 42065) +++ CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/EmbedCode/popups/embed_code.html 2010-04-28 11:38:31 UTC (rev 42066) @@ -67,9 +67,7 @@ form name=embededCodeForm action=# div style=padding:10px div -p -Embeded Code: -/p +tabletrtdEmbeded Code:/td/tr/table div style=float:left;width:70% textarea name=embededCode id=embededCode style=width:100%;height:100% onblur=return onPreview(); /textarea /div @@ -79,9 +77,7 @@ /div /div div style=clear:both;padding-top:10px; -p -Preview: -/p +tabletrtdPreview:/td/tr/table div iframe id=previewFrame style=width:100%;height:380px/iframe /div ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r42040 - CMSContainer/trunk/CMSContainer/migration
Author: fpunt Date: 2010-04-26 13:35:50 +0200 (Mon, 26 Apr 2010) New Revision: 42040 Modified: CMSContainer/trunk/CMSContainer/migration/migration_1.6_to_1.7.txt Log: CMSC-1672 Fixed Modified: CMSContainer/trunk/CMSContainer/migration/migration_1.6_to_1.7.txt === --- CMSContainer/trunk/CMSContainer/migration/migration_1.6_to_1.7.txt 2010-04-26 11:35:25 UTC (rev 42039) +++ CMSContainer/trunk/CMSContainer/migration/migration_1.6_to_1.7.txt 2010-04-26 11:35:50 UTC (rev 42040) @@ -281,3 +281,27 @@ * * * + + +Name: convert community to new style using filter +Goal: +Type: changes in web.xml files. +--- Start --- +In both the staging and live web.xml: +Put the following text just below the Set Character Encoding Filter /filter: + !--JavaEE authentication for Community Module-- + filter + filter-namePortalFilter/filter-name + filter-classcom.finalist.cmsc.login.filter.PortalFilter/filter-class + /filter +Put the following text just below the CharacterEncoding /filter-mapping: + !--JavaEE authentication for Community Module-- + filter-mapping + filter-namePortalFilter/filter-name + url-pattern/*/url-pattern + /filter-mapping +--- End --- +Exceptions/errors/other problems and what to do: +* +* +* ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r42046 - CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
Author: fpunt
Date: 2010-04-26 16:44:22 +0200 (Mon, 26 Apr 2010)
New Revision: 42046
Modified:
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationPublish.java
Log:
CMSC-1671 Solved, the confirm was not working nicely.
Modified:
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationPublish.java
===
---
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationPublish.java
2010-04-26 14:44:02 UTC (rev 42045)
+++
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationPublish.java
2010-04-26 14:44:22 UTC (rev 42046)
@@ -47,6 +47,11 @@
private static final String ACTION_CANCEL = cancel;
/**
+* name of submit button in jsp to confirm
+*/
+ private static final String ACTION_CONFIRM = confirm;
+
+ /**
* System property to allow skipping the Freeze or Approve action
*/
public static final String NEWSLETTER_FREEZE_PROPERTY =
newsletter.workflow.allow.skip.freezing;
@@ -130,7 +135,7 @@
}
private boolean isSendAction(HttpServletRequest request) {
- return getParameter(request, ACTION_REMOVE) != null;
+ return getParameter(request, ACTION_CONFIRM) != null ||
getParameter(request, ACTION_REMOVE) != null;
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r42038 - CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/resources
Author: fpunt
Date: 2010-04-26 11:02:28 +0200 (Mon, 26 Apr 2010)
New Revision: 42038
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
Log:
CMSC-1657 Fixed translations
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
===
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
2010-04-26 08:12:27 UTC (rev 42037)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
2010-04-26 09:02:28 UTC (rev 42038)
@@ -118,6 +118,7 @@
content.status.approved=Approved
content.status.published=In publication queue
content.status.onlive=On live
+content.status.all=All
collection.title=Collection
collection.channel=Channel b {0} /b.
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
===
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
2010-04-26 08:12:27 UTC (rev 42037)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
2010-04-26 09:02:28 UTC (rev 42038)
@@ -117,6 +117,7 @@
content.status.approved=Goed- br / gekeurd
content.status.published=In publicatie wachtrij
content.status.onlive=Op live
+content.status.all=Alle
collection.title=Verzameling
collection.channel=U bekijkt nu b {0} /b.
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r42045 - CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
Author: fpunt
Date: 2010-04-26 16:44:02 +0200 (Mon, 26 Apr 2010)
New Revision: 42045
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationPublish.java
Log:
CMSC-1671 Solved, the confirm was not working nicely.
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationPublish.java
===
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationPublish.java
2010-04-26 13:56:53 UTC (rev 42044)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationPublish.java
2010-04-26 14:44:02 UTC (rev 42045)
@@ -47,6 +47,11 @@
private static final String ACTION_CANCEL = cancel;
/**
+* name of submit button in jsp to confirm
+*/
+ private static final String ACTION_CONFIRM = confirm;
+
+ /**
* System property to allow skipping the Freeze or Approve action
*/
public static final String NEWSLETTER_FREEZE_PROPERTY =
newsletter.workflow.allow.skip.freezing;
@@ -129,8 +134,8 @@
return getParameter(request, ACTION_CANCEL) != null;
}
+
private boolean isSendAction(HttpServletRequest request) {
- return getParameter(request, ACTION_REMOVE) != null;
+ return getParameter(request, ACTION_CONFIRM) != null ||
getParameter(request, ACTION_REMOVE) != null;
}
-
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r42002 - in CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src: java/com/finalist/cmsc/repository/forms webapp/editors/repository
Author: fpunt
Date: 2010-04-21 10:38:23 +0200 (Wed, 21 Apr 2010)
New Revision: 42002
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchAction.java
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentSearchAction.java
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchForm.java
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
Log:
Fixed back CMSC-1657 to CMSc branch 1.7
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchAction.java
===
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchAction.java
2010-04-21 08:20:36 UTC (rev 42001)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchAction.java
2010-04-21 08:38:23 UTC (rev 42002)
@@ -122,6 +122,17 @@
query.setNodeStep(assetStep);
}
+ // Search on Workflow status when needed, onlive basicly means not in
workflow rel
+ String workflowstate = searchForm.getWorkflowstate();
+ if(!StringUtils.isEmpty(workflowstate)) {
+ NodeManager workflowNodeManager =
cloud.getNodeManager(workflowitem);
+ Step workflowStep = query.addRelationStep(workflowNodeManager,
workflowrel, SOURCE).getNext();
+ StepField workflowStatusField = query.createStepField(workflowStep,
workflowNodeManager.getField(status));
+ FieldValueConstraint workflowConstraint =
query.createConstraint(workflowStatusField, FieldCompareConstraint.EQUAL,
+ workflowstate);
+ SearchUtil.addConstraint(query, workflowConstraint);
+ }
+
// Order the result by:
String order = searchForm.getOrder();
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentSearchAction.java
===
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentSearchAction.java
2010-04-21 08:20:36 UTC (rev 42001)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentSearchAction.java
2010-04-21 08:38:23 UTC (rev 42002)
@@ -148,6 +148,18 @@
SearchUtil.addConstraint(query, contentConstraint);
query.setNodeStep(contentStep);
}
+
+ // Search on Workflow status when needed, onlive basicly means not in
workflow rel
+ String workflowstate = searchForm.getWorkflowstate();
+ if(!StringUtils.isEmpty(workflowstate)) {
+ NodeManager workflowNodeManager = cloud.getNodeManager(workflowitem);
+ Step workflowStep = query.addRelationStep(workflowNodeManager,
workflowrel, SOURCE).getNext();
+ StepField workflowStatusField = query.createStepField(workflowStep,
workflowNodeManager.getField(status));
+ FieldValueConstraint workflowConstraint =
query.createConstraint(workflowStatusField, FieldCompareConstraint.EQUAL,
+ workflowstate);
+ SearchUtil.addConstraint(query, workflowConstraint);
+ }
+
// Order the result by:
String order = searchForm.getOrder();
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchForm.java
===
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchForm.java
2010-04-21 08:20:36 UTC (rev 42001)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchForm.java
2010-04-21 08:38:23 UTC (rev 42002)
@@ -21,7 +21,7 @@
private String search = true;
private String parentchannelpath = ;
private String index = ;
- private String workflowstate = 0;
+ private String workflowstate = ;
public String getContenttypes() {
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
===
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
2010-04-21 08:20:36 UTC (rev 42001)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
2010-04
[MMBASE SCM] r42003 - CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select
Author: fpunt
Date: 2010-04-21 10:47:28 +0200 (Wed, 21 Apr 2010)
New Revision: 42003
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/index.jsp
Log:
[CMSC-1662] Now automaticly searching when searching for related articles
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/index.jsp
===
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/index.jsp
2010-04-21 08:38:23 UTC (rev 42002)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/index.jsp
2010-04-21 08:47:28 UTC (rev 42003)
@@ -41,7 +41,9 @@
/mm:present
mm:present referid=action
- mm:url page=/editors/repository/SearchInitAction.do id=contenturl
write=false
+ %-- CMSC-1662 We automaticly want to search if a complete search is
submitted --%
+ c:set var=page value=${(empty
type)?'/editors/repository/SearchInitAction.do':'/editors/repository/ContentSearchAction.do'}/
+ mm:url page=${page} id=contenturl write=false
mm:param name=action value=${action} /
mm:param name=position value=${position} /
mm:param name=title value=${initsearchtext} /
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r42004 - CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select
Author: fpunt
Date: 2010-04-21 10:47:40 +0200 (Wed, 21 Apr 2010)
New Revision: 42004
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/index.jsp
Log:
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/index.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/index.jsp
2010-04-21 08:47:28 UTC (rev 42003)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/index.jsp
2010-04-21 08:47:40 UTC (rev 42004)
@@ -41,7 +41,9 @@
/mm:present
mm:present referid=action
- mm:url page=/editors/repository/ContentSearchAction.do
id=contenturl write=false
+ %-- CMSC-1662 We automaticly want to search if a complete search is
submitted --%
+ c:set var=page value=${(empty
type)?'/editors/repository/SearchInitAction.do':'/editors/repository/ContentSearchAction.do'}/
+ mm:url page=${page} id=contenturl write=false
mm:param name=action value=${action} /
mm:param name=position value=${position} /
mm:param name=title value=${initsearchtext} /
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r41986 - in CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src: java/com/finalist/cmsc/repository/forms webapp/editors/repository
Author: fpunt
Date: 2010-04-20 17:51:11 +0200 (Tue, 20 Apr 2010)
New Revision: 41986
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchAction.java
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentSearchAction.java
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
Log:
CMSC-1657 Fixed for the assets
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchAction.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchAction.java
2010-04-20 15:34:24 UTC (rev 41985)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchAction.java
2010-04-20 15:51:11 UTC (rev 41986)
@@ -121,7 +121,18 @@
SearchUtil.addConstraint(query, channelConstraint);
query.setNodeStep(assetStep);
}
-
+
+ // Search on Workflow status when needed, onlive basicly means not in
workflow rel
+ String workflowstate = searchForm.getWorkflowstate();
+ if(!StringUtils.isEmpty(workflowstate)) {
+ NodeManager workflowNodeManager =
cloud.getNodeManager(workflowitem);
+ Step workflowStep = query.addRelationStep(workflowNodeManager,
workflowrel, SOURCE).getNext();
+ StepField workflowStatusField = query.createStepField(workflowStep,
workflowNodeManager.getField(status));
+ FieldValueConstraint workflowConstraint =
query.createConstraint(workflowStatusField, FieldCompareConstraint.EQUAL,
+ workflowstate);
+ SearchUtil.addConstraint(query, workflowConstraint);
+ }
+
// Order the result by:
String order = searchForm.getOrder();
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentSearchAction.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentSearchAction.java
2010-04-20 15:34:24 UTC (rev 41985)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentSearchAction.java
2010-04-20 15:51:11 UTC (rev 41986)
@@ -149,7 +149,6 @@
query.setNodeStep(contentStep);
}
-
// Search on Workflow status when needed, onlive basicly means not in
workflow rel
String workflowstate = searchForm.getWorkflowstate();
if(!StringUtils.isEmpty(workflowstate)) {
@@ -160,6 +159,7 @@
workflowstate);
SearchUtil.addConstraint(query, workflowConstraint);
}
+
// Order the result by:
String order = searchForm.getOrder();
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
2010-04-20 15:34:24 UTC (rev 41985)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
2010-04-20 15:51:11 UTC (rev 41986)
@@ -241,21 +241,22 @@
tdfmt:message key=searchform.number //td
tdhtml:text style=width:145px
property=objectid//td
/tr
- c:if test=${hasWorkflow}
- tr height=31px
- tdfmt:message key=searchform.workflowstate
//td
- td
- html:select style=width:145px
property=workflowstate size=1
-html:option value=0 - /html:option
-html:option value=1fmt:message
key=asset.status.finished //html:option
-html:option value=2fmt:message
key=asset.status.approved //html:option
-html:option value=3fmt:message
key=asset.status.published //html:option
-html:option value=4fmt:message
key=asset.status.onlive //html:option
- /html:select
- /td
- td colspan=2nbsp;/td
- /tr
- /c:if
+ c:if test=${hasWorkflow}
+ tr height=31px
+ tdfmt:message key=searchform.workflowstate
//td
+ td
+ html:select style=width:145px
property
[MMBASE SCM] r41957 - CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select
Author: fpunt
Date: 2010-04-19 17:30:20 +0200 (Mon, 19 Apr 2010)
New Revision: 41957
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/index.jsp
Log:
[CMSC-1662] Now automaticly searching when searching for related articles
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/index.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/index.jsp
2010-04-19 15:05:30 UTC (rev 41956)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/index.jsp
2010-04-19 15:30:20 UTC (rev 41957)
@@ -41,7 +41,7 @@
/mm:present
mm:present referid=action
- mm:url page=/editors/repository/SearchInitAction.do id=contenturl
write=false
+ mm:url page=/editors/repository/ContentSearchAction.do
id=contenturl write=false
mm:param name=action value=${action} /
mm:param name=position value=${position} /
mm:param name=title value=${initsearchtext} /
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r41932 - CMSContainer/tags
Author: fpunt Date: 2010-04-15 13:27:24 +0200 (Thu, 15 Apr 2010) New Revision: 41932 Added: CMSContainer/tags/v1_8_0_1/ Log: Releasing 1.8.0.1 Copied: CMSContainer/tags/v1_8_0_1 (from rev 41931, CMSContainer/trunk) ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r41861 - CMSContainer/tags
Author: fpunt Date: 2010-04-13 10:16:51 +0200 (Tue, 13 Apr 2010) New Revision: 41861 Added: CMSContainer/tags/v1_8_0/ Log: Releasing 1.8.0 Copied: CMSContainer/tags/v1_8_0 (from rev 41860, CMSContainer/trunk) ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r41865 - CMSContainer/trunk
Author: fpunt Date: 2010-04-13 11:53:06 +0200 (Tue, 13 Apr 2010) New Revision: 41865 Modified: CMSContainer/trunk/pom.xml Log: CMSc 1.8 re-enabled the demo in the build Modified: CMSContainer/trunk/pom.xml === --- CMSContainer/trunk/pom.xml 2010-04-13 09:51:25 UTC (rev 41864) +++ CMSContainer/trunk/pom.xml 2010-04-13 09:53:06 UTC (rev 41865) @@ -14,7 +14,7 @@ parent groupIdorg.cmscontainer/groupId artifactIdcmsc-project/artifactId - version1.8.0/version + version1.8.1-SNAPSHOT/version relativePathCMSContainer/pom.xml/relativePath /parent @@ -27,7 +27,7 @@ moduleCMSContainer_Modules/module moduleCMSContainer_Portlets/module moduleCMSContainer_Templates/module - !-- moduleCMSContainer_Demo/demo.cmscontainer.org/module-- + moduleCMSContainer_Demo/demo.cmscontainer.org/module /modules profiles ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r41877 - in CMSContainer/trunk: CMSContainer/maven-base CMSContainer_Demo/m2archetype/war-community-archetype/src/main/resources/archetype-resources CMSContainer_Demo/m2archetype/war-live
Author: fpunt Date: 2010-04-13 14:17:10 +0200 (Tue, 13 Apr 2010) New Revision: 41877 Modified: CMSContainer/trunk/CMSContainer/maven-base/pom.xml CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-community-archetype/src/main/resources/archetype-resources/pom.xml CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war-live/pom.xml CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war-staging/pom.xml CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-single-archetype/src/main/resources/archetype-resources/pom.xml Log: Continue with work on the CMSc 1.8.1 Modified: CMSContainer/trunk/CMSContainer/maven-base/pom.xml === --- CMSContainer/trunk/CMSContainer/maven-base/pom.xml 2010-04-13 11:39:07 UTC (rev 41876) +++ CMSContainer/trunk/CMSContainer/maven-base/pom.xml 2010-04-13 12:17:10 UTC (rev 41877) @@ -512,7 +512,7 @@ dependency groupIdcommons-beanutils/groupId artifactIdcommons-beanutils/artifactId -version1.8.1-SNAPSHOT/version +version1.8.0/version /dependency dependency groupIdcommons-chain/groupId Modified: CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-community-archetype/src/main/resources/archetype-resources/pom.xml === --- CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-community-archetype/src/main/resources/archetype-resources/pom.xml 2010-04-13 11:39:07 UTC (rev 41876) +++ CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-community-archetype/src/main/resources/archetype-resources/pom.xml 2010-04-13 12:17:10 UTC (rev 41877) @@ -431,7 +431,7 @@ dependency groupIdcommons-beanutils/groupId artifactIdcommons-beanutils/artifactId - version1.8.1-SNAPSHOT/version + version1.8.0/version /dependency dependency groupIdcommons-chain/groupId Modified: CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war-live/pom.xml === --- CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war-live/pom.xml 2010-04-13 11:39:07 UTC (rev 41876) +++ CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war-live/pom.xml 2010-04-13 12:17:10 UTC (rev 41877) @@ -320,7 +320,7 @@ dependency groupIdcommons-beanutils/groupId artifactIdcommons-beanutils/artifactId - version1.8.1-SNAPSHOT/version + version1.8.0/version /dependency dependency groupIdcommons-chain/groupId Modified: CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war-staging/pom.xml === --- CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war-staging/pom.xml 2010-04-13 11:39:07 UTC (rev 41876) +++ CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-livestaging-archetype/src/main/resources/archetype-resources/war-staging/pom.xml 2010-04-13 12:17:10 UTC (rev 41877) @@ -339,7 +339,7 @@ dependency groupIdcommons-beanutils/groupId artifactIdcommons-beanutils/artifactId - version1.8.1-SNAPSHOT/version + version1.8.0/version /dependency dependency groupIdcommons-chain/groupId Modified: CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-single-archetype/src/main/resources/archetype-resources/pom.xml === --- CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-single-archetype/src/main/resources/archetype-resources/pom.xml 2010-04-13 11:39:07 UTC (rev 41876) +++ CMSContainer/trunk/CMSContainer_Demo/m2archetype/war-single-archetype/src/main/resources/archetype-resources/pom.xml 2010-04-13 12:17:10 UTC (rev 41877) @@ -322,7 +322,7 @@ dependency groupIdcommons-beanutils/groupId artifactIdcommons-beanutils/artifactId - version1.8.1-SNAPSHOT/version + version1.8.0/version /dependency dependency groupIdcommons-chain/groupId ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r41704 - CMSContainer/branches/b1_7
Author: fpunt Date: 2010-03-31 14:45:47 +0200 (Wed, 31 Mar 2010) New Revision: 41704 Modified: CMSContainer/branches/b1_7/.classpath Log: fixed classpath Modified: CMSContainer/branches/b1_7/.classpath === --- CMSContainer/branches/b1_7/.classpath 2010-03-31 12:08:16 UTC (rev 41703) +++ CMSContainer/branches/b1_7/.classpath 2010-03-31 12:45:47 UTC (rev 41704) @@ -91,7 +91,7 @@ /classpathentry classpathentry kind=var path=M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar sourcepath=M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4-sources.jar/ classpathentry kind=var path=M2_REPO/antlr/antlr/2.7.2/antlr-2.7.2.jar/ - classpathentry kind=var path=M2_REPO/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar/ + classpathentry kind=var path=M2_REPO/backport-util-concurrent/backport-util-concurrent/1.1_01/backport-util-concurrent-1.1_01.jar/ classpathentry kind=var path=M2_REPO/mmapps/cloudprovider/1.2/cloudprovider-1.2.jar attributes attribute name=javadoc_location value=http://mmapps.sourceforge.net/cloudprovider/apidocs// @@ -144,7 +144,6 @@ attribute name=javadoc_location value=http://ehcache.org/apidocs// /attributes /classpathentry - classpathentry kind=var path=M2_REPO/net/sf/jsr107cache/jsr107cache/1.0/jsr107cache-1.0.jar/ classpathentry kind=var path=M2_REPO/junit/junit/4.4/junit-4.4.jar sourcepath=M2_REPO/junit/junit/4.4/junit-4.4-sources.jar attributes attribute name=javadoc_location value=http://junit.sourceforge.net/javadoc/ @@ -170,40 +169,40 @@ classpathentry kind=var path=M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1.jar sourcepath=M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1-sources.jar/ classpathentry kind=var path=M2_REPO/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar sourcepath=M2_REPO/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04-sources.jar/ classpathentry kind=var path=M2_REPO/org/json/json/20070829/json-20070829.jar/ - classpathentry kind=var path=M2_REPO/org/mmbase/maven/maven-mmbase-plugin/1.9-SNAPSHOT/maven-mmbase-plugin-1.9-SNAPSHOT.jar/ - classpathentry kind=var path=M2_REPO/org/mmbase/mmbase/1.9-SNAPSHOT/mmbase-1.9-SNAPSHOT.jar sourcepath=/M2_REPO/org/mmbase/mmbase/1.9-SNAPSHOT/mmbase-1.9-SNAPSHOT.jar + classpathentry kind=var path=M2_REPO/org/mmbase/maven/maven-mmbase-plugin/1.9.2-20091118/maven-mmbase-plugin-1.9.2-20091118.jar/ + classpathentry kind=var path=M2_REPO/org/mmbase/mmbase/1.9.2-20091118/mmbase-1.9.2-20091118.jar sourcepath=/M2_REPO/org/mmbase/mmbase/1.9.2-20091118/mmbase-1.9.2-20091118.jar attributes attribute name=javadoc_location value=http://www.mmbase.org/development/api/1.9// /attributes /classpathentry - classpathentry kind=var path=M2_REPO/org/mmbase/mmbase-cloudcontext/1.9-SNAPSHOT/mmbase-cloudcontext-1.9-SNAPSHOT-classes.jar + classpathentry kind=var path=M2_REPO/org/mmbase/mmbase-cloudcontext/1.9.2-20091118/mmbase-cloudcontext-1.9.2-20091118-classes.jar attributes attribute name=javadoc_location value=http://www.mmbase.org/development/api/1.9// /attributes /classpathentry - classpathentry kind=var path=M2_REPO/org/mmbase/mmbase-crontab/1.9-SNAPSHOT/mmbase-crontab-1.9-SNAPSHOT-classes.jar + classpathentry kind=var path=M2_REPO/org/mmbase/mmbase-crontab/1.9.2-20091118/mmbase-crontab-1.9.2-20091118-classes.jar attributes attribute name=javadoc_location value=http://www.mmbase.org/development/api/1.9// /attributes /classpathentry - classpathentry kind=var path=M2_REPO/org/mmbase/mmbase-dove/1.9-SNAPSHOT/mmbase-dove-1.9-SNAPSHOT.jar + classpathentry kind=var path=M2_REPO/org/mmbase/mmbase-dove/1.9.2-20091118/mmbase-dove-1.9.2-20091118.jar attributes attribute name=javadoc_location value=http://www.mmbase.org/development/api/1.9// /attributes /classpathentry - classpathentry kind=var path=M2_REPO/org/mmbase/mmbase-editwizard/1.9-SNAPSHOT/mmbase-editwizard-1.9-SNAPSHOT-classes.jar + classpathentry kind=var path=M2_REPO/org/mmbase/mmbase-editwizard/1.9.2-20091118/mmbase-editwizard-1.9.2-20091118-classes.jar attributes attribute name=javadoc_location value=http://www.mmbase.org/development/api/1.9// /attributes /classpathentry - classpathentry kind=var path=M2_REPO/org/mmbase/mmbase-email/1.9-SNAPSHOT/mmbase-email-1.9-SNAPSHOT-classes.jar + classpathentry kind=var path=M2_REPO/org/mmbase/mmbase-email/1.9.2-20091118/mmbase
[MMBASE SCM] r41705 - CMSContainer/branches/b1_7
Author: fpunt Date: 2010-03-31 14:49:35 +0200 (Wed, 31 Mar 2010) New Revision: 41705 Modified: CMSContainer/branches/b1_7/.classpath Log: fixed classpath Modified: CMSContainer/branches/b1_7/.classpath === --- CMSContainer/branches/b1_7/.classpath 2010-03-31 12:45:47 UTC (rev 41704) +++ CMSContainer/branches/b1_7/.classpath 2010-03-31 12:49:35 UTC (rev 41705) @@ -91,7 +91,6 @@ /classpathentry classpathentry kind=var path=M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar sourcepath=M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4-sources.jar/ classpathentry kind=var path=M2_REPO/antlr/antlr/2.7.2/antlr-2.7.2.jar/ - classpathentry kind=var path=M2_REPO/backport-util-concurrent/backport-util-concurrent/1.1_01/backport-util-concurrent-1.1_01.jar/ classpathentry kind=var path=M2_REPO/mmapps/cloudprovider/1.2/cloudprovider-1.2.jar attributes attribute name=javadoc_location value=http://mmapps.sourceforge.net/cloudprovider/apidocs// ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r41706 - CMSContainer/trunk
Author: fpunt Date: 2010-03-31 14:53:33 +0200 (Wed, 31 Mar 2010) New Revision: 41706 Modified: CMSContainer/trunk/.classpath Log: fixed classpath Modified: CMSContainer/trunk/.classpath === --- CMSContainer/trunk/.classpath 2010-03-31 12:49:35 UTC (rev 41705) +++ CMSContainer/trunk/.classpath 2010-03-31 12:53:33 UTC (rev 41706) @@ -100,7 +100,6 @@ /classpathentry classpathentry kind=var path=M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar sourcepath=M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4-sources.jar / classpathentry kind=var path=M2_REPO/antlr/antlr/2.7.2/antlr-2.7.2.jar / - classpathentry kind=var path=M2_REPO/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar / classpathentry kind=var path=M2_REPO/mmapps/cloudprovider/1.2/cloudprovider-1.2.jar attributes attribute name=javadoc_location value=http://mmapps.sourceforge.net/cloudprovider/apidocs/; / @@ -153,7 +152,6 @@ attribute name=javadoc_location value=http://ehcache.org/apidocs/; / /attributes /classpathentry - classpathentry kind=var path=M2_REPO/net/sf/jsr107cache/jsr107cache/1.0/jsr107cache-1.0.jar / classpathentry kind=var path=M2_REPO/junit/junit/4.4/junit-4.4.jar sourcepath=M2_REPO/junit/junit/4.4/junit-4.4-sources.jar attributes attribute name=javadoc_location value=http://junit.sourceforge.net/javadoc; / @@ -179,40 +177,40 @@ classpathentry kind=var path=M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1.jar sourcepath=M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1-sources.jar / classpathentry kind=var path=M2_REPO/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar sourcepath=M2_REPO/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04-sources.jar / classpathentry kind=var path=M2_REPO/org/json/json/20070829/json-20070829.jar / - classpathentry kind=var path=M2_REPO/org/mmbase/maven/maven-mmbase-plugin/1.9-SNAPSHOT/maven-mmbase-plugin-1.9-SNAPSHOT.jar / - classpathentry kind=var path=M2_REPO/org/mmbase/mmbase/1.9-SNAPSHOT/mmbase-1.9-SNAPSHOT.jar sourcepath=/M2_REPO/org/mmbase/mmbase/1.9-SNAPSHOT/mmbase-1.9-SNAPSHOT.jar + classpathentry kind=var path=M2_REPO/org/mmbase/maven/maven-mmbase-plugin/1.9.2-20091118/maven-mmbase-plugin-1.9.2-20091118.jar / + classpathentry kind=var path=M2_REPO/org/mmbase/mmbase/1.9.2-20091118/mmbase-1.9.2-20091118.jar sourcepath=/M2_REPO/org/mmbase/mmbase/1.9.2-20091118/mmbase-1.9.2-20091118.jar attributes attribute name=javadoc_location value=http://www.mmbase.org/development/api/1.9/; / /attributes /classpathentry - classpathentry kind=var path=M2_REPO/org/mmbase/mmbase-cloudcontext/1.9-SNAPSHOT/mmbase-cloudcontext-1.9-SNAPSHOT-classes.jar + classpathentry kind=var path=M2_REPO/org/mmbase/mmbase-cloudcontext/1.9.2-20091118/mmbase-cloudcontext-1.9.2-20091118-classes.jar attributes attribute name=javadoc_location value=http://www.mmbase.org/development/api/1.9/; / /attributes /classpathentry - classpathentry kind=var path=M2_REPO/org/mmbase/mmbase-crontab/1.9-SNAPSHOT/mmbase-crontab-1.9-SNAPSHOT-classes.jar + classpathentry kind=var path=M2_REPO/org/mmbase/mmbase-crontab/1.9.2-20091118/mmbase-crontab-1.9.2-20091118-classes.jar attributes attribute name=javadoc_location value=http://www.mmbase.org/development/api/1.9/; / /attributes /classpathentry - classpathentry kind=var path=M2_REPO/org/mmbase/mmbase-dove/1.9-SNAPSHOT/mmbase-dove-1.9-SNAPSHOT.jar + classpathentry kind=var path=M2_REPO/org/mmbase/mmbase-dove/1.9.2-20091118/mmbase-dove-1.9.2-20091118.jar attributes attribute name=javadoc_location value=http://www.mmbase.org/development/api/1.9/; / /attributes /classpathentry - classpathentry kind=var path=M2_REPO/org/mmbase/mmbase-editwizard/1.9-SNAPSHOT/mmbase-editwizard-1.9-SNAPSHOT-classes.jar + classpathentry kind=var path=M2_REPO/org/mmbase/mmbase-editwizard/1.9.2-20091118/mmbase-editwizard-1.9.2-20091118-classes.jar attributes attribute name=javadoc_location value=http://www.mmbase.org/development/api/1.9/; / /attributes /classpathentry - classpathentry kind=var path=M2_REPO/org/mmbase/mmbase-email/1.9-SNAPSHOT/mmbase-email-1.9-SNAPSHOT-classes.jar + classpathentry kind=var path=M2_REPO/org/mmbase/mmbase-email/1.9.2-20091118/mmbase-email-1.9.2-20091118-classes.jar attributes attribute name=javadoc_location value=http://www.mmbase.org/development/api/1.9/; / /attributes /classpathentry - classpathentry kind=var path=M2_REPO/org/mmbase/mmbase-resources/1.9-SNAPSHOT/mmbase-resources-1.9-SNAPSHOT-classes.jar / - classpathentry kind=var path=M2_REPO/org/mmbase/mmbase-rmmci/1.9-SNAPSHOT/mmbase-rmmci-1.9-SNAPSHOT.jar / - classpathentry kind=var path=M2_REPO/org/mmbase/mmbase-taglib/1.9
[MMBASE SCM] r41659 - in CMSContainer: branches/b1_7 trunk
Author: fpunt Date: 2010-03-29 17:15:38 +0200 (Mon, 29 Mar 2010) New Revision: 41659 Modified: CMSContainer/branches/b1_7/.classpath CMSContainer/trunk/.classpath Log: Classpath fix Modified: CMSContainer/branches/b1_7/.classpath === --- CMSContainer/branches/b1_7/.classpath 2010-03-29 13:41:06 UTC (rev 41658) +++ CMSContainer/branches/b1_7/.classpath 2010-03-29 15:15:38 UTC (rev 41659) @@ -1,5 +1,255 @@ ?xml version=1.0 encoding=UTF-8? classpath - classpathentry kind=con path=org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5/ - classpathentry kind=output path=bin/ + classpathentry kind=src path=CMSContainer/cmsc/contentrepository/src/java/ + classpathentry kind=src path=CMSContainer/builderConverter/src/java/ + classpathentry kind=src path=CMSContainer/cmsc/edit-webapp/src/java/ + classpathentry kind=src path=CMSContainer/cmsc/maintenance/src/java/ + classpathentry kind=src path=CMSContainer/cmsc/portal/src/java/ + classpathentry kind=src path=CMSContainer/cmsc/portlets/src/java/ + classpathentry kind=src path=CMSContainer/cmsc/richtext/src/java/ + classpathentry kind=src path=CMSContainer/cmsc/richtext/src/tests/ + classpathentry kind=src path=CMSContainer/cmsc/richtext/resources/ + classpathentry kind=src path=CMSContainer/cmsc/search/src/java/ + classpathentry kind=src path=CMSContainer/cmsc/security/src/java/ + classpathentry kind=src path=CMSContainer/cmsc/servicemanagement/src/java/ + classpathentry kind=src path=CMSContainer/cmsc/sitemanagement/src/java/ + classpathentry kind=src path=CMSContainer/cmsc/taglib/src/java/ + classpathentry kind=src path=CMSContainer/cmsc/utilities/src/java/ + classpathentry kind=src path=CMSContainer/thirdparty/pager-taglib/src/java/ + classpathentry kind=src path=CMSContainer_Modules/alias/src/java/ + classpathentry kind=src path=CMSContainer_Modules/dataconversion/src/java/ + classpathentry kind=src path=CMSContainer_Modules/openofficeintegration/src/java/ + classpathentry kind=src path=CMSContainer_Modules/community/src/java/ + classpathentry kind=src path=CMSContainer_Modules/directreaction/src/java/ + classpathentry kind=src path=CMSContainer_Modules/egemmail/src/java/ + classpathentry kind=src path=CMSContainer_Modules/favorites/src/java/ + classpathentry kind=src path=CMSContainer_Modules/glossary/src/java/ + classpathentry kind=src path=CMSContainer_Modules/glossary/src/test/ + classpathentry kind=src path=CMSContainer_Modules/import-excelmenu/src/java/ + classpathentry kind=src path=CMSContainer_Modules/knownvisitor/src/java/ + classpathentry kind=src path=CMSContainer_Modules/knownvisitor-ntlm/src/java/ + classpathentry kind=src path=CMSContainer_Modules/language-redirect/src/java/ + classpathentry kind=src path=CMSContainer_Modules/linkvalidator/src/java/ + classpathentry kind=src path=CMSContainer_Modules/luceus/src/java/ + classpathentry kind=src path=CMSContainer_Modules/pagewizard/src/java/ + classpathentry kind=src path=CMSContainer_Modules/publish-cleaner/src/java/ + classpathentry kind=src path=CMSContainer_Modules/publish-remote/src/java/ + classpathentry kind=src path=CMSContainer_Modules/rating/src/java/ + classpathentry kind=src path=CMSContainer_Modules/rss/src/java/ + classpathentry kind=src path=CMSContainer_Modules/rssfeed/src/java/ + classpathentry kind=src path=CMSContainer_Modules/sitecopy/src/java/ + classpathentry kind=src path=CMSContainer_Modules/staticdownload/src/java/ + classpathentry kind=src path=CMSContainer_Modules/staticdownload/src/test/ + classpathentry kind=src path=CMSContainer_Modules/subsite/src/java/ + classpathentry kind=src path=CMSContainer_Modules/tasks/src/java/ + classpathentry kind=src path=CMSContainer_Modules/tiles/src/java/ + classpathentry kind=src path=CMSContainer_Modules/versioning/src/java/ + classpathentry kind=src path=CMSContainer_Modules/workflow/src/java/ + classpathentry kind=src path=CMSContainer_Modules/fileupload/src/java/ + classpathentry kind=src path=CMSContainer_Modules/linkvalidator/src/tests/ + classpathentry kind=src path=CMSContainer_Portlets/portlets-banner/src/java/ + classpathentry kind=src path=CMSContainer_Portlets/portlets-tagcloud/src/java/ + classpathentry kind=src path=CMSContainer_Portlets/portlets-randomcontent/src/java/ + classpathentry kind=src path=CMSContainer_Portlets/portlets-jforum/src/java/ + classpathentry kind=src path=CMSContainer_Portlets/portlets-secure/src/java/ + classpathentry kind=src path=CMSContainer_Portlets/portlets-dynamicforms/src/java
[MMBASE SCM] r41556 - CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl
Author: fpunt
Date: 2010-03-22 13:58:55 +0100 (Mon, 22 Mar 2010)
New Revision: 41556
Modified:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl/wizard-custom.xsl
Log:
CMSC-1539 Code in wrong place
Modified:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl/wizard-custom.xsl
===
---
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl/wizard-custom.xsl
2010-03-22 11:21:05 UTC (rev 41555)
+++
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl/wizard-custom.xsl
2010-03-22 12:58:55 UTC (rev 41556)
@@ -11,12 +11,4 @@
xsl:template name=extrajavascript-custom
/xsl:template
-
- xsl:template match=comma...@name=apos;pagegroupselectorapos;]
mode=listnewbuttons
-td class=listnew
- a href=#
onclick=select_fid='{../@fid}';select_did='{../comma...@name=apos;add-itemapos;]/@value}';window.open('../../../../editors/secure/selectGroup.jsp',
'pagegroupselector',
'width=350,height=500,status=yes,toolbar=no,titlebar=no,scrollbars=yes,resizable=yes,menubar=no');
class=button
-xsl:call-template name=prompt_search/
- /a
-/td
- /xsl:template
/xsl:stylesheet
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r41557 - CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl
Author: fpunt
Date: 2010-03-22 13:59:40 +0100 (Mon, 22 Mar 2010)
New Revision: 41557
Modified:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl/wizard.xsl
Log:
CMSC-1539 Code in wrong place
Modified:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl/wizard.xsl
===
---
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl/wizard.xsl
2010-03-22 12:58:55 UTC (rev 41556)
+++
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl/wizard.xsl
2010-03-22 12:59:40 UTC (rev 41557)
@@ -936,7 +936,15 @@
/td
/xsl:if
/xsl:template
-
+
+ xsl:template match=comma...@name=apos;pagegroupselectorapos;]
mode=listnewbuttons
+td class=listnew
+ a href=#
onclick=select_fid='{../@fid}';select_did='{../comma...@name=apos;add-itemapos;]/@value}';window.open('../../../../editors/secure/selectGroup.jsp',
'pagegroupselector',
'width=350,height=500,status=yes,toolbar=no,titlebar=no,scrollbars=yes,resizable=yes,menubar=no');
class=button
+xsl:call-template name=prompt_search/
+ /a
+/td
+ /xsl:template
+
xsl:template match=command mode=listnewbuttons
td class=listnewxslt template missing for command xsl:value-of
select=@name//td
/xsl:template
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r41535 - in CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community: person security
Author: fpunt
Date: 2010-03-19 11:52:26 +0100 (Fri, 19 Mar 2010)
New Revision: 41535
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonHibernateService.java
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/PersonService.java
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security/AuthenticationLDAPService.java
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security/AuthorityLDAPService.java
Log:
CMSC-1539 CAS single sing-on implementation support for creating LDAP stuff
from the portal
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonHibernateService.java
===
---
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonHibernateService.java
2010-03-19 10:23:13 UTC (rev 41534)
+++
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonHibernateService.java
2010-03-19 10:52:26 UTC (rev 41535)
@@ -95,7 +95,7 @@
* {...@inheritdoc}
*/
@Transactional
- public Person createPerson(String firstName, String infix, String lastName,
Long authenticationId,String active,Date registerDate) {
+ public Person createPerson(String firstName, String infix, String lastName,
Object authenticationId,String active,Date registerDate) {
if (firstName == null) {
throw new IllegalArgumentException(Firstname is null. );
}
@@ -110,7 +110,7 @@
person.setFirstName(firstName);
person.setInfix(infix);
person.setLastName(lastName);
- person.setAuthenticationId(authenticationId); // used to find account
+ person.setAuthenticationId((Long)authenticationId); // used to find
account
person.setActive(active);
person.setRegisterDate(registerDate);
getSession().save(person);
@@ -588,4 +588,9 @@
return null;
}
+public void setGenderByUserId(String userId, String gender) {
+ // TODO Auto-generated method stub
+
}
+
+}
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-03-19 10:23:13 UTC (rev 41534)
+++
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonLDAPService.java
2010-03-19 10:52:26 UTC (rev 41535)
@@ -5,9 +5,15 @@
import java.util.Map;
import java.util.Set;
+import javax.naming.directory.BasicAttribute;
+import javax.naming.directory.BasicAttributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
+
import org.apache.commons.lang.StringUtils;
import org.springframework.ldap.core.ContextMapper;
import org.springframework.ldap.core.DirContextOperations;
+import org.springframework.ldap.core.DistinguishedName;
import org.springframework.ldap.core.support.AbstractContextMapper;
import org.springframework.ldap.filter.AndFilter;
import org.springframework.ldap.filter.EqualsFilter;
@@ -111,11 +117,109 @@
}
public Person createPerson(String firstName, String infix, String lastName,
- Long authenticationId, String active, Date registerDate) {
- // TODO Auto-generated method stub
- return null;
+ Object authenticationId, String active, Date registerDate) {
+ String email = (String)authenticationId;
+
+ // Create a new person and store it
+ Person person = new Person();
+ person.setFirstName(firstName);
+ person.setInfix(infix);
+ person.setLastName(lastName);
+ person.setEmail(email); // used to find account
+ person.setActive(active);
+ person.setRegisterDate(registerDate);
+
+ String storeId = generateNewIdStoreId(email);
+ person.setId(new Long(storeId.substring(storeId.lastIndexOf(@)+1)));
+
+ BasicAttributes attributes = new BasicAttributes();
+
+ BasicAttribute relationClassAttribute = new
BasicAttribute(objectClass);
+ relationClassAttribute.add(RELATION_CLASS_NAME);
+ attributes.put(relationClassAttribute);
+
+ attributes.put(new BasicAttribute(nai-idStoreId, storeId));
+ if(firstName != null) {
+ attributes.put(new BasicAttribute(nai-firstname,
firstName));
+ }
+ if(infix != null
[MMBASE SCM] r41277 - CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib
Author: fpunt
Date: 2010-03-05 15:04:53 +0100 (Fri, 05 Mar 2010)
New Revision: 41277
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/ListGroupsTag.java
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/ListLDAPGroupsTag.java
Log:
CMSC-1649 The list of LDAP groups is now sorted
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/ListGroupsTag.java
===
---
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/ListGroupsTag.java
2010-03-05 12:57:41 UTC (rev 41276)
+++
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/ListGroupsTag.java
2010-03-05 14:04:53 UTC (rev 41277)
@@ -1,6 +1,9 @@
package com.finalist.cmsc.community.taglib;
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.Set;
import javax.servlet.http.HttpServletRequest;
@@ -20,7 +23,12 @@
HttpServletRequest req = (HttpServletRequest) ctx.getRequest();
AuthorityService as = getAuthorityService();
- Set String list = as.getAuthorityNames();
+ ArrayListString list = new ArrayListString(as.getAuthorityNames());
+ Collections.sort(list, new ComparatorString() {
+ public int compare(String o1, String o2) {
+ return o1.compareToIgnoreCase(o2);
+ }
+ });
if (var != null) {
if (list != null) {
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/ListLDAPGroupsTag.java
===
---
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/ListLDAPGroupsTag.java
2010-03-05 12:57:41 UTC (rev 41276)
+++
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/ListLDAPGroupsTag.java
2010-03-05 14:04:53 UTC (rev 41277)
@@ -3,6 +3,7 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Comparator;
import java.util.Set;
import javax.servlet.http.HttpServletRequest;
@@ -37,7 +38,11 @@
AuthorityService as = getAuthorityLDAPService();
ArrayListString list = new ArrayListString(as.getAuthorityNames());
- Collections.sort(list);
+ Collections.sort(list, new ComparatorString() {
+ public int compare(String o1, String o2) {
+ return o1.compareToIgnoreCase(o2);
+ }
+ });
if (var != null) {
if (list != null) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r41238 - CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets
Author: fpunt
Date: 2010-03-02 17:18:00 +0100 (Tue, 02 Mar 2010)
New Revision: 41238
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/RelatedContentPortlet.java
Log:
[CMSC-1651] Relatedcontentportlet now works with renderurl
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/RelatedContentPortlet.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/RelatedContentPortlet.java
2010-03-02 16:17:49 UTC (rev 41237)
+++
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/RelatedContentPortlet.java
2010-03-02 16:18:00 UTC (rev 41238)
@@ -32,6 +32,11 @@
*/
private static final String CONTENTURL_ELEMENTID_PATTERN =
/content/([0-9]+);
+ /**
+* This regex pattern is used to match the elementId from a renderURL.
+*/
+ private static final String RENDERURL_ELEMENTID_PATTERN = _([0-9]+);
+
@Override
protected void saveParameters(ActionRequest request, String portletId) {
setPortletParameter(portletId, RELATED_PAGE,
request.getParameter(RELATED_PAGE));
@@ -71,9 +76,11 @@
* tries to retrieve the element in the following order:
*
* ol
-* liFrom contentelement node parameter of the specified portlet/li
* liFrom a given contentURL (assumes that the elementId we want is
* exactly that elementId)/li
+* liFrom a given renderURL (assumes that the elementId we want is
+* exactly that elementId)/li
+* liFrom contentelement node parameter of the specified portlet/li
* /ol
*
* The first one to return a non codenull/code value will be returned.
@@ -88,17 +95,18 @@
* otherwise.
*/
protected String getRelatedElementId(RenderRequest request, String
relatedPage, String relatedWindow) {
- String elementId = null;
- if (StringUtils.isNotEmpty(relatedPage)
StringUtils.isNotEmpty(relatedWindow)) {
- elementId = getElementIdFromScreen(request, relatedPage,
relatedWindow);
- if (StringUtils.isEmpty(elementId)) {
-elementId = getElementIdFromContentURL(request);
- }
- }
-
+ String elementId = getElementIdFromContentURL(request);
+ if (StringUtils.isEmpty(elementId)) {
+ elementId = getElementIdFromRenderURL(request);
+ if (StringUtils.isEmpty(elementId)) {
+ if (StringUtils.isNotEmpty(relatedPage)
StringUtils.isNotEmpty(relatedWindow)) {
+ elementId = getElementIdFromScreen(request,
relatedPage, relatedWindow);
+ }
+ }
+ }
return elementId;
}
-
+
private String getElementIdFromScreen(RenderRequest req, String
relatedPage, String relatedWindow) {
Integer pageId = Integer.valueOf(relatedPage);
NavigationItem item = SiteManagement.getNavigationItem(pageId);
@@ -123,6 +131,15 @@
return null;
}
+ private String getElementIdFromRenderURL(RenderRequest req) {
+ String requestURL = getServletRequest(req).getRequestURL().toString();
+ Pattern pattern = Pattern.compile(RENDERURL_ELEMENTID_PATTERN);
+ Matcher matcher = pattern.matcher(requestURL);
+ if (matcher.find() matcher.groupCount() = 1) {
+ return matcher.group(1);
+ }
+ return null;
+ }
private HttpServletRequest getServletRequest(RenderRequest req) {
return (HttpServletRequest) ((PortletRequestImpl) req).getRequest();
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r41167 - CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/secure
Author: fpunt
Date: 2010-02-25 13:04:20 +0100 (Thu, 25 Feb 2010)
New Revision: 41167
Modified:
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/secure/selectGroup.jsp
Log:
CMSC-1649 Fixed the scrollbars in this dialog
Modified:
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/secure/selectGroup.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/secure/selectGroup.jsp
2010-02-25 09:16:49 UTC (rev 41166)
+++
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/secure/selectGroup.jsp
2010-02-25 12:04:20 UTC (rev 41167)
@@ -16,8 +16,8 @@
/div
/div
- div class=editor style=height:500px
- div class=body style=padding:10px
+ div class=editor style=height:450px;
+ div class=body style=padding:10px; width: auto;
community:useSSO var=sso /
c:choose
c:when test=${!empty param.group}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r41168 - CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib
Author: fpunt
Date: 2010-02-25 13:04:47 +0100 (Thu, 25 Feb 2010)
New Revision: 41168
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/ListLDAPGroupsTag.java
Log:
CMSC-1649 The list of LDAP groups is now sorted
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/ListLDAPGroupsTag.java
===
---
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/ListLDAPGroupsTag.java
2010-02-25 12:04:20 UTC (rev 41167)
+++
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/ListLDAPGroupsTag.java
2010-02-25 12:04:47 UTC (rev 41168)
@@ -1,6 +1,8 @@
package com.finalist.cmsc.community.taglib;
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.Set;
import javax.servlet.http.HttpServletRequest;
@@ -34,7 +36,8 @@
HttpServletRequest req = (HttpServletRequest) pctx.getRequest();
AuthorityService as = getAuthorityLDAPService();
- Set String list = as.getAuthorityNames();
+ ArrayListString list = new ArrayListString(as.getAuthorityNames());
+ Collections.sort(list);
if (var != null) {
if (list != null) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r41013 - CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/filter
Author: fpunt
Date: 2010-02-15 16:24:46 +0100 (Mon, 15 Feb 2010)
New Revision: 41013
Added:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/filter/MultiSiteTicketSamlValidationWrapperFilter.java
Log:
CMSC-1539 Implemented usage of the multi site problem, using a new filter
Added:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/filter/MultiSiteTicketSamlValidationWrapperFilter.java
===
---
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/filter/MultiSiteTicketSamlValidationWrapperFilter.java
(rev 0)
+++
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/filter/MultiSiteTicketSamlValidationWrapperFilter.java
2010-02-15 15:24:46 UTC (rev 41013)
@@ -0,0 +1,139 @@
+package com.finalist.cmsc.community.filter;
+
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import org.jasig.cas.client.util.AbstractConfigurationFilter;
+import org.jasig.cas.client.validation.Saml11TicketValidationFilter;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Usage:
+filter
+filter-nameCAS Validation Filter/filter-name
+!-- Instead of
org.jasig.cas.client.validation.Saml11TicketValidationFilter--
+
filter-classcom.finalist.cmsc.community.filter.MultiSiteTicketSamlValidationWrapperFilter/filter-class
+init-param
+ !-- Oh, maybe this has to be multi-configurable too, I don't
think so though since this does not do redirects??? --
+param-namecasServerUrlPrefix/param-name
+param-valuehttps://www.nai.nl/single-sign-on/param-value
+ /init-param
+init-param
+ !-- Search for , below for how this works --
+param-nameserverName/param-name
+
param-valuehttps://www.nai.nl,https://en.nai.nl,https://to.nai.nl/param-value
+/init-param
+init-param
+param-nameredirectAfterValidation/param-name
+param-valuetrue/param-value
+/init-param
+/filter
+
+It will also pickup serverNames from the context.xml file
+ */
+
+public class MultiSiteTicketSamlValidationWrapperFilter extends
AbstractConfigurationFilter {
+
+private MapString, Filter wrappedFilters = new HashMapString, Filter();
+
+protected static final Log log =
LogFactory.getLog(MultiSiteTicketSamlValidationWrapperFilter.class);
+
+public void destroy() {
+for (Filter wrappedFilter: wrappedFilters.values()) {
+wrappedFilter.destroy();
+}
+
+}
+
+public void doFilter(ServletRequest servletRequest, ServletResponse
servletResponse, FilterChain chain) throws IOException,
+ServletException {
+HttpServletRequest request = (HttpServletRequest) servletRequest;
+String requestURL = request.getRequestURL().toString();
+boolean filterWasFound = false;
+for (Map.EntryString, Filter wrappedFilterEntry:
wrappedFilters.entrySet()) {
+ String serverName = wrappedFilterEntry.getKey();
+if (requestURL.contains(serverName)) {
+log.debug(servername found for requestURL: +requestURL+:
+serverName);
+
+ // Woohoo, found filter, let it do all the work
+filterWasFound = true;
+wrappedFilterEntry.getValue().doFilter(servletRequest,
servletResponse, chain);
+break;
+}
+}
+if (!filterWasFound) {
+log.warn(no servername found for requestURL: +requestURL+
ignoring request);
+//FP: I think these should be bounced, because we are screwing up security
otherwise
+// Hmm, we have to do the chaining then I guess
+//chain.doFilter(servletRequest, servletResponse);
+}
+}
+
+public void init(FilterConfig filterConfig) throws ServletException {
+ // Possible improvements here:
+ // - Might as well use a special serverNames property (only one line
difference)
+ // - Would be nice to make instantiated validation filter configurable
classname
+String serverNames = getPropertyFromInitParams(filterConfig,
serverName, null);
+
+log.info(starting up with serverNames: +serverNames);
+
+ if ((serverNames != null) serverNames.length() 0) {
+// Set up a number of filters (could be just one)
+for (String serverName
[MMBASE SCM] r41016 - CMSContainer/trunk
Author: fpunt Date: 2010-02-15 16:25:25 +0100 (Mon, 15 Feb 2010) New Revision: 41016 Modified: CMSContainer/trunk/.classpath Log: Classpath for all the people using one CMSc project Modified: CMSContainer/trunk/.classpath === --- CMSContainer/trunk/.classpath 2010-02-15 15:25:16 UTC (rev 41015) +++ CMSContainer/trunk/.classpath 2010-02-15 15:25:25 UTC (rev 41016) @@ -1,5 +1,280 @@ ?xml version=1.0 encoding=UTF-8? classpath - classpathentry kind=con path=org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5/ - classpathentry kind=output path=bin/ +!-- From CORE -- + classpathentry kind=src path=CMSContainer/cmsc/contentrepository/src/java / + classpathentry kind=src path=CMSContainer/cmsc/edit-webapp/src/java / + classpathentry kind=src path=CMSContainer/cmsc/maintenance/src/java / + classpathentry kind=src path=CMSContainer/cmsc/portal/src/java / + classpathentry kind=src path=CMSContainer/cmsc/portlets/src/java / + classpathentry kind=src path=CMSContainer/cmsc/richtext/src/java / + classpathentry kind=src path=CMSContainer/cmsc/richtext/src/tests / + classpathentry kind=src path=CMSContainer/cmsc/richtext/resources / + classpathentry kind=src path=CMSContainer/cmsc/search/src/java / + classpathentry kind=src path=CMSContainer/cmsc/security/src/java / + classpathentry kind=src path=CMSContainer/cmsc/servicemanagement/src/java / + classpathentry kind=src path=CMSContainer/cmsc/sitemanagement/src/java / + classpathentry kind=src path=CMSContainer/cmsc/taglib/src/java / + classpathentry kind=src path=CMSContainer/cmsc/utilities/src/java / + classpathentry kind=src path=CMSContainer/thirdparty/pager-taglib/src/java / + +!-- From MODULES -- + + classpathentry kind=src path=CMSContainer_Modules/alias/src/java/ + classpathentry kind=src path=CMSContainer_Modules/dataconversion/src/java/ + classpathentry kind=src path=CMSContainer_Modules/openofficeintegration/src/java/ + classpathentry kind=src path=CMSContainer_Modules/community/src/java/ + classpathentry kind=src path=CMSContainer_Modules/directreaction/src/java/ + classpathentry kind=src path=CMSContainer_Modules/egemmail/src/java/ + classpathentry kind=src path=CMSContainer_Modules/favorites/src/java/ + classpathentry kind=src path=CMSContainer_Modules/glossary/src/java/ + classpathentry kind=src path=CMSContainer_Modules/glossary/src/test/ + classpathentry kind=src path=CMSContainer_Modules/import-excelmenu/src/java/ + classpathentry kind=src path=CMSContainer_Modules/knownvisitor/src/java/ + classpathentry kind=src path=CMSContainer_Modules/knownvisitor-ntlm/src/java/ + classpathentry kind=src path=CMSContainer_Modules/language-redirect/src/java/ + classpathentry kind=src path=CMSContainer_Modules/linkvalidator/src/java/ + classpathentry kind=src path=CMSContainer_Modules/luceus/src/java/ + classpathentry kind=src path=CMSContainer_Modules/pagewizard/src/java/ + classpathentry kind=src path=CMSContainer_Modules/publish-cleaner/src/java/ + classpathentry kind=src path=CMSContainer_Modules/publish-remote/src/java/ + classpathentry kind=src path=CMSContainer_Modules/rating/src/java/ + classpathentry kind=src path=CMSContainer_Modules/rss/src/java/ + classpathentry kind=src path=CMSContainer_Modules/rssfeed/src/java/ + classpathentry kind=src path=CMSContainer_Modules/sitecopy/src/java/ + classpathentry kind=src path=CMSContainer_Modules/staticdownload/src/java/ + classpathentry kind=src path=CMSContainer_Modules/staticdownload/src/test/ + classpathentry kind=src path=CMSContainer_Modules/subsite/src/java/ + classpathentry kind=src path=CMSContainer_Modules/tasks/src/java/ + classpathentry kind=src path=CMSContainer_Modules/tiles/src/java/ + classpathentry kind=src path=CMSContainer_Modules/versioning/src/java/ + classpathentry kind=src path=CMSContainer_Modules/workflow/src/java/ + classpathentry kind=src path=CMSContainer_Modules/fileupload/src/java/ + classpathentry kind=src path=CMSContainer_Modules/linkvalidator/src/tests/ + +!-- From PORTLETS -- + + classpathentry kind=src path=CMSContainer_Portlets/portlets-banner/src/java/ + classpathentry kind=src path=CMSContainer_Portlets/portlets-tagcloud/src/java/ + classpathentry kind=src path=CMSContainer_Portlets/portlets-randomcontent/src/java/ + classpathentry kind=src path=CMSContainer_Portlets/portlets-jforum/src/java/ + classpathentry kind=src path=CMSContainer_Portlets/portlets-secure/src/java/ + classpathentry kind=src path=CMSContainer_Portlets/portlets-dynamicforms/src/java/ + classpathentry kind=src path=CMSContainer_Portlets/portlets-dynamicforms2
[MMBASE SCM] r40693 - CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
Author: fpunt
Date: 2010-01-22 14:08:26 +0100 (Fri, 22 Jan 2010)
New Revision: 40693
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
Log:
CMSC-1627 Content type was hardcoded in contentsearch.jsp
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
===
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
2010-01-22 13:00:10 UTC (rev 40692)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
2010-01-22 13:08:26 UTC (rev 40693)
@@ -4,7 +4,8 @@
%%...@page import=com.finalist.cmsc.repository.ContentElementUtil,
com.finalist.cmsc.repository.RepositoryUtil
%%@ page import=com.finalist.cmsc.security.UserRole
-%%@ page import=com.finalist.cmsc.security.SecurityUtil
+%%@ page import=com.finalist.cmsc.security.SecurityUtil
+%%@ page import=net.sf.mmapps.modules.cloudprovider.CloudProviderFactory
%mm:content type=text/html encoding=UTF-8 expires=0
!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Strict//EN
http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd;
html:html xhtml=true
@@ -137,6 +138,14 @@
c:if test=${not empty onlytype}
html:hidden property=contenttypes /
input type=hidden style=width:145px
value=${onlytype} name=onlytype /Article
+ c:choose
+c:when test=${onlytype !=
'contentelement'}
+
%=CloudProviderFactory.getCloudProvider().getCloud().getNodeManager((String)request.getAttribute(onlytype)).getGUIName(NodeManager.GUI_SINGULAR,
request.getLocale())%
+/c:when
+c:otherwise
+fmt:message
key=searchform.contenttypes.all /
+/c:otherwise
+ /c:choose
/c:if
c:if test=${empty onlytype}
html:select style=width:145px
property=contenttypes onchange=selectContenttype('${searchinit}');
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40694 - in CMSContainer: branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
Author: fpunt
Date: 2010-01-22 14:18:21 +0100 (Fri, 22 Jan 2010)
New Revision: 40694
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
Log:
CMSC-1627 Content type was hardcoded in contentsearch.jsp
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
===
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
2010-01-22 13:08:26 UTC (rev 40693)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
2010-01-22 13:18:21 UTC (rev 40694)
@@ -137,7 +137,7 @@
td nowrap
c:if test=${not empty onlytype}
html:hidden property=contenttypes /
- input type=hidden style=width:145px
value=${onlytype} name=onlytype /Article
+ input type=hidden style=width:145px
value=${onlytype} name=onlytype /
c:choose
c:when test=${onlytype !=
'contentelement'}
%=CloudProviderFactory.getCloudProvider().getCloud().getNodeManager((String)request.getAttribute(onlytype)).getGUIName(NodeManager.GUI_SINGULAR,
request.getLocale())%
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
2010-01-22 13:08:26 UTC (rev 40693)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
2010-01-22 13:18:21 UTC (rev 40694)
@@ -5,6 +5,7 @@
com.finalist.cmsc.repository.RepositoryUtil
%%@ page import=com.finalist.cmsc.security.UserRole
%%@ page import=com.finalist.cmsc.security.SecurityUtil
+%%@ page import=net.sf.mmapps.modules.cloudprovider.CloudProviderFactory
%mm:content type=text/html encoding=UTF-8 expires=0
!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Strict//EN
http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd;
html:html xhtml=true
@@ -136,7 +137,15 @@
td nowrap
c:if test=${not empty onlytype}
html:hidden property=contenttypes /
- input type=hidden style=width:145px
value=${onlytype} name=onlytype /Article
+ input type=hidden style=width:145px
value=${onlytype} name=onlytype /
+c:choose
+c:when test=${onlytype !=
'contentelement'}
+
%=CloudProviderFactory.getCloudProvider().getCloud().getNodeManager((String)request.getAttribute(onlytype)).getGUIName(NodeManager.GUI_SINGULAR,
request.getLocale())%
+/c:when
+c:otherwise
+fmt:message
key=searchform.contenttypes.all /
+/c:otherwise
+ /c:choose
/c:if
c:if test=${empty onlytype}
html:select style=width:145px
property=contenttypes onchange=selectContenttype('${searchinit}');
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40417 - in CMSContainer/branches/b1_5: CMSContainer/maven-base CMSContainer_Demo/demo.cmscontainer.org/maven-base CMSContainer_Demo/i18n-demo/maven-base CMSContainer_Modules/maven-base C
Author: fpunt Date: 2010-01-08 10:25:22 +0100 (Fri, 08 Jan 2010) New Revision: 40417 Modified: CMSContainer/branches/b1_5/CMSContainer/maven-base/project.properties CMSContainer/branches/b1_5/CMSContainer_Demo/demo.cmscontainer.org/maven-base/project.properties CMSContainer/branches/b1_5/CMSContainer_Demo/i18n-demo/maven-base/project.properties CMSContainer/branches/b1_5/CMSContainer_Modules/maven-base/project.properties CMSContainer/branches/b1_5/CMSContainer_Portlets/maven-base/project.properties CMSContainer/branches/b1_5/CMSContainer_Templates/double/maven-base/project.properties CMSContainer/branches/b1_5/CMSContainer_Templates/single/maven-base/project.properties Log: Released version 1.5.14 Modified: CMSContainer/branches/b1_5/CMSContainer/maven-base/project.properties === --- CMSContainer/branches/b1_5/CMSContainer/maven-base/project.properties 2010-01-08 07:44:40 UTC (rev 40416) +++ CMSContainer/branches/b1_5/CMSContainer/maven-base/project.properties 2010-01-08 09:25:22 UTC (rev 40417) @@ -7,7 +7,7 @@ maven.multiproject.type=mmbase-module -cmsc.version=1.5.14-SNAPSHOT +cmsc.version=1.5.14 mmbase.version=1.8.7-20090803 # maven build does not yet generate a rmmci. Did not create one by hand Modified: CMSContainer/branches/b1_5/CMSContainer_Demo/demo.cmscontainer.org/maven-base/project.properties === --- CMSContainer/branches/b1_5/CMSContainer_Demo/demo.cmscontainer.org/maven-base/project.properties 2010-01-08 07:44:40 UTC (rev 40416) +++ CMSContainer/branches/b1_5/CMSContainer_Demo/demo.cmscontainer.org/maven-base/project.properties 2010-01-08 09:25:22 UTC (rev 40417) @@ -5,11 +5,11 @@ # See http://www.MMBase.org/license # -application.version=1.5.14-SNAPSHOT +application.version=1.5.14 -cmsc.version=1.5.14-SNAPSHOT -cmscportlets.version=1.5.14-SNAPSHOT -cmscmodules.version=1.5.14-SNAPSHOT +cmsc.version=1.5.14 +cmscportlets.version=1.5.14 +cmscmodules.version=1.5.14 mmbase.version=1.8.7-20090803 # maven build does not yet generate a rmmci. Did not create one by hand Modified: CMSContainer/branches/b1_5/CMSContainer_Demo/i18n-demo/maven-base/project.properties === --- CMSContainer/branches/b1_5/CMSContainer_Demo/i18n-demo/maven-base/project.properties 2010-01-08 07:44:40 UTC (rev 40416) +++ CMSContainer/branches/b1_5/CMSContainer_Demo/i18n-demo/maven-base/project.properties 2010-01-08 09:25:22 UTC (rev 40417) @@ -5,11 +5,11 @@ # See http://www.MMBase.org/license # -application.version=1.5.14-SNAPSHOT +application.version=1.5.14 -cmsc.version=1.5.14-SNAPSHOT -cmscportlets.version=1.5.14-SNAPSHOT -cmscmodules.version=1.5.14-SNAPSHOT +cmsc.version=1.5.14 +cmscportlets.version=1.5.14 +cmscmodules.version=1.5.14 mmbase.version=1.8.7-20090803 # maven build does not yet generate a rmmci. Did not create one by hand Modified: CMSContainer/branches/b1_5/CMSContainer_Modules/maven-base/project.properties === --- CMSContainer/branches/b1_5/CMSContainer_Modules/maven-base/project.properties 2010-01-08 07:44:40 UTC (rev 40416) +++ CMSContainer/branches/b1_5/CMSContainer_Modules/maven-base/project.properties 2010-01-08 09:25:22 UTC (rev 40417) @@ -7,8 +7,8 @@ maven.multiproject.type=mmbase-module -cmscmodules.version=1.5.14-SNAPSHOT -cmsc.version=1.5.14-SNAPSHOT +cmscmodules.version=1.5.14 +cmsc.version=1.5.14 mmbase.version=1.8.7-20090803 # maven build does not yet generate a rmmci. Did not create one by hand Modified: CMSContainer/branches/b1_5/CMSContainer_Portlets/maven-base/project.properties === --- CMSContainer/branches/b1_5/CMSContainer_Portlets/maven-base/project.properties 2010-01-08 07:44:40 UTC (rev 40416) +++ CMSContainer/branches/b1_5/CMSContainer_Portlets/maven-base/project.properties 2010-01-08 09:25:22 UTC (rev 40417) @@ -7,8 +7,8 @@ maven.multiproject.type=mmbase-module -cmscportlets.version=1.5.14-SNAPSHOT -cmsc.version=1.5.14-SNAPSHOT +cmscportlets.version=1.5.14 +cmsc.version=1.5.14 mmbase.version=1.8.7-20090803 Modified: CMSContainer/branches/b1_5/CMSContainer_Templates/double/maven-base/project.properties === --- CMSContainer/branches/b1_5/CMSContainer_Templates/double/maven-base/project.properties 2010-01-08 07:44:40 UTC (rev 40416) +++ CMSContainer/branches/b1_5/CMSContainer_Templates/double/maven-base/project.properties 2010-01-08 09:25:22 UTC (rev 40417) @@ -7,10 +7,10 @@ application.version=1.0-SNAPSHOT -cmsc.version=1.5.13 +cmsc.version=1.5.14 -cmscportlets.version=1.5.13 -cmscmodules.version=1.5.13 +cmscportlets.version=1.5.14
[MMBASE SCM] r40418 - CMSContainer/tags
Author: fpunt Date: 2010-01-08 10:26:55 +0100 (Fri, 08 Jan 2010) New Revision: 40418 Added: CMSContainer/tags/v1_12_1/ Log: Released version 1.5.14 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40419 - in CMSContainer/tags/v1_12_1: . CMSContainer_Demo-1_5/demo.cmscontainer.org/maven-base CMSContainer_Demo-1_5/i18n-demo/maven-base
Author: fpunt
Date: 2010-01-08 10:27:00 +0100 (Fri, 08 Jan 2010)
New Revision: 40419
Added:
CMSContainer/tags/v1_12_1/CMSContainer_Demo-1_5/
CMSContainer/tags/v1_12_1/CMSContainer_Demo-1_5/demo.cmscontainer.org/maven-base/project.properties
CMSContainer/tags/v1_12_1/CMSContainer_Demo-1_5/i18n-demo/maven-base/project.properties
Removed:
CMSContainer/tags/v1_12_1/CMSContainer_Demo-1_5/demo.cmscontainer.org/maven-base/project.properties
CMSContainer/tags/v1_12_1/CMSContainer_Demo-1_5/i18n-demo/maven-base/project.properties
Log:
Released version 1.5.14
Copied: CMSContainer/tags/v1_12_1/CMSContainer_Demo-1_5 (from rev 40401,
CMSContainer/branches/b1_5/CMSContainer_Demo)
Deleted:
CMSContainer/tags/v1_12_1/CMSContainer_Demo-1_5/demo.cmscontainer.org/maven-base/project.properties
===
---
CMSContainer/branches/b1_5/CMSContainer_Demo/demo.cmscontainer.org/maven-base/project.properties
2010-01-07 15:56:19 UTC (rev 40401)
+++
CMSContainer/tags/v1_12_1/CMSContainer_Demo-1_5/demo.cmscontainer.org/maven-base/project.properties
2010-01-08 09:27:00 UTC (rev 40419)
@@ -1,78 +0,0 @@
-# This software is OSI Certified Open Source Software.
-# OSI Certified is a certification mark of the Open Source Initiative.
-#
-# The license (Mozilla version 1.0) can be read at the MMBase site.
-# See http://www.MMBase.org/license
-#
-
-application.version=1.5.14-SNAPSHOT
-
-cmsc.version=1.5.14-SNAPSHOT
-cmscportlets.version=1.5.14-SNAPSHOT
-cmscmodules.version=1.5.14-SNAPSHOT
-mmbase.version=1.8.7-20090803
-
-# maven build does not yet generate a rmmci. Did not create one by hand
-mmbasermmci.version=1.8.2-20061020
-pluto.version=1.0.1
-
-maven.multiproject.type=mmbase-module
-
-# Specifies the version of the jdk in use.
-maven.compile.source=1.5
-maven.compile.target=1.5
-# See the ant javadoc task documentation for details.
-maven.javadoc.source=1.5
-
-# Runs the compiler in a separate process
-# Corresponds to the fork attribute for the ant javac task.
-maven.compile.fork=true
-
-# When using Java 1.4, it may be necessary to fork the JUnit tests to prevent
XML parser issues.
-maven.junit.fork=true
-# Skip test classes. Don't compile and run the tests
-maven.test.skip=false
-# Set this to true to ignore a failure during testing.
-maven.test.failure.ignore=true
-# Adds system properties to the JVM executing the unit tests
-# user.language and user.region are required for the locator
-maven.junit.sysproperties=
-maven.junit.jvmargs=-Dmmbase.config=${basedir}/src/tests/config
-
-# Tell CVS to be quiet when doing updates.
-maven.scm.cvs.quiet=true
-
-# Allows the user to show the site generation date on the generated website.
-# One can place the date in 5 locations with maven.xdoc.date:
-#* left : on the left side of the breadcrumbs
-#* right : on the right side of the breadcrumbs, before the links
-#* navigation-top : above the user links, in the navigation menu
-#* navigation-bottom : under Maven's links, in the navigation menu
-#* bottom : after the organization name, in the footer
-maven.xdoc.date=left
-maven.xdoc.date.format = dd HH:mm z
-maven.xdoc.version = ${pom.currentVersion}
-
-# Specifies what predefined check set to use.
-# Available sets are sun (for the Sun coding conventions), turbine and
avalon.
-#maven.checkstyle.format=turbine
-maven.checkstyle.properties=${basedir}/../maven-base/checkstyle-mmbase.xml
-maven.checkstyle.header.file=${basedir}/../maven-base/LICENSE.txt
-maven.license.licenseFile=${basedir}/../maven-base/MPL10.txt
-
-#By default we don't bundle dependency jars into wars
-war.bundle=false
-
-maven.javadoc.links=http://java.sun.com/j2se/1.5.0/docs/api/
-
-maven.mmbasemodule.templates=${maven.mmbasemodule.src}/src/webapp
-
-# xdoclet general props
-maven.xdoclet.webdoclet.verbose=true
-maven.xdoclet.webdoclet.force=true
-
-# define the files to use
-maven.xdoclet.webdoclet.fileset.0=true
-maven.xdoclet.webdoclet.fileset.0.include=**/*.java
-maven.xdoclet.webdoclet.jsptaglib.0=false
-maven.xdoclet.webdoclet.destDir=${maven.build.dir}
\ No newline at end of file
Copied:
CMSContainer/tags/v1_12_1/CMSContainer_Demo-1_5/demo.cmscontainer.org/maven-base/project.properties
(from rev 40417,
CMSContainer/branches/b1_5/CMSContainer_Demo/demo.cmscontainer.org/maven-base/project.properties)
===
---
CMSContainer/tags/v1_12_1/CMSContainer_Demo-1_5/demo.cmscontainer.org/maven-base/project.properties
(rev 0)
+++
CMSContainer/tags/v1_12_1/CMSContainer_Demo-1_5/demo.cmscontainer.org/maven-base/project.properties
2010-01-08 09:27:00 UTC (rev 40419)
@@ -0,0 +1,78 @@
+# This software is OSI Certified Open Source Software.
+# OSI Certified is a certification mark of the Open Source Initiative.
+#
+# The license (Mozilla version 1.0) can be read at the MMBase site.
+# See http://www.MMBase.org
[MMBASE SCM] r40420 - in CMSContainer/tags/v1_12_1: . CMSContainer_Modules-1_5/maven-base
Author: fpunt
Date: 2010-01-08 10:27:07 +0100 (Fri, 08 Jan 2010)
New Revision: 40420
Added:
CMSContainer/tags/v1_12_1/CMSContainer_Modules-1_5/
CMSContainer/tags/v1_12_1/CMSContainer_Modules-1_5/maven-base/project.properties
Removed:
CMSContainer/tags/v1_12_1/CMSContainer_Modules-1_5/maven-base/project.properties
Log:
Released version 1.5.14
Copied: CMSContainer/tags/v1_12_1/CMSContainer_Modules-1_5 (from rev 40401,
CMSContainer/branches/b1_5/CMSContainer_Modules)
Deleted:
CMSContainer/tags/v1_12_1/CMSContainer_Modules-1_5/maven-base/project.properties
===
---
CMSContainer/branches/b1_5/CMSContainer_Modules/maven-base/project.properties
2010-01-07 15:56:19 UTC (rev 40401)
+++
CMSContainer/tags/v1_12_1/CMSContainer_Modules-1_5/maven-base/project.properties
2010-01-08 09:27:07 UTC (rev 40420)
@@ -1,76 +0,0 @@
-# This software is OSI Certified Open Source Software.
-# OSI Certified is a certification mark of the Open Source Initiative.
-#
-# The license (Mozilla version 1.0) can be read at the MMBase site.
-# See http://www.MMBase.org/license
-#
-
-maven.multiproject.type=mmbase-module
-
-cmscmodules.version=1.5.14-SNAPSHOT
-cmsc.version=1.5.14-SNAPSHOT
-mmbase.version=1.8.7-20090803
-
-# maven build does not yet generate a rmmci. Did not create one by hand
-mmbasermmci.version=1.8.2-20061020
-pluto.version=1.0.1
-luceus.version=0.42
-
-# Specifies the version of the jdk in use.
-maven.compile.source=1.5
-maven.compile.target=1.5
-# See the ant javadoc task documentation for details.
-maven.javadoc.source=1.5
-
-# Runs the compiler in a separate process
-# Corresponds to the fork attribute for the ant javac task.
-maven.compile.fork=true
-
-# When using Java 1.4, it may be necessary to fork the JUnit tests to prevent
XML parser issues.
-maven.junit.fork=true
-# Skip test classes. Don't compile and run the tests
-maven.test.skip=false
-# Set this to true to ignore a failure during testing.
-maven.test.failure.ignore=true
-# Adds system properties to the JVM executing the unit tests
-# user.language and user.region are required for the locator
-maven.junit.sysproperties=
-maven.junit.jvmargs=-Dmmbase.config=${basedir}/src/tests/config
-
-# Tell CVS to be quiet when doing updates.
-maven.scm.cvs.quiet=true
-
-# Allows the user to show the site generation date on the generated website.
-# One can place the date in 5 locations with maven.xdoc.date:
-#* left : on the left side of the breadcrumbs
-#* right : on the right side of the breadcrumbs, before the links
-#* navigation-top : above the user links, in the navigation menu
-#* navigation-bottom : under Maven's links, in the navigation menu
-#* bottom : after the organization name, in the footer
-maven.xdoc.date=left
-maven.xdoc.date.format = dd HH:mm z
-maven.xdoc.version = ${pom.currentVersion}
-
-# Specifies what predefined check set to use.
-# Available sets are sun (for the Sun coding conventions), turbine and
avalon.
-#maven.checkstyle.format=turbine
-maven.checkstyle.properties=${basedir}/../maven-base/checkstyle-mmbase.xml
-maven.checkstyle.header.file=${basedir}/../maven-base/LICENSE.txt
-maven.license.licenseFile=${basedir}/../maven-base/MPL10.txt
-
-#By default we don't bundle dependency jars into wars
-war.bundle=false
-
-maven.javadoc.links=http://java.sun.com/j2se/1.5.0/docs/api/
-
-maven.mmbasemodule.templates=${maven.mmbasemodule.src}/src/webapp
-
-# xdoclet general props
-maven.xdoclet.webdoclet.verbose=true
-maven.xdoclet.webdoclet.force=true
-
-# define the files to use
-maven.xdoclet.webdoclet.fileset.0=true
-maven.xdoclet.webdoclet.fileset.0.include=**/*.java
-maven.xdoclet.webdoclet.jsptaglib.0=false
-maven.xdoclet.webdoclet.destDir=${maven.build.dir}
Copied:
CMSContainer/tags/v1_12_1/CMSContainer_Modules-1_5/maven-base/project.properties
(from rev 40417,
CMSContainer/branches/b1_5/CMSContainer_Modules/maven-base/project.properties)
===
---
CMSContainer/tags/v1_12_1/CMSContainer_Modules-1_5/maven-base/project.properties
(rev 0)
+++
CMSContainer/tags/v1_12_1/CMSContainer_Modules-1_5/maven-base/project.properties
2010-01-08 09:27:07 UTC (rev 40420)
@@ -0,0 +1,76 @@
+# This software is OSI Certified Open Source Software.
+# OSI Certified is a certification mark of the Open Source Initiative.
+#
+# The license (Mozilla version 1.0) can be read at the MMBase site.
+# See http://www.MMBase.org/license
+#
+
+maven.multiproject.type=mmbase-module
+
+cmscmodules.version=1.5.14
+cmsc.version=1.5.14
+mmbase.version=1.8.7-20090803
+
+# maven build does not yet generate a rmmci. Did not create one by hand
+mmbasermmci.version=1.8.2-20061020
+pluto.version=1.0.1
+luceus.version=0.42
+
+# Specifies the version of the jdk in use.
+maven.compile.source=1.5
+maven.compile.target=1.5
+# See the ant javadoc task
[MMBASE SCM] r40421 - in CMSContainer/tags/v1_12_1: . CMSContainer_Portlets-1_5/maven-base
Author: fpunt
Date: 2010-01-08 10:27:14 +0100 (Fri, 08 Jan 2010)
New Revision: 40421
Added:
CMSContainer/tags/v1_12_1/CMSContainer_Portlets-1_5/
CMSContainer/tags/v1_12_1/CMSContainer_Portlets-1_5/maven-base/project.properties
Removed:
CMSContainer/tags/v1_12_1/CMSContainer_Portlets-1_5/maven-base/project.properties
Log:
Released version 1.5.14
Copied: CMSContainer/tags/v1_12_1/CMSContainer_Portlets-1_5 (from rev 40401,
CMSContainer/branches/b1_5/CMSContainer_Portlets)
Deleted:
CMSContainer/tags/v1_12_1/CMSContainer_Portlets-1_5/maven-base/project.properties
===
---
CMSContainer/branches/b1_5/CMSContainer_Portlets/maven-base/project.properties
2010-01-07 15:56:19 UTC (rev 40401)
+++
CMSContainer/tags/v1_12_1/CMSContainer_Portlets-1_5/maven-base/project.properties
2010-01-08 09:27:14 UTC (rev 40421)
@@ -1,77 +0,0 @@
-# This software is OSI Certified Open Source Software.
-# OSI Certified is a certification mark of the Open Source Initiative.
-#
-# The license (Mozilla version 1.0) can be read at the MMBase site.
-# See http://www.MMBase.org/license
-#
-
-maven.multiproject.type=mmbase-module
-
-cmscportlets.version=1.5.14-SNAPSHOT
-cmsc.version=1.5.14-SNAPSHOT
-
-mmbase.version=1.8.7-20090803
-
-# maven build does not yet generate a rmmci. Did not create one by hand
-mmbasermmci.version=1.8.2-20061020
-pluto.version=1.0.1
-
-
-# Specifies the version of the jdk in use.
-maven.compile.source=1.5
-maven.compile.target=1.5
-# See the ant javadoc task documentation for details.
-maven.javadoc.source=1.5
-
-# Runs the compiler in a separate process
-# Corresponds to the fork attribute for the ant javac task.
-maven.compile.fork=true
-
-# When using Java 1.4, it may be necessary to fork the JUnit tests to prevent
XML parser issues.
-maven.junit.fork=true
-# Skip test classes. Don't compile and run the tests
-maven.test.skip=false
-# Set this to true to ignore a failure during testing.
-maven.test.failure.ignore=true
-# Adds system properties to the JVM executing the unit tests
-# user.language and user.region are required for the locator
-maven.junit.sysproperties=
-maven.junit.jvmargs=-Dmmbase.config=${basedir}/src/tests/config
-
-# Tell CVS to be quiet when doing updates.
-maven.scm.cvs.quiet=true
-
-# Allows the user to show the site generation date on the generated website.
-# One can place the date in 5 locations with maven.xdoc.date:
-#* left : on the left side of the breadcrumbs
-#* right : on the right side of the breadcrumbs, before the links
-#* navigation-top : above the user links, in the navigation menu
-#* navigation-bottom : under Maven's links, in the navigation menu
-#* bottom : after the organization name, in the footer
-maven.xdoc.date=left
-maven.xdoc.date.format = dd HH:mm z
-maven.xdoc.version = ${pom.currentVersion}
-
-# Specifies what predefined check set to use.
-# Available sets are sun (for the Sun coding conventions), turbine and
avalon.
-#maven.checkstyle.format=turbine
-maven.checkstyle.properties=${basedir}/../maven-base/checkstyle-mmbase.xml
-maven.checkstyle.header.file=${basedir}/../maven-base/LICENSE.txt
-maven.license.licenseFile=${basedir}/../maven-base/MPL10.txt
-
-#By default we don't bundle dependency jars into wars
-war.bundle=false
-
-maven.javadoc.links=http://java.sun.com/j2se/1.5.0/docs/api/
-
-maven.mmbasemodule.templates=${maven.mmbasemodule.src}/src/webapp
-
-# xdoclet general props
-maven.xdoclet.webdoclet.verbose=true
-maven.xdoclet.webdoclet.force=true
-
-# define the files to use
-maven.xdoclet.webdoclet.fileset.0=true
-maven.xdoclet.webdoclet.fileset.0.include=**/*.java
-maven.xdoclet.webdoclet.jsptaglib.0=false
-maven.xdoclet.webdoclet.destDir=${maven.build.dir}
Copied:
CMSContainer/tags/v1_12_1/CMSContainer_Portlets-1_5/maven-base/project.properties
(from rev 40417,
CMSContainer/branches/b1_5/CMSContainer_Portlets/maven-base/project.properties)
===
---
CMSContainer/tags/v1_12_1/CMSContainer_Portlets-1_5/maven-base/project.properties
(rev 0)
+++
CMSContainer/tags/v1_12_1/CMSContainer_Portlets-1_5/maven-base/project.properties
2010-01-08 09:27:14 UTC (rev 40421)
@@ -0,0 +1,77 @@
+# This software is OSI Certified Open Source Software.
+# OSI Certified is a certification mark of the Open Source Initiative.
+#
+# The license (Mozilla version 1.0) can be read at the MMBase site.
+# See http://www.MMBase.org/license
+#
+
+maven.multiproject.type=mmbase-module
+
+cmscportlets.version=1.5.14
+cmsc.version=1.5.14
+
+mmbase.version=1.8.7-20090803
+
+# maven build does not yet generate a rmmci. Did not create one by hand
+mmbasermmci.version=1.8.2-20061020
+pluto.version=1.0.1
+
+
+# Specifies the version of the jdk in use.
+maven.compile.source=1.5
+maven.compile.target=1.5
+# See the ant javadoc task documentation for details
[MMBASE SCM] r40422 - in CMSContainer/tags/v1_12_1: . CMSContainer_Templates-1_5/double/maven-base CMSContainer_Templates-1_5/single/maven-base
Author: fpunt
Date: 2010-01-08 10:27:19 +0100 (Fri, 08 Jan 2010)
New Revision: 40422
Added:
CMSContainer/tags/v1_12_1/CMSContainer_Templates-1_5/
CMSContainer/tags/v1_12_1/CMSContainer_Templates-1_5/double/maven-base/project.properties
CMSContainer/tags/v1_12_1/CMSContainer_Templates-1_5/single/maven-base/project.properties
Removed:
CMSContainer/tags/v1_12_1/CMSContainer_Templates-1_5/double/maven-base/project.properties
CMSContainer/tags/v1_12_1/CMSContainer_Templates-1_5/single/maven-base/project.properties
Log:
Released version 1.5.14
Copied: CMSContainer/tags/v1_12_1/CMSContainer_Templates-1_5 (from rev 40401,
CMSContainer/branches/b1_5/CMSContainer_Templates)
Deleted:
CMSContainer/tags/v1_12_1/CMSContainer_Templates-1_5/double/maven-base/project.properties
===
---
CMSContainer/branches/b1_5/CMSContainer_Templates/double/maven-base/project.properties
2010-01-07 15:56:19 UTC (rev 40401)
+++
CMSContainer/tags/v1_12_1/CMSContainer_Templates-1_5/double/maven-base/project.properties
2010-01-08 09:27:19 UTC (rev 40422)
@@ -1,79 +0,0 @@
-# This software is OSI Certified Open Source Software.
-# OSI Certified is a certification mark of the Open Source Initiative.
-#
-# The license (Mozilla version 1.0) can be read at the MMBase site.
-# See http://www.MMBase.org/license
-#
-
-application.version=1.0-SNAPSHOT
-
-cmsc.version=1.5.13
-
-cmscportlets.version=1.5.13
-cmscmodules.version=1.5.13
-mmbase.version=1.8.7-20090803
-
-# maven build does not yet generate a rmmci. Did not create one by hand
-mmbasermmci.version=1.8.2-20061020
-pluto.version=1.0.1
-
-maven.multiproject.type=mmbase-module
-
-# Specifies the version of the jdk in use.
-maven.compile.source=1.5
-maven.compile.target=1.5
-# See the ant javadoc task documentation for details.
-maven.javadoc.source=1.5
-
-# Runs the compiler in a separate process
-# Corresponds to the fork attribute for the ant javac task.
-maven.compile.fork=true
-
-# When using Java 1.4, it may be necessary to fork the JUnit tests to prevent
XML parser issues.
-maven.junit.fork=true
-# Skip test classes. Don't compile and run the tests
-maven.test.skip=false
-# Set this to true to ignore a failure during testing.
-maven.test.failure.ignore=true
-# Adds system properties to the JVM executing the unit tests
-# user.language and user.region are required for the locator
-maven.junit.sysproperties=
-maven.junit.jvmargs=-Dmmbase.config=${basedir}/src/tests/config
-
-# Tell CVS to be quiet when doing updates.
-maven.scm.cvs.quiet=true
-
-# Allows the user to show the site generation date on the generated website.
-# One can place the date in 5 locations with maven.xdoc.date:
-#* left : on the left side of the breadcrumbs
-#* right : on the right side of the breadcrumbs, before the links
-#* navigation-top : above the user links, in the navigation menu
-#* navigation-bottom : under Maven's links, in the navigation menu
-#* bottom : after the organization name, in the footer
-maven.xdoc.date=left
-maven.xdoc.date.format = dd HH:mm z
-maven.xdoc.version = ${pom.currentVersion}
-
-# Specifies what predefined check set to use.
-# Available sets are sun (for the Sun coding conventions), turbine and
avalon.
-#maven.checkstyle.format=turbine
-maven.checkstyle.properties=${basedir}/../maven-base/checkstyle-mmbase.xml
-maven.checkstyle.header.file=${basedir}/../maven-base/LICENSE.txt
-maven.license.licenseFile=${basedir}/../maven-base/MPL10.txt
-
-#By default we don't bundle dependency jars into wars
-war.bundle=false
-
-maven.javadoc.links=http://java.sun.com/j2se/1.5.0/docs/api/
-
-maven.mmbasemodule.templates=${maven.mmbasemodule.src}/src/webapp
-
-# xdoclet general props
-maven.xdoclet.webdoclet.verbose=true
-maven.xdoclet.webdoclet.force=true
-
-# define the files to use
-maven.xdoclet.webdoclet.fileset.0=true
-maven.xdoclet.webdoclet.fileset.0.include=**/*.java
-maven.xdoclet.webdoclet.jsptaglib.0=false
-maven.xdoclet.webdoclet.destDir=${maven.build.dir}
\ No newline at end of file
Copied:
CMSContainer/tags/v1_12_1/CMSContainer_Templates-1_5/double/maven-base/project.properties
(from rev 40417,
CMSContainer/branches/b1_5/CMSContainer_Templates/double/maven-base/project.properties)
===
---
CMSContainer/tags/v1_12_1/CMSContainer_Templates-1_5/double/maven-base/project.properties
(rev 0)
+++
CMSContainer/tags/v1_12_1/CMSContainer_Templates-1_5/double/maven-base/project.properties
2010-01-08 09:27:19 UTC (rev 40422)
@@ -0,0 +1,79 @@
+# This software is OSI Certified Open Source Software.
+# OSI Certified is a certification mark of the Open Source Initiative.
+#
+# The license (Mozilla version 1.0) can be read at the MMBase site.
+# See http://www.MMBase.org/license
+#
+
+application.version=1.0-SNAPSHOT
+
+cmsc.version=1.5.14
+
+cmscportlets.version
[MMBASE SCM] r40423 - in CMSContainer/tags/v1_12_1: . CMSContainer-1_5/maven-base
Author: fpunt
Date: 2010-01-08 10:27:26 +0100 (Fri, 08 Jan 2010)
New Revision: 40423
Added:
CMSContainer/tags/v1_12_1/CMSContainer-1_5/
CMSContainer/tags/v1_12_1/CMSContainer-1_5/maven-base/project.properties
Removed:
CMSContainer/tags/v1_12_1/CMSContainer-1_5/maven-base/project.properties
Log:
Released version 1.5.14
Copied: CMSContainer/tags/v1_12_1/CMSContainer-1_5 (from rev 40401,
CMSContainer/branches/b1_5/CMSContainer)
Deleted:
CMSContainer/tags/v1_12_1/CMSContainer-1_5/maven-base/project.properties
===
--- CMSContainer/branches/b1_5/CMSContainer/maven-base/project.properties
2010-01-07 15:56:19 UTC (rev 40401)
+++ CMSContainer/tags/v1_12_1/CMSContainer-1_5/maven-base/project.properties
2010-01-08 09:27:26 UTC (rev 40423)
@@ -1,75 +0,0 @@
-# This software is OSI Certified Open Source Software.
-# OSI Certified is a certification mark of the Open Source Initiative.
-#
-# The license (Mozilla version 1.0) can be read at the MMBase site.
-# See http://www.MMBase.org/license
-#
-
-maven.multiproject.type=mmbase-module
-
-cmsc.version=1.5.14-SNAPSHOT
-mmbase.version=1.8.7-20090803
-
-# maven build does not yet generate a rmmci. Did not create one by hand
-mmbasermmci.version=1.8.2-20061020
-pluto.version=1.0.1
-luceus.version=0.42
-
-# Specifies the version of the jdk in use.
-maven.compile.source=1.5
-maven.compile.target=1.5
-# See the ant javadoc task documentation for details.
-maven.javadoc.source=1.5
-
-# Runs the compiler in a separate process
-# Corresponds to the fork attribute for the ant javac task.
-maven.compile.fork=true
-
-# When using Java 1.4, it may be necessary to fork the JUnit tests to prevent
XML parser issues.
-maven.junit.fork=true
-# Skip test classes. Don't compile and run the tests
-maven.test.skip=false
-# Set this to true to ignore a failure during testing.
-maven.test.failure.ignore=true
-# Adds system properties to the JVM executing the unit tests
-# user.language and user.region are required for the locator
-maven.junit.sysproperties=
-maven.junit.jvmargs=-Dmmbase.config=${basedir}/src/tests/config
-
-# Tell CVS to be quiet when doing updates.
-maven.scm.cvs.quiet=true
-
-# Allows the user to show the site generation date on the generated website.
-# One can place the date in 5 locations with maven.xdoc.date:
-#* left : on the left side of the breadcrumbs
-#* right : on the right side of the breadcrumbs, before the links
-#* navigation-top : above the user links, in the navigation menu
-#* navigation-bottom : under Maven's links, in the navigation menu
-#* bottom : after the organization name, in the footer
-maven.xdoc.date=left
-maven.xdoc.date.format = dd HH:mm z
-maven.xdoc.version = ${pom.currentVersion}
-
-# Specifies what predefined check set to use.
-# Available sets are sun (for the Sun coding conventions), turbine and
avalon.
-#maven.checkstyle.format=turbine
-maven.checkstyle.properties=${basedir}/../../maven-base/checkstyle-mmbase.xml
-maven.checkstyle.header.file=${basedir}/../../maven-base/LICENSE.txt
-maven.license.licenseFile=${basedir}/../../maven-base/MPL10.txt
-
-#By default we don't bundle dependency jars into wars
-war.bundle=false
-
-maven.javadoc.links=http://java.sun.com/j2se/1.5.0/docs/api/
-
-maven.mmbasemodule.templates=${maven.mmbasemodule.src}/src/webapp
-
-# xdoclet general props
-maven.xdoclet.webdoclet.verbose=true
-maven.xdoclet.webdoclet.force=true
-
-# define the files to use
-maven.xdoclet.webdoclet.fileset.0=true
-maven.xdoclet.webdoclet.fileset.0.include=**/*.java
-maven.xdoclet.webdoclet.jsptaglib.0=false
-maven.xdoclet.webdoclet.destDir=${maven.build.dir}
\ No newline at end of file
Copied:
CMSContainer/tags/v1_12_1/CMSContainer-1_5/maven-base/project.properties (from
rev 40417,
CMSContainer/branches/b1_5/CMSContainer/maven-base/project.properties)
===
--- CMSContainer/tags/v1_12_1/CMSContainer-1_5/maven-base/project.properties
(rev 0)
+++ CMSContainer/tags/v1_12_1/CMSContainer-1_5/maven-base/project.properties
2010-01-08 09:27:26 UTC (rev 40423)
@@ -0,0 +1,75 @@
+# This software is OSI Certified Open Source Software.
+# OSI Certified is a certification mark of the Open Source Initiative.
+#
+# The license (Mozilla version 1.0) can be read at the MMBase site.
+# See http://www.MMBase.org/license
+#
+
+maven.multiproject.type=mmbase-module
+
+cmsc.version=1.5.14
+mmbase.version=1.8.7-20090803
+
+# maven build does not yet generate a rmmci. Did not create one by hand
+mmbasermmci.version=1.8.2-20061020
+pluto.version=1.0.1
+luceus.version=0.42
+
+# Specifies the version of the jdk in use.
+maven.compile.source=1.5
+maven.compile.target=1.5
+# See the ant javadoc task documentation for details.
+maven.javadoc.source=1.5
+
+# Runs the compiler in a separate process
+# Corresponds to the fork attribute
[MMBASE SCM] r40424 - in CMSContainer/branches/b1_5: CMSContainer/maven-base CMSContainer_Demo/demo.cmscontainer.org/maven-base CMSContainer_Modules/maven-base CMSContainer_Portlets/maven-base CMSCont
Author: fpunt Date: 2010-01-08 10:28:55 +0100 (Fri, 08 Jan 2010) New Revision: 40424 Modified: CMSContainer/branches/b1_5/CMSContainer/maven-base/project.properties CMSContainer/branches/b1_5/CMSContainer_Demo/demo.cmscontainer.org/maven-base/project.properties CMSContainer/branches/b1_5/CMSContainer_Modules/maven-base/project.properties CMSContainer/branches/b1_5/CMSContainer_Portlets/maven-base/project.properties CMSContainer/branches/b1_5/CMSContainer_Templates/double/maven-base/project.properties CMSContainer/branches/b1_5/CMSContainer_Templates/single/maven-base/project.properties Log: Released version 1.5.14 Modified: CMSContainer/branches/b1_5/CMSContainer/maven-base/project.properties === --- CMSContainer/branches/b1_5/CMSContainer/maven-base/project.properties 2010-01-08 09:27:26 UTC (rev 40423) +++ CMSContainer/branches/b1_5/CMSContainer/maven-base/project.properties 2010-01-08 09:28:55 UTC (rev 40424) @@ -7,7 +7,7 @@ maven.multiproject.type=mmbase-module -cmsc.version=1.5.14 +cmsc.version=1.5.15-SNAPSHOT mmbase.version=1.8.7-20090803 # maven build does not yet generate a rmmci. Did not create one by hand Modified: CMSContainer/branches/b1_5/CMSContainer_Demo/demo.cmscontainer.org/maven-base/project.properties === --- CMSContainer/branches/b1_5/CMSContainer_Demo/demo.cmscontainer.org/maven-base/project.properties 2010-01-08 09:27:26 UTC (rev 40423) +++ CMSContainer/branches/b1_5/CMSContainer_Demo/demo.cmscontainer.org/maven-base/project.properties 2010-01-08 09:28:55 UTC (rev 40424) @@ -5,11 +5,11 @@ # See http://www.MMBase.org/license # -application.version=1.5.14 +application.version=1.5.15-SNAPSHOT -cmsc.version=1.5.14 -cmscportlets.version=1.5.14 -cmscmodules.version=1.5.14 +cmsc.version=1.5.15-SNAPSHOT +cmscportlets.version=1.5.15-SNAPSHOT +cmscmodules.version=1.5.15-SNAPSHOT mmbase.version=1.8.7-20090803 # maven build does not yet generate a rmmci. Did not create one by hand Modified: CMSContainer/branches/b1_5/CMSContainer_Modules/maven-base/project.properties === --- CMSContainer/branches/b1_5/CMSContainer_Modules/maven-base/project.properties 2010-01-08 09:27:26 UTC (rev 40423) +++ CMSContainer/branches/b1_5/CMSContainer_Modules/maven-base/project.properties 2010-01-08 09:28:55 UTC (rev 40424) @@ -7,8 +7,8 @@ maven.multiproject.type=mmbase-module -cmscmodules.version=1.5.14 -cmsc.version=1.5.14 +cmscmodules.version=1.5.15-SNAPSHOT +cmsc.version=1.5.15-SNAPSHOT mmbase.version=1.8.7-20090803 # maven build does not yet generate a rmmci. Did not create one by hand Modified: CMSContainer/branches/b1_5/CMSContainer_Portlets/maven-base/project.properties === --- CMSContainer/branches/b1_5/CMSContainer_Portlets/maven-base/project.properties 2010-01-08 09:27:26 UTC (rev 40423) +++ CMSContainer/branches/b1_5/CMSContainer_Portlets/maven-base/project.properties 2010-01-08 09:28:55 UTC (rev 40424) @@ -7,8 +7,8 @@ maven.multiproject.type=mmbase-module -cmscportlets.version=1.5.14 -cmsc.version=1.5.14 +cmscportlets.version=1.5.15-SNAPSHOT +cmsc.version=1.5.15-SNAPSHOT mmbase.version=1.8.7-20090803 Modified: CMSContainer/branches/b1_5/CMSContainer_Templates/double/maven-base/project.properties === --- CMSContainer/branches/b1_5/CMSContainer_Templates/double/maven-base/project.properties 2010-01-08 09:27:26 UTC (rev 40423) +++ CMSContainer/branches/b1_5/CMSContainer_Templates/double/maven-base/project.properties 2010-01-08 09:28:55 UTC (rev 40424) @@ -7,10 +7,10 @@ application.version=1.0-SNAPSHOT -cmsc.version=1.5.14 +cmsc.version=1.5.15-SNAPSHOT -cmscportlets.version=1.5.14 -cmscmodules.version=1.5.14 +cmscportlets.version=1.5.15-SNAPSHOT +cmscmodules.version=1.5.15-SNAPSHOT mmbase.version=1.8.7-20090803 # maven build does not yet generate a rmmci. Did not create one by hand Modified: CMSContainer/branches/b1_5/CMSContainer_Templates/single/maven-base/project.properties === --- CMSContainer/branches/b1_5/CMSContainer_Templates/single/maven-base/project.properties 2010-01-08 09:27:26 UTC (rev 40423) +++ CMSContainer/branches/b1_5/CMSContainer_Templates/single/maven-base/project.properties 2010-01-08 09:28:55 UTC (rev 40424) @@ -7,9 +7,9 @@ application.version=1.0-SNAPSHOT -cmsc.version=1.5.14 -cmscportlets.version=1.5.14 -cmscmodules.version=1.5.14 +cmsc.version=1.5.15-SNAPSHOT +cmscportlets.version=1.5.15-SNAPSHOT +cmscmodules.version=1.5.15-SNAPSHOT mmbase.version=1.8.7-20090803 # maven build does not yet generate a rmmci. Did not create one by hand
[MMBASE SCM] r40380 - CMSContainer/trunk/CMSContainer_Portlets/portlets-poll/config/builders/poll
Author: fpunt Date: 2010-01-07 11:46:10 +0100 (Thu, 07 Jan 2010) New Revision: 40380 Modified: CMSContainer/trunk/CMSContainer_Portlets/portlets-poll/config/builders/poll/pollchoice.xml Log: CMSC-1597 The counter field of the poll choice had as base type created which will put the current timestamp in it. When of course was not how it should work. It breaks on default value, since created fields are read only. The field now has base type integer, which it should be. Modified: CMSContainer/trunk/CMSContainer_Portlets/portlets-poll/config/builders/poll/pollchoice.xml === --- CMSContainer/trunk/CMSContainer_Portlets/portlets-poll/config/builders/poll/pollchoice.xml 2010-01-07 09:38:23 UTC (rev 40379) +++ CMSContainer/trunk/CMSContainer_Portlets/portlets-poll/config/builders/poll/pollchoice.xml 2010-01-07 10:46:10 UTC (rev 40380) @@ -55,7 +55,7 @@ input4/input /positions /editor -datatype base=created xmlns=http://www.mmbase.org/xmlns/datatypes; +datatype base=integer xmlns=http://www.mmbase.org/xmlns/datatypes; default value=0/ required value=true/ /datatype ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40392 - CMSContainer/tags
Author: fpunt Date: 2010-01-07 15:15:55 +0100 (Thu, 07 Jan 2010) New Revision: 40392 Added: CMSContainer/tags/v1_7_1/ Log: releasing 1.7.1 Copied: CMSContainer/tags/v1_7_1 (from rev 40391, CMSContainer/branches/b1_7) ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
