[MMBASE CVS] January 77% OFF
___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/resources cmsc-repository.properties cmsc-repository_zh.properties
Update of /var/cvs/contributions/CMSContainer/cmsc/contentrepository/resources
In directory
james.mmbase.org:/tmp/cvs-serv29695/cmsc/contentrepository/resources
Modified Files:
cmsc-repository.properties cmsc-repository_zh.properties
Log Message:
CMSC-750 Remove image that is in use
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/resources
See also: http://www.mmbase.org/jira/browse/CMSC-750
Index: cmsc-repository.properties
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- cmsc-repository.properties 22 Jan 2008 10:26:24 - 1.18
+++ cmsc-repository.properties 28 Jan 2008 23:02:17 - 1.19
@@ -66,8 +66,8 @@
secondarydelete.field.filename=Filename
secondarydelete.field.name=Name
secondarydelete.field.url=URL
-secondarydelete.field.yes=Yes
-secondarydelete.field.no=No
+secondarydelete.yes=Yes
+secondarydelete.no=No
content.title=Content
content.channel=Channel {0} .
Index: cmsc-repository_zh.properties
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- cmsc-repository_zh.properties 22 Jan 2008 10:26:24 - 1.2
+++ cmsc-repository_zh.properties 28 Jan 2008 23:02:17 - 1.3
@@ -55,8 +55,8 @@
secondarydelete.field.filename=?
secondarydelete.field.name=??
secondarydelete.field.url=??
-secondarydelete.field.yes=??
-secondarydelete.field.no=??
+secondarydelete.yes=??
+secondarydelete.no=??
content.title=??
content.channel=?? {0} .
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository selector.jsp
Update of /var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository In directory james.mmbase.org:/tmp/cvs-serv29573/cmsc/contentrepository/src/webapp/editors/repository Modified Files: selector.jsp Log Message: CMSC-451 Recyclebin: numbers are not part of the link See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository See also: http://www.mmbase.org/jira/browse/CMSC-451 Index: selector.jsp === RCS file: /var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/selector.jsp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -b -r1.12 -r1.13 --- selector.jsp14 Nov 2007 13:47:57 - 1.12 +++ selector.jsp28 Jan 2008 22:55:23 - 1.13 @@ -85,8 +85,8 @@ " target="content"> - () + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources urlinfo.jsp
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources
In directory
james.mmbase.org:/tmp/cvs-serv29335/cmsc/contentrepository/src/webapp/editors/resources
Modified Files:
urlinfo.jsp
Log Message:
CMSC-731 Information about URL gives 500 error
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources
See also: http://www.mmbase.org/jira/browse/CMSC-731
Index: urlinfo.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/urlinfo.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- urlinfo.jsp 14 Dec 2007 15:48:32 - 1.5
+++ urlinfo.jsp 28 Jan 2008 22:41:56 - 1.6
@@ -69,14 +69,24 @@
:
-
+<% HashSet hs = new HashSet(); %>
+
+
+${thenumber}
+<%
+String nodeNumber = (String)
pageContext.getAttribute("nodenumber");
+if (!hs.contains(nodeNumber)) {
+%>
-
- :
- : ${thenumber}
+:
+:
${thenumber}
+<%
+hs.add(nodeNumber);
+}
+%>
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl SiteNavigationItemManager.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl
In directory
james.mmbase.org:/tmp/cvs-serv29172/cmsc/portal/src/java/com/finalist/cmsc/portalImpl
Modified Files:
SiteNavigationItemManager.java
Log Message:
CMSC-690 SiteTree: 'Make new page' twice in menu
Used wrong treemanager for site
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl
See also: http://www.mmbase.org/jira/browse/CMSC-690
Index: SiteNavigationItemManager.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SiteNavigationItemManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- SiteNavigationItemManager.java 30 Nov 2007 10:58:34 - 1.3
+++ SiteNavigationItemManager.java 28 Jan 2008 22:31:16 - 1.4
@@ -3,11 +3,11 @@
import com.finalist.cmsc.beans.om.*;
import com.finalist.cmsc.navigation.NavigationTreeItemRenderer;
import com.finalist.cmsc.navigation.SiteUtil;
-import com.finalist.cmsc.navigation.tree.PageTreeItemRenderer;
+import com.finalist.cmsc.navigation.tree.SiteTreeItemRenderer;
public class SiteNavigationItemManager extends PageNavigationItemManager {
- private NavigationTreeItemRenderer treeRenderer = new
PageTreeItemRenderer();
+ private NavigationTreeItemRenderer treeRenderer = new
SiteTreeItemRenderer();
@Override
public String getTreeManager() {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/security/src/webapp/editors/usermanagement globals.jsp changepassword.jsp
Update of /var/cvs/contributions/CMSContainer/cmsc/security/src/webapp/editors/usermanagement In directory james.mmbase.org:/tmp/cvs-serv28724/cmsc/security/src/webapp/editors/usermanagement Modified Files: globals.jsp changepassword.jsp Log Message: CMSC-570 Password Manager fills in password text at input field See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/security/src/webapp/editors/usermanagement See also: http://www.mmbase.org/jira/browse/CMSC-570 Index: globals.jsp === RCS file: /var/cvs/contributions/CMSContainer/cmsc/security/src/webapp/editors/usermanagement/globals.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- globals.jsp 21 May 2007 18:06:16 - 1.2 +++ globals.jsp 28 Jan 2008 22:11:19 - 1.3 @@ -1,2 +1,2 @@ -<[EMAIL PROTECTED] file="../globals.jsp" %> - \ No newline at end of file +<[EMAIL PROTECTED] file="../globals.jsp" +%> \ No newline at end of file Index: changepassword.jsp === RCS file: /var/cvs/contributions/CMSContainer/cmsc/security/src/webapp/editors/usermanagement/changepassword.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- changepassword.jsp 21 May 2007 18:06:16 - 1.4 +++ changepassword.jsp 28 Jan 2008 22:11:19 - 1.5 @@ -1,6 +1,6 @@ -<[EMAIL PROTECTED] language="java" contentType="text/html;charset=utf-8" %> -<[EMAIL PROTECTED] file="globals.jsp" %> - +<[EMAIL PROTECTED] language="java" contentType="text/html;charset=utf-8" +%><[EMAIL PROTECTED] file="globals.jsp" +%> http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> @@ -34,14 +34,14 @@ - - + + - + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms ChangePasswordForm.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms
In directory
james.mmbase.org:/tmp/cvs-serv28724/cmsc/security/src/java/com/finalist/cmsc/security/forms
Modified Files:
ChangePasswordForm.java
Log Message:
CMSC-570 Password Manager fills in password text at input field
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms
See also: http://www.mmbase.org/jira/browse/CMSC-570
Index: ChangePasswordForm.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/ChangePasswordForm.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- ChangePasswordForm.java 26 Nov 2007 11:43:43 - 1.4
+++ ChangePasswordForm.java 28 Jan 2008 22:11:19 - 1.5
@@ -18,7 +18,7 @@
@SuppressWarnings("serial")
public class ChangePasswordForm extends ActionForm {
- private String password;
+ private String password1;
private String newpassword;
private String confirmnewpassword;
@@ -27,8 +27,8 @@
public ActionErrors validate(ActionMapping mapping, HttpServletRequest
request) {
ActionErrors errors = new ActionErrors();
- if (getPassword() == null || getPassword().trim().length() == 0) {
- errors.add("password", new ActionMessage("error.password.incorrect"));
+ if (getPassword1() == null || getPassword1().trim().length() == 0) {
+ errors.add("password1", new
ActionMessage("error.password.incorrect"));
}
if (getNewpassword() == null || getNewpassword().trim().length() < 5 ||
getNewpassword().trim().length() > 15) {
errors.add("newpassword", new
ActionMessage("error.password.invalid"));
@@ -41,7 +41,7 @@
errors.add("newpassword", new
ActionMessage("error.password.nomatch"));
}
if (errors.size() == 0) {
- if (getPassword().equals(getNewpassword())) {
+ if (getPassword1().equals(getNewpassword())) {
errors.add("newpassword", new
ActionMessage("error.newpassword.incorrect"));
}
else {
@@ -49,12 +49,12 @@
Cloud cloud = MMBaseAction.getCloudFromSession(request);
HashMap user = new HashMap();
user.put("username", cloud.getUser().getIdentifier());
- user.put("password", password);
+ user.put("password", password1);
ContextProvider.getCloudContext(ContextProvider.getDefaultCloudContextName()).getCloud("mmbase",
"name/password", user);
}
catch (java.lang.SecurityException se) {
- errors.add("password", new
ActionMessage("error.password.incorrect"));
+ errors.add("password1", new
ActionMessage("error.password.incorrect"));
}
}
@@ -63,13 +63,13 @@
}
- public String getPassword() {
- return password;
+ public String getPassword1() {
+ return password1;
}
- public void setPassword(String password) {
- this.password = password;
+ public void setPassword1(String password) {
+ this.password1 = password;
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/demo 1_column_layout.jsp 2_column_layout_right.jsp 3_column_layout.jsp landingspage_layout.j
Update of
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/demo
In directory
james.mmbase.org:/tmp/cvs-serv27852/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/demo
Modified Files:
1_column_layout.jsp 2_column_layout_right.jsp
3_column_layout.jsp landingspage_layout.jsp
2_column_layout.jsp sitemap_layout.jsp
Log Message:
CMSC-755 Navigation code refactored to use navigationitem
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/demo
See also: http://www.mmbase.org/jira/browse/CMSC-755
Index: 1_column_layout.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/demo/1_column_layout.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- 1_column_layout.jsp 30 Nov 2007 14:59:28 - 1.5
+++ 1_column_layout.jsp 28 Jan 2008 21:24:11 - 1.6
@@ -1,27 +1,12 @@
-<[EMAIL PROTECTED] file="includes/taglibs.jsp"%>
-http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<[EMAIL PROTECTED] file="includes/taglibs.jsp"
+%>http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
http://www.w3.org/1999/xhtml"; lang="${site.language}"
xml:lang="${site.language}">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
<[EMAIL PROTECTED] file="includes/header.jsp"%>
+
Index: 2_column_layout_right.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/demo/2_column_layout_right.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- 2_column_layout_right.jsp 30 Nov 2007 14:59:28 - 1.4
+++ 2_column_layout_right.jsp 28 Jan 2008 21:24:11 - 1.5
@@ -1,27 +1,12 @@
-<[EMAIL PROTECTED] file="includes/taglibs.jsp"%>
-http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<[EMAIL PROTECTED] file="includes/taglibs.jsp"
+%>http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
http://www.w3.org/1999/xhtml"; lang="${site.language}"
xml:lang="${site.language}">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
<[EMAIL PROTECTED] file="includes/header.jsp"%>
+
Index: 3_column_layout.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/demo/3_column_layout.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- 3_column_layout.jsp 30 Nov 2007 14:59:28 - 1.3
+++ 3_column_layout.jsp 28 Jan 2008 21:24:11 - 1.4
@@ -1,27 +1,12 @@
-<[EMAIL PROTECTED] file="includes/taglibs.jsp"%>
-http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<[EMAIL PROTECTED] file="includes/taglibs.jsp"
+%>http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
http://www.w3.org/1999/xhtml"; lang="${site.language}"
xml:lang="${site.language}">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
<[EMAIL PROTECTED] file="includes/header.jsp"%>
+
Index: landingspage_layout.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/demo/landingspage_layout.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- landingspage_layout.jsp 30 Nov 2007 14:59:28 - 1.3
+++ landingspage_layout.jsp 28 Jan 2008 21:24:11 - 1.4
@@ -1,27 +1,12 @@
-<[EMAIL PROTECTED] file="includes/taglibs.jsp"%>
-http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<[EMAIL PROTECTED] file="includes/taglibs.jsp"
+%>http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
http://www.w3.org/1999/xhtml"; lang="${site.language}"
xml:lang="${site.language}">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
<[EMAIL PROTECTED] file="includes/header.jsp"%>
+
Index: 2_column_layout.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/demo/2_column_layout.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- 2_column_layout.jsp 30 Nov 2007 14:59:28 - 1.3
++
[MMBASE CVS] contributions/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/demo/includes header.jsp taglibs.jsp
Update of /var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/demo/includes In directory james.mmbase.org:/tmp/cvs-serv27852/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/demo/includes Modified Files: header.jsp taglibs.jsp Log Message: CMSC-755 Navigation code refactored to use navigationitem See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/demo/includes See also: http://www.mmbase.org/jira/browse/CMSC-755 Index: header.jsp === RCS file: /var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/demo/includes/header.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- header.jsp 26 Sep 2007 11:17:56 - 1.1 +++ header.jsp 28 Jan 2008 21:24:11 - 1.2 @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + \ No newline at end of file Index: taglibs.jsp === RCS file: /var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/demo/includes/taglibs.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- taglibs.jsp 16 Nov 2007 16:00:10 - 1.3 +++ taglibs.jsp 28 Jan 2008 21:24:11 - 1.4 @@ -1,6 +1,6 @@ -<[EMAIL PROTECTED] language="java" contentType="text/html; charset=utf-8" %> -<[EMAIL PROTECTED] uri="http://java.sun.com/jsp/jstl/functions"; prefix="fn" %> -<[EMAIL PROTECTED] uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %> -<[EMAIL PROTECTED] uri="http://finalist.com/cmsc"; prefix="cmsc" %> -<[EMAIL PROTECTED] uri="http://www.mmbase.org/mmbase-taglib-1.0"; prefix="mm" %> -<[EMAIL PROTECTED] tagdir="/WEB-INF/tags/" prefix="cmscf" %> \ No newline at end of file +<[EMAIL PROTECTED] language="java" contentType="text/html; charset=utf-8" +%><[EMAIL PROTECTED] uri="http://java.sun.com/jsp/jstl/functions"; prefix="fn" +%><[EMAIL PROTECTED] uri="http://java.sun.com/jsp/jstl/core"; prefix="c" +%><[EMAIL PROTECTED] uri="http://finalist.com/cmsc"; prefix="cmsc" +%><[EMAIL PROTECTED] uri="http://www.mmbase.org/mmbase-taglib-1.0"; prefix="mm" +%><[EMAIL PROTECTED] tagdir="/WEB-INF/tags/" prefix="cmscf" %> \ No newline at end of file ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/alias/src/java/com/finalist/cmsc/alias AliasNavigationRenderer.java AliasNavigationItemManager.java
Update of
/var/cvs/contributions/CMSContainer_Modules/alias/src/java/com/finalist/cmsc/alias
In directory
james.mmbase.org:/tmp/cvs-serv27028/alias/src/java/com/finalist/cmsc/alias
Modified Files:
AliasNavigationRenderer.java AliasNavigationItemManager.java
Log Message:
CMSC-755 Navigation code refactored to use navigationitem
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/alias/src/java/com/finalist/cmsc/alias
See also: http://www.mmbase.org/jira/browse/CMSC-755
Index: AliasNavigationRenderer.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/alias/src/java/com/finalist/cmsc/alias/AliasNavigationRenderer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- AliasNavigationRenderer.java16 Jan 2008 17:29:17 - 1.3
+++ AliasNavigationRenderer.java28 Jan 2008 21:16:09 - 1.4
@@ -1,22 +1,11 @@
package com.finalist.cmsc.alias;
import javax.servlet.ServletConfig;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpServletResponse;
-
-import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.mmbase.bridge.Cloud;
-import org.mmbase.bridge.Node;
-import org.mmbase.bridge.NodeList;
+import javax.servlet.http.*;
import com.finalist.cmsc.alias.beans.om.Alias;
import com.finalist.cmsc.beans.om.NavigationItem;
-import com.finalist.cmsc.navigation.NavigationItemRenderer;
-import com.finalist.cmsc.navigation.NavigationManager;
+import com.finalist.cmsc.navigation.*;
import com.finalist.cmsc.portalImpl.registry.PortalRegistry;
import com.finalist.cmsc.services.sitemanagement.SiteManagement;
import com.finalist.pluto.portalImpl.aggregation.ScreenFragment;
@@ -26,20 +15,14 @@
protected static String CONTENT_TYPE = "text/html";
- private Log log = LogFactory.getLog(AliasNavigationRenderer.class);
-
public void render(NavigationItem item, HttpServletRequest request,
HttpServletResponse response,
ServletConfig servletConfig) {
if (item instanceof Alias) {
- Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
- Node itemNode = cloud.getNode(item.getId());
- NodeList relatedNodes = itemNode.getRelatedNodes("page", "related",
"destination");
- if(relatedNodes.size() > 0) {
- Node page = relatedNodes.getNode(0);
-
- String path = page.getStringValue("path");
-NavigationItem pageItem =
SiteManagement.getNavigationItemFromPath(path);
+ Alias alias = (Alias) item;
+ if (alias.getPage() > 0 ) {
+ NavigationItem pageItem =
SiteManagement.getNavigationItem(alias.getPage());
+ String path = SiteManagement.getPath(pageItem,
ServerUtil.useServerName());
HttpServletRequest aliasRequest = new
AliasHttpServletRequest(request, path);
PortalEnvironment aliasEnv = new PortalEnvironment(aliasRequest,
response, servletConfig);
Index: AliasNavigationItemManager.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/alias/src/java/com/finalist/cmsc/alias/AliasNavigationItemManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- AliasNavigationItemManager.java 16 Jan 2008 17:29:17 - 1.3
+++ AliasNavigationItemManager.java 28 Jan 2008 21:16:09 - 1.4
@@ -2,8 +2,7 @@
import net.sf.mmapps.commons.beans.MMBaseNodeMapper;
-import org.mmbase.bridge.Cloud;
-import org.mmbase.bridge.Node;
+import org.mmbase.bridge.*;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
@@ -12,9 +11,7 @@
import com.finalist.cmsc.alias.tree.AliasTreeItemRenderer;
import com.finalist.cmsc.alias.util.AliasUtil;
import com.finalist.cmsc.beans.om.NavigationItem;
-import com.finalist.cmsc.navigation.NavigationItemManager;
-import com.finalist.cmsc.navigation.NavigationItemRenderer;
-import com.finalist.cmsc.navigation.NavigationTreeItemRenderer;
+import com.finalist.cmsc.navigation.*;
public class AliasNavigationItemManager implements NavigationItemManager {
@@ -41,7 +38,14 @@
return null;
}
-return (Alias) MMBaseNodeMapper.copyNode(node, Alias.class);
+Alias alias = MMBaseNodeMapper.copyNode(node, Alias.class);
+NodeList relatedNodes = node.getRelatedNodes("page", "related",
"destination");
+if(relatedNodes.size() > 0) {
+Node page = relatedNodes.getNode(0);
+alias.setPage(page.getNumber());
+}
+
+return alias;
}
public Object getPublisher(Cloud cloud, String ty
[MMBASE CVS] contributions/CMSContainer_Modules/rssfeed/src/java/com/finalist/cmsc/rssfeed/util RssFeedUtil.java
Update of
/var/cvs/contributions/CMSContainer_Modules/rssfeed/src/java/com/finalist/cmsc/rssfeed/util
In directory
james.mmbase.org:/tmp/cvs-serv27028/rssfeed/src/java/com/finalist/cmsc/rssfeed/util
Modified Files:
RssFeedUtil.java
Log Message:
CMSC-755 Navigation code refactored to use navigationitem
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/rssfeed/src/java/com/finalist/cmsc/rssfeed/util
See also: http://www.mmbase.org/jira/browse/CMSC-755
Index: RssFeedUtil.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/rssfeed/src/java/com/finalist/cmsc/rssfeed/util/RssFeedUtil.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- RssFeedUtil.java5 Dec 2007 15:26:37 - 1.4
+++ RssFeedUtil.java28 Jan 2008 21:16:09 - 1.5
@@ -1,30 +1,40 @@
package com.finalist.cmsc.rssfeed.util;
+import java.util.*;
+
import org.mmbase.bridge.Node;
import org.mmbase.bridge.NodeList;
import org.mmbase.bridge.util.SearchUtil;
-import com.finalist.cmsc.mmbase.TreeUtil;
-import com.finalist.cmsc.navigation.NavigationUtil;
+import com.finalist.cmsc.repository.RepositoryUtil;
public class RssFeedUtil {
+
+ private static final String DESTINATION = "destination";
+
public static final String RSSFEED = "rssfeed";
+ public static final String TYPEDEF = "typedef";
+ public static final String ALLOWREL = "allowrel";
+
public static final String FRAGMENT_FIELD = "urlfragment";
public static final String TITLE_FIELD = "title";
-
- public static NodeList getOrderedChildren(Node parentNode) {
- return SearchUtil.findRelatedOrderedNodeList(parentNode,
RssFeedUtil.RSSFEED, NavigationUtil.NAVREL,
-FRAGMENT_FIELD);
+ public static boolean isRssFeedType(Node node) {
+ return node.getNodeManager().getName().equals(RSSFEED);
}
-
- public static int getChildCount(Node node) {
- return TreeUtil.getChildCount(node,
node.getCloud().getNodeManager(RSSFEED), NavigationUtil.NAVREL);
+ public static List getAllowedTypes(Node node) {
+ List types = new ArrayList();
+ NodeList typedefs = node.getRelatedNodes(TYPEDEF, ALLOWREL,
DESTINATION);
+ for (Iterator iter = typedefs.iterator(); iter.hasNext();) {
+ Node typedef = iter.next();
+ types.add(typedef.getStringValue("name"));
+ }
+ return types;
}
-
- public static boolean isRssFeedType(Node node) {
- return node.getNodeManager().getName().equals(RSSFEED);
+public static Node getContentChannel(Node node) {
+return SearchUtil.findRelatedNode(node, RepositoryUtil.CONTENTCHANNEL,
"related");
}
+
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/alias/src/java/com/finalist/cmsc/alias/beans/om Alias.java
Update of
/var/cvs/contributions/CMSContainer_Modules/alias/src/java/com/finalist/cmsc/alias/beans/om
In directory
james.mmbase.org:/tmp/cvs-serv27028/alias/src/java/com/finalist/cmsc/alias/beans/om
Modified Files:
Alias.java
Log Message:
CMSC-755 Navigation code refactored to use navigationitem
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/alias/src/java/com/finalist/cmsc/alias/beans/om
See also: http://www.mmbase.org/jira/browse/CMSC-755
Index: Alias.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/alias/src/java/com/finalist/cmsc/alias/beans/om/Alias.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Alias.java 24 Dec 2007 13:43:52 - 1.1
+++ Alias.java 28 Jan 2008 21:16:08 - 1.2
@@ -5,4 +5,14 @@
@SuppressWarnings("serial")
public class Alias extends NavigationItem {
+private int page;
+
+public void setPage(int number) {
+this.page = number;
+}
+
+public int getPage() {
+return page;
+}
+
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/rssfeed/src/java/com/finalist/cmsc/rssfeed RssFeedNavigationItemManager.java RssFeedNavigationRenderer.java
Update of
/var/cvs/contributions/CMSContainer_Modules/rssfeed/src/java/com/finalist/cmsc/rssfeed
In directory
james.mmbase.org:/tmp/cvs-serv27028/rssfeed/src/java/com/finalist/cmsc/rssfeed
Modified Files:
RssFeedNavigationItemManager.java
RssFeedNavigationRenderer.java
Log Message:
CMSC-755 Navigation code refactored to use navigationitem
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/rssfeed/src/java/com/finalist/cmsc/rssfeed
See also: http://www.mmbase.org/jira/browse/CMSC-755
Index: RssFeedNavigationItemManager.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/rssfeed/src/java/com/finalist/cmsc/rssfeed/RssFeedNavigationItemManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- RssFeedNavigationItemManager.java 16 Jan 2008 12:42:52 - 1.3
+++ RssFeedNavigationItemManager.java 28 Jan 2008 21:16:09 - 1.4
@@ -1,5 +1,7 @@
package com.finalist.cmsc.rssfeed;
+import java.util.List;
+
import net.sf.mmapps.commons.beans.MMBaseNodeMapper;
import org.mmbase.bridge.Cloud;
@@ -39,8 +41,17 @@
return null;
}
-RssFeed rssFeed = null;
-rssFeed = (RssFeed) MMBaseNodeMapper.copyNode(node, RssFeed.class);
+RssFeed rssFeed = MMBaseNodeMapper.copyNode(node, RssFeed.class);
+
+List types = RssFeedUtil.getAllowedTypes(node);
+for (String type : types) {
+rssFeed.addContenttype(type);
+}
+
+Node contentChannel = RssFeedUtil.getContentChannel(node);
+if (contentChannel != null) {
+rssFeed.setContentChannel(contentChannel.getNumber());
+}
return rssFeed;
}
Index: RssFeedNavigationRenderer.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/rssfeed/src/java/com/finalist/cmsc/rssfeed/RssFeedNavigationRenderer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- RssFeedNavigationRenderer.java 18 Jan 2008 20:14:19 - 1.4
+++ RssFeedNavigationRenderer.java 28 Jan 2008 21:16:17 - 1.5
@@ -11,6 +11,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import net.sf.mmapps.commons.util.HttpUtil;
import net.sf.mmapps.commons.util.XmlUtil;
import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
@@ -21,14 +22,17 @@
import org.mmbase.bridge.NodeIterator;
import org.mmbase.bridge.NodeList;
import org.mmbase.bridge.NodeQuery;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
import com.finalist.cmsc.beans.om.NavigationItem;
import com.finalist.cmsc.mmbase.ResourcesUtil;
import com.finalist.cmsc.navigation.NavigationItemRenderer;
+import com.finalist.cmsc.navigation.ServerUtil;
import com.finalist.cmsc.repository.ContentElementUtil;
import com.finalist.cmsc.repository.RepositoryUtil;
import com.finalist.cmsc.rssfeed.beans.om.RssFeed;
-import com.finalist.util.version.VersionUtil;
+import com.finalist.cmsc.services.sitemanagement.SiteManagement;
public class RssFeedNavigationRenderer implements NavigationItemRenderer {
@@ -45,73 +49,45 @@
response.setHeader("Content-Type", "application/xml+rss;
charset=UTF-8");
- StringBuffer output = new StringBuffer();
- output.append("\n");
- output.append("\n");
- output.append("");
- output.append("");
- output.append(xmlEscape(rssFeed.getTitle()));
- output.append("");
- output.append("");
- output.append(xmlEscape(getServerDocRoot(request)));
- output.append("");
- output.append("");
- output.append(xmlEscape(rssFeed.getLanguage()));
- output.append("");
- output.append("");
- output.append(xmlEscape(rssFeed.getDescription()));
- output.append("");
- output.append("");
- output.append(xmlEscape(rssFeed.getCopyright()));
- output.append("");
- output.append("");
- output.append(xmlEscape(rssFeed.getEmail_managing_editor()));
- output.append("");
- output.append("");
- output.append(xmlEscape(rssFeed.getEmail_webmaster()));
- output.append("");
- output.append("");
- output.append("CMS Container RssFeed module " +
VersionUtil.getCmscVersion(servletConfig.getServletContext()));
- output.append("");
- output.append("");
- output.append("http://blogs.law.harvard.edu/tech/rss";);
- output.append("");
+ Document doc = XmlUtil.createDocument();
+ Element rss = XmlUtil.createRoot(doc, "rss");
+ XmlUtil.createAttribute(rss, "version", "2.0");
+ Element channel = XmlUtil.createChild(rss, "channel");
+ XmlUtil.createChildText(channel, "title", rssFeed.getTitle());
+
[MMBASE CVS] contributions/CMSContainer_Modules/alias/src/java/com/finalist/cmsc/alias/util AliasUtil.java
Update of
/var/cvs/contributions/CMSContainer_Modules/alias/src/java/com/finalist/cmsc/alias/util
In directory
james.mmbase.org:/tmp/cvs-serv27028/alias/src/java/com/finalist/cmsc/alias/util
Modified Files:
AliasUtil.java
Log Message:
CMSC-755 Navigation code refactored to use navigationitem
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/alias/src/java/com/finalist/cmsc/alias/util
See also: http://www.mmbase.org/jira/browse/CMSC-755
Index: AliasUtil.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/alias/src/java/com/finalist/cmsc/alias/util/AliasUtil.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- AliasUtil.java 24 Dec 2007 13:43:48 - 1.1
+++ AliasUtil.java 28 Jan 2008 21:16:08 - 1.2
@@ -1,29 +1,12 @@
package com.finalist.cmsc.alias.util;
import org.mmbase.bridge.Node;
-import org.mmbase.bridge.NodeList;
-import org.mmbase.bridge.util.SearchUtil;
-
-import com.finalist.cmsc.mmbase.TreeUtil;
-import com.finalist.cmsc.navigation.NavigationUtil;
public class AliasUtil {
public static final String ALIAS = "pagealias";
public static final String FRAGMENT_FIELD = "urlfragment";
public static final String TITLE_FIELD = "title";
-
- public static NodeList getOrderedChildren(Node parentNode) {
- return SearchUtil.findRelatedOrderedNodeList(parentNode, ALIAS,
NavigationUtil.NAVREL,
-FRAGMENT_FIELD);
- }
-
-
- public static int getChildCount(Node node) {
- return TreeUtil.getChildCount(node,
node.getCloud().getNodeManager(ALIAS), NavigationUtil.NAVREL);
- }
-
-
public static boolean isAliasType(Node node) {
return node.getNodeManager().getName().equals(ALIAS);
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/language-redirect/src/java/com/finalist/cmsc/languageredirect LanguageRedirectServlet.java
Update of
/var/cvs/contributions/CMSContainer_Modules/language-redirect/src/java/com/finalist/cmsc/languageredirect
In directory
james.mmbase.org:/tmp/cvs-serv27028/language-redirect/src/java/com/finalist/cmsc/languageredirect
Modified Files:
LanguageRedirectServlet.java
Log Message:
CMSC-755 Navigation code refactored to use navigationitem
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/language-redirect/src/java/com/finalist/cmsc/languageredirect
See also: http://www.mmbase.org/jira/browse/CMSC-755
Index: LanguageRedirectServlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/language-redirect/src/java/com/finalist/cmsc/languageredirect/LanguageRedirectServlet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- LanguageRedirectServlet.java26 Nov 2007 11:42:00 - 1.4
+++ LanguageRedirectServlet.java28 Jan 2008 21:16:21 - 1.5
@@ -33,6 +33,7 @@
import org.mmbase.storage.search.FieldCompareConstraint;
import org.mmbase.storage.search.FieldValueConstraint;
+import com.finalist.cmsc.beans.om.NavigationItem;
import com.finalist.cmsc.beans.om.Page;
import com.finalist.cmsc.mmbase.TreeUtil;
import com.finalist.cmsc.navigation.*;
@@ -95,12 +96,12 @@
private String getRedirectUrl(HttpServletRequest request, String path) {
- Page page = SiteManagement.getPageFromPath(path);
- String link = SiteManagement.getPath(page, !ServerUtil.useServerName());
+ NavigationItem item = SiteManagement.getNavigationItemFromPath(path);
+ String link = SiteManagement.getPath(item, !ServerUtil.useServerName());
String host = null;
if (ServerUtil.useServerName()) {
- host = SiteManagement.getSite(page);
+ host = SiteManagement.getSite(item);
}
PortalURL u = new PortalURL(host, request, link);
return u.toString();
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/rssfeed/src/java/com/finalist/cmsc/rssfeed/beans/om RssFeed.java
Update of
/var/cvs/contributions/CMSContainer_Modules/rssfeed/src/java/com/finalist/cmsc/rssfeed/beans/om
In directory
james.mmbase.org:/tmp/cvs-serv27028/rssfeed/src/java/com/finalist/cmsc/rssfeed/beans/om
Modified Files:
RssFeed.java
Log Message:
CMSC-755 Navigation code refactored to use navigationitem
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/rssfeed/src/java/com/finalist/cmsc/rssfeed/beans/om
See also: http://www.mmbase.org/jira/browse/CMSC-755
Index: RssFeed.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/rssfeed/src/java/com/finalist/cmsc/rssfeed/beans/om/RssFeed.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- RssFeed.java16 Jan 2008 10:56:16 - 1.3
+++ RssFeed.java28 Jan 2008 21:16:21 - 1.4
@@ -1,17 +1,22 @@
package com.finalist.cmsc.rssfeed.beans.om;
+import java.util.*;
+
import com.finalist.cmsc.beans.om.NavigationItem;
@SuppressWarnings("serial")
public class RssFeed extends NavigationItem {
-int maximum;
-int max_age_in_days;
-String link;
-String language;
-String copyright;
-String email_managing_editor;
-String email_webmaster;
+private int maximum;
+private int max_age_in_days;
+private String link;
+private String language;
+private String copyright;
+private String email_managing_editor;
+private String email_webmaster;
+
+private List contenttypes = new ArrayList();
+private int contentChannel = -1;
public int getMaximum() {
return maximum;
@@ -69,4 +74,20 @@
this.email_webmaster = email_webmaster;
}
+public List getContenttypes() {
+return Collections.unmodifiableList(contenttypes);
+ }
+
+ public void addContenttype(String contenttypes) {
+this.contenttypes.add(contenttypes);
+ }
+
+public int getContentChannel() {
+return contentChannel;
+}
+
+public void setContentChannel(int contentChannel) {
+this.contentChannel = contentChannel;
+}
+
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/navigation PathTag.java LocationTag.java OnPathTag.java LinkTag.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/navigation
In directory
james.mmbase.org:/tmp/cvs-serv26804/cmsc/taglib/src/java/com/finalist/cmsc/taglib/navigation
Modified Files:
PathTag.java LocationTag.java OnPathTag.java LinkTag.java
Log Message:
CMSC-755 Navigation code refactored to use navigationitem
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/navigation
See also: http://www.mmbase.org/jira/browse/CMSC-755
Index: PathTag.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/navigation/PathTag.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- PathTag.java30 Nov 2007 10:58:32 - 1.11
+++ PathTag.java28 Jan 2008 21:15:45 - 1.12
@@ -12,29 +12,28 @@
import java.util.Iterator;
import java.util.List;
-import com.finalist.cmsc.beans.om.Page;
+import com.finalist.cmsc.beans.om.NavigationItem;
import com.finalist.cmsc.services.sitemanagement.SiteManagement;
import com.finalist.cmsc.taglib.AbstractListTag;
/**
- * path of pages valid attributes for this tag are:
+ * path of items valid attributes for this tag are:
*
* mode := menu|hidden|all
* includeSite := true|false
- * page := 1..n
+ * item := 1..n
*
* Examples:
*/
-public class PathTag extends AbstractListTag {
+public class PathTag extends AbstractListTag {
- private static final String MODE_ALL = "all";
private static final String MODE_HIDDEN = "hidden";
private static final String MODE_MENU = "menu";
private String mode = MODE_MENU;
private boolean includeSite = true;
- private int page;
+ private int itemNumber;
public boolean isIncludeSite() {
@@ -76,7 +75,7 @@
public int getPage() {
- return page;
+ return itemNumber;
}
@@ -89,36 +88,36 @@
* current page
*/
public void setPage(int page) {
- this.page = page;
+ this.itemNumber = page;
}
@Override
- protected List getList() {
+ protected List getList() {
String path;
- if (page > 0) {
- // get path for a specific page
- path = getPathForPage();
+ if (itemNumber > 0) {
+ // get path for a specific item
+ path = getPathForItem();
}
else {
- // get path for current page
+ // get path for current item
path = getPath();
}
if (path == null) {
return null;
}
- List pages = SiteManagement.getListFromPath(path);
- if (pages == null) {
- return pages;
+ List items = SiteManagement.getListFromPath(path);
+ if (items == null) {
+ return items;
}
if (MODE_MENU.equalsIgnoreCase(mode)) {
boolean hideChildren = false;
- for (Iterator iter = pages.iterator();
iter.hasNext();) {
-Page page = iter.next();
-if (hideChildren || !page.isInmenu()) {
+ for (Iterator iter = items.iterator();
iter.hasNext();) {
+NavigationItem item = iter.next();
+if (hideChildren || !item.isInmenu()) {
iter.remove();
hideChildren = true;
}
@@ -126,9 +125,9 @@
}
else if (MODE_HIDDEN.equalsIgnoreCase(mode)) {
boolean showChildren = false;
- for (Iterator iter = pages.iterator();
iter.hasNext();) {
-Page page = iter.next();
-if (showChildren || page.isInmenu()) {
+ for (Iterator iter = items.iterator();
iter.hasNext();) {
+NavigationItem item = iter.next();
+if (showChildren || item.isInmenu()) {
iter.remove();
showChildren = true;
}
@@ -136,20 +135,20 @@
}
// remove the first entry if the site itself should not be shown
- if (!includeSite && pages.size() > 0) {
- pages.remove(0);
+ if (!includeSite && items.size() > 0) {
+ items.remove(0);
}
- return pages;
+ return items;
}
- private String getPathForPage() {
+ private String getPathForItem() {
String path = null;
- Page tmpPage = SiteManagement.getPage(page);
- if (tmpPage != null) {
- path = SiteManagement.getPath(tmpPage, true);
+ NavigationItem tmpItem = SiteManagement.getNavigationItem(itemNumber);
+ if (tmpItem != null) {
+ path = SiteManagement.getPath(tmpItem, true);
}
return path;
Index: LocationTag.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/navigation/LocationTag.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- LocationTag.java26 N
[MMBASE CVS] contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib ListNavigationItemsTag.java InsertPageImageTag.java ListPagesTag.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib
In directory
james.mmbase.org:/tmp/cvs-serv26804/cmsc/taglib/src/java/com/finalist/cmsc/taglib
Modified Files:
InsertPageImageTag.java ListPagesTag.java
Added Files:
ListNavigationItemsTag.java
Log Message:
CMSC-755 Navigation code refactored to use navigationitem
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib
See also: http://www.mmbase.org/jira/browse/CMSC-755
ListNavigationItemsTag.java is new
Index: InsertPageImageTag.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/InsertPageImageTag.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- InsertPageImageTag.java 3 Dec 2007 13:10:26 - 1.6
+++ InsertPageImageTag.java 28 Jan 2008 21:15:45 - 1.7
@@ -51,7 +51,6 @@
HttpServletRequest request = (HttpServletRequest) ctx.getRequest();
Integer image = null;
-
if (StringUtils.isNotEmpty(name)) {
List images = SiteManagement.getPageImagesForPage(name,
getPath());
if (images != null && !images.isEmpty()) {
@@ -89,7 +88,7 @@
List images = getCurrentPageImages();
if ((override && images.size() < 1) || directly) { // inherit from
parent.
- images.addAll(getImagiesOfParent());
+ images.addAll(getImagesOfParent());
}
if (images.size() > 0) {
@@ -104,8 +103,8 @@
}
- private List getImagiesOfParent() {
- List pages = SiteManagement.getListFromPath(getPath());
+ private List getImagesOfParent() {
+ List pages = SiteManagement.getPagesFromPath(getPath());
if (pages.size() > 2) {
@@ -121,7 +120,7 @@
private List getCurrentPageImages() {
- List pages = SiteManagement.getListFromPath(getPath());
+ List pages = SiteManagement.getPagesFromPath(getPath());
return (pages.get(pages.size() - 1)).getImages();
}
Index: ListPagesTag.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/ListPagesTag.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- ListPagesTag.java 7 Jan 2008 15:05:18 - 1.10
+++ ListPagesTag.java 28 Jan 2008 21:15:45 - 1.11
@@ -9,122 +9,18 @@
*/
package com.finalist.cmsc.taglib;
-import java.util.*;
-
-import org.apache.commons.lang.StringUtils;
-
+import com.finalist.cmsc.beans.om.NavigationItem;
import com.finalist.cmsc.beans.om.Page;
-import com.finalist.cmsc.beans.om.Site;
-import com.finalist.cmsc.services.sitemanagement.SiteManagement;
/**
* List the available Pages
*
* @author Wouter Heijke
*/
-public class ListPagesTag extends AbstractListTag {
-
- private static final String MODE_ALL = "all";
- private static final String MODE_HIDDEN = "hidden";
- private static final String MODE_MENU = "menu";
-
- private String mode = MODE_MENU;
-
+public class ListPagesTag extends ListNavigationItemsTag {
@Override
- protected List getList() {
- List pages = null;
- if (origin != null) {
- if (origin instanceof Site) {
-pages = SiteManagement.getPages((Site) origin);
- }
- else if (origin instanceof Page) {
-pages = SiteManagement.getPages((Page) origin);
- }
- }
- else {
- pages = new ArrayList(SiteManagement.getSites());
- }
- if (pages != null) {
- if (MODE_MENU.equalsIgnoreCase(mode)) {
-for (Iterator iter = pages.iterator();
iter.hasNext();) {
- Page page = iter.next();
- if (!page.isInmenu()) {
- iter.remove();
- }
-}
- }
- if (MODE_HIDDEN.equalsIgnoreCase(mode)) {
-for (Iterator iter = pages.iterator();
iter.hasNext();) {
- Page page = iter.next();
- if (page.isInmenu()) {
- iter.remove();
- }
-}
- }
- }
- return pages;
- }
-
-
- public String getMode() {
- return mode;
- }
-
-
- public void setMode(String mode) {
- this.mode = mode;
+protected Class getChildNavigationClass() {
+return Page.class;
}
-
- @Override
- public void setOrigin(Object dest) {
- Page page = null;
- if (dest != null) {
- if (dest instanceof Page) {
-page = (Page) dest;
- }
- else if (dest instanceof Integer) {
-page = getPageInteger((Integer) dest);
- }
- else if (dest instanceof String) {
-page = getPageString((String) dest);
- }
- else {
-throw new IllegalArgumentException("only
[MMBASE CVS] contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/search Search.java SearchService.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/search
In directory
james.mmbase.org:/tmp/cvs-serv26804/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/search
Modified Files:
Search.java SearchService.java
Log Message:
CMSC-755 Navigation code refactored to use navigationitem
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/search
See also: http://www.mmbase.org/jira/browse/CMSC-755
Index: Search.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/search/Search.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- Search.java 7 Jan 2008 15:37:02 - 1.8
+++ Search.java 28 Jan 2008 21:15:45 - 1.9
@@ -116,11 +116,11 @@
}
- public static String getPortletWindow(int pageId, String elementNumber,
String serverName) {
+ public static String getPortletWindow(int pageId, String elementNumber) {
if (cService == null) {
log.info("SearchService not started");
return null;
}
- return cService.getPortletWindow(pageId, elementNumber, serverName);
+ return cService.getPortletWindow(pageId, elementNumber);
}
}
Index: SearchService.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/search/SearchService.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- SearchService.java 7 Jan 2008 15:37:02 - 1.8
+++ SearchService.java 28 Jan 2008 21:15:45 - 1.9
@@ -48,5 +48,5 @@
public abstract Set findDetailContentElementsForPage(Node page);
- public abstract String getPortletWindow(int pageId, String elementNumber,
String serverNames);
+ public abstract String getPortletWindow(int pageId, String elementNumber);
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/taglib/src/webapp/gfx/mimetypes32 rss.gif
Update of /var/cvs/contributions/CMSContainer/cmsc/taglib/src/webapp/gfx/mimetypes32 In directory james.mmbase.org:/tmp/cvs-serv26804/cmsc/taglib/src/webapp/gfx/mimetypes32 Added Files: rss.gif Log Message: CMSC-755 Navigation code refactored to use navigationitem See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/taglib/src/webapp/gfx/mimetypes32 See also: http://www.mmbase.org/jira/browse/CMSC-755 rss.gif is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/page load_page.xml page.xml
Update of /var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/page In directory james.mmbase.org:/tmp/cvs-serv26804/cmsc/sitemanagement/src/webapp/editors/config/page Modified Files: load_page.xml page.xml Log Message: CMSC-755 Navigation code refactored to use navigationitem See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/page See also: http://www.mmbase.org/jira/browse/CMSC-755 Index: load_page.xml === RCS file: /var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/page/load_page.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- load_page.xml 12 Dec 2006 09:38:27 - 1.4 +++ load_page.xml 28 Jan 2008 21:15:44 - 1.5 @@ -15,10 +15,12 @@ - + + \ No newline at end of file Index: page.xml === RCS file: /var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/page/page.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- page.xml12 Jun 2006 13:08:44 - 1.1 +++ page.xml28 Jan 2008 21:15:45 - 1.2 @@ -13,9 +13,11 @@ - + + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/taglib/src/webapp/gfx/mimetypes rss.gif
Update of /var/cvs/contributions/CMSContainer/cmsc/taglib/src/webapp/gfx/mimetypes In directory james.mmbase.org:/tmp/cvs-serv26804/cmsc/taglib/src/webapp/gfx/mimetypes Added Files: rss.gif Log Message: CMSC-755 Navigation code refactored to use navigationitem See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/taglib/src/webapp/gfx/mimetypes See also: http://www.mmbase.org/jira/browse/CMSC-755 rss.gif is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/site site.xml load_site.xml
Update of /var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/site In directory james.mmbase.org:/tmp/cvs-serv26804/cmsc/sitemanagement/src/webapp/editors/config/site Modified Files: site.xml load_site.xml Log Message: CMSC-755 Navigation code refactored to use navigationitem See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/site See also: http://www.mmbase.org/jira/browse/CMSC-755 Index: site.xml === RCS file: /var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/site/site.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- site.xml8 Aug 2007 09:26:33 - 1.2 +++ site.xml28 Jan 2008 21:15:45 - 1.3 @@ -15,9 +15,11 @@ - + + Index: load_site.xml === RCS file: /var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/site/load_site.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -b -r1.6 -r1.7 --- load_site.xml 19 Oct 2007 14:41:45 - 1.6 +++ load_site.xml 28 Jan 2008 21:15:45 - 1.7 @@ -20,10 +20,12 @@ - + + \ No newline at end of file ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/taglib/resources/META-INF/tags feeds.tag
Update of /var/cvs/contributions/CMSContainer/cmsc/taglib/resources/META-INF/tags In directory james.mmbase.org:/tmp/cvs-serv26804/cmsc/taglib/resources/META-INF/tags Added Files: feeds.tag Log Message: CMSC-755 Navigation code refactored to use navigationitem See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/taglib/resources/META-INF/tags See also: http://www.mmbase.org/jira/browse/CMSC-755 feeds.tag is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/portlet PortletTag.java BasicURLTag.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/portlet
In directory
james.mmbase.org:/tmp/cvs-serv26804/cmsc/taglib/src/java/com/finalist/cmsc/taglib/portlet
Modified Files:
PortletTag.java BasicURLTag.java
Log Message:
CMSC-755 Navigation code refactored to use navigationitem
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/portlet
See also: http://www.mmbase.org/jira/browse/CMSC-755
Index: PortletTag.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/portlet/PortletTag.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- PortletTag.java 26 Nov 2007 11:43:41 - 1.6
+++ PortletTag.java 28 Jan 2008 21:15:45 - 1.7
@@ -30,8 +30,7 @@
import org.apache.pluto.om.window.PortletWindow;
import org.apache.pluto.services.information.PortalContextProvider;
-import com.finalist.cmsc.beans.om.Page;
-import com.finalist.cmsc.beans.om.Portlet;
+import com.finalist.cmsc.beans.om.*;
import com.finalist.cmsc.portalImpl.PortalConstants;
import com.finalist.cmsc.services.sitemanagement.SiteManagement;
import com.finalist.cmsc.services.sitemanagement.SiteManagementAdmin;
@@ -121,8 +120,8 @@
boolean mayEditPage = true;
String pageId = (String)
request.getAttribute(PortalConstants.CMSC_OM_PAGE_ID);
if (pageId != null) {
-Page page = SiteManagement.getPage(Integer.valueOf(pageId));
-mayEditPage = SiteManagementAdmin.mayEdit(page);
+NavigationItem item =
SiteManagement.getNavigationItem(Integer.valueOf(pageId));
+mayEditPage = SiteManagementAdmin.mayEdit(item);
}
boolean mayEditPortlet = SiteManagementAdmin.mayEdit(portlet);
Index: BasicURLTag.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/portlet/BasicURLTag.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- BasicURLTag.java26 Nov 2007 11:43:41 - 1.8
+++ BasicURLTag.java28 Jan 2008 21:15:45 - 1.9
@@ -13,7 +13,7 @@
import net.sf.mmapps.commons.util.StringUtil;
-import com.finalist.cmsc.beans.om.Page;
+import com.finalist.cmsc.beans.om.NavigationItem;
import com.finalist.cmsc.mmbase.ResourcesUtil;
import com.finalist.cmsc.navigation.ServerUtil;
import com.finalist.cmsc.services.sitemanagement.SiteManagement;
@@ -159,15 +159,9 @@
public String getLink() {
String link = "";
- Page pageObject;
- try {
- pageObject = SiteManagement.getPage(Integer.parseInt(page));
- }
- catch (NumberFormatException e) {
- pageObject = SiteManagement.getPageFromPath(page);
- }
- if (pageObject != null) {
- link = SiteManagement.getPath(pageObject,
!ServerUtil.useServerName());
+ NavigationItem item = SiteManagement.convertToNavigationItem(page);
+ if (item != null) {
+ link = SiteManagement.getPath(item, !ServerUtil.useServerName());
}
else {
link = page;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/taglib/src/tld cmsc.tld
Update of /var/cvs/contributions/CMSContainer/cmsc/taglib/src/tld In directory james.mmbase.org:/tmp/cvs-serv26804/cmsc/taglib/src/tld Modified Files: cmsc.tld Log Message: CMSC-755 Navigation code refactored to use navigationitem See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/taglib/src/tld See also: http://www.mmbase.org/jira/browse/CMSC-755 Index: cmsc.tld === RCS file: /var/cvs/contributions/CMSContainer/cmsc/taglib/src/tld/cmsc.tld,v retrieving revision 1.30 retrieving revision 1.31 diff -u -b -r1.30 -r1.31 --- cmsc.tld28 Jan 2008 12:38:28 - 1.30 +++ cmsc.tld28 Jan 2008 21:15:45 - 1.31 @@ -78,12 +78,42 @@ +Lists the available navigation items +list-navigations +com.finalist.cmsc.taglib.ListNavigationItemsTag +scriptless + +JSP variable name to put the items in. +var +true +false + + +Navigation item to start listing from +origin +false +true + + +Mode is all, menu, hidden. Default is menu +mode +false +true + + +Type of child navigation items +type +false +true + + + Lists the available pages list-pages com.finalist.cmsc.taglib.ListPagesTag scriptless -JSP variable name to put the page in. +JSP variable name to put the pages in. var true false @@ -1545,6 +1575,10 @@ attachment /META-INF/tags/attachment.tag + +feeds +/META-INF/tags/feeds.tag + function to ceil a int value ceil ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/render HeaderContentTag.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/render
In directory
james.mmbase.org:/tmp/cvs-serv26804/cmsc/taglib/src/java/com/finalist/cmsc/taglib/render
Modified Files:
HeaderContentTag.java
Log Message:
CMSC-755 Navigation code refactored to use navigationitem
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/render
See also: http://www.mmbase.org/jira/browse/CMSC-755
Index: HeaderContentTag.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/render/HeaderContentTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- HeaderContentTag.java 17 Dec 2007 20:30:51 - 1.1
+++ HeaderContentTag.java 28 Jan 2008 21:15:44 - 1.2
@@ -17,8 +17,7 @@
import javax.servlet.jsp.PageContext;
-import com.finalist.cmsc.beans.om.Page;
-import com.finalist.cmsc.beans.om.Site;
+import com.finalist.cmsc.beans.om.*;
import com.finalist.cmsc.portalImpl.headerresource.HeaderResource;
import com.finalist.cmsc.portalImpl.headerresource.LinkHeaderResource;
import com.finalist.cmsc.portalImpl.headerresource.MetaHeaderResource;
@@ -51,13 +50,15 @@
String path = getPath();
Site site = SiteManagement.getSiteFromPath(path);
- Page page = SiteManagement.getPageFromPath(path);
+ NavigationItem item = SiteManagement.getNavigationItemFromPath(path);
if (site != null) {
String siteLanguage = site.getLanguage();
ArrayList headerResources = new
ArrayList();
- headerResources.add(new MetaHeaderResource(false, "description",
page.getDescription(), siteLanguage, null));
+ if (item != null) {
+ headerResources.add(new MetaHeaderResource(false, "description",
item.getDescription(), siteLanguage, null));
+ }
headerResources.add(new MetaHeaderResource(false, "author",
site.getCreator(), siteLanguage, null));
headerResources.add(new MetaHeaderResource(false, "copyright",
site.getRights(), siteLanguage, null));
headerResources.add(new MetaHeaderResource(false, "language",
siteLanguage, null, "language"));
@@ -84,10 +85,12 @@
headerResources.add(new MetaHeaderResource(true, "format",
"text/html"));
headerResources.add(new MetaHeaderResource(true, "type",
"Collection"));
headerResources.add(new MetaHeaderResource(true, "language",
siteLanguage));
-headerResources.add(new MetaHeaderResource(true, "title",
page.getTitle()));
+if (item != null) {
+headerResources.add(new MetaHeaderResource(true, "title",
item.getTitle()));
+headerResources.add(new MetaHeaderResource(true,
"description", item.getDescription()));
+}
headerResources.add(new MetaHeaderResource(true, "creator",
site.getCreator()));
headerResources.add(new MetaHeaderResource(true, "publisher",
site.getPublisher()));
-headerResources.add(new MetaHeaderResource(true, "description",
page.getDescription()));
headerResources.add(new MetaHeaderResource(true, "rights",
site.getRights()));
headerResources.add(new MetaHeaderResource(true, "source",
site.getSource()));
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search SearchServiceMMBaseImpl.java PageInfoComparator.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search
In directory
james.mmbase.org:/tmp/cvs-serv26804/cmsc/search/src/java/com/finalist/cmsc/services/search
Modified Files:
SearchServiceMMBaseImpl.java PageInfoComparator.java
Log Message:
CMSC-755 Navigation code refactored to use navigationitem
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search
See also: http://www.mmbase.org/jira/browse/CMSC-755
Index: SearchServiceMMBaseImpl.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search/SearchServiceMMBaseImpl.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- SearchServiceMMBaseImpl.java7 Jan 2008 22:37:25 - 1.21
+++ SearchServiceMMBaseImpl.java28 Jan 2008 21:15:44 - 1.22
@@ -273,8 +273,9 @@
private PageInfo getPageInfo(Node pageQueryNode, boolean clicktopage) {
- Page page =
SiteManagement.getPage(pageQueryNode.getIntValue(PagesUtil.PAGE + ".number"));
- if (page != null) {
+ NavigationItem item =
SiteManagement.getNavigationItem(pageQueryNode.getIntValue(PagesUtil.PAGE +
".number"));
+ if (item != null && Page.class.isInstance(item)) {
+ Page page = Page.class.cast(item);
String portletWindowName =
pageQueryNode.getStringValue(PortletUtil.PORTLETREL + "."
+ PortletUtil.LAYOUTID_FIELD);
String parameterName =
pageQueryNode.getStringValue(PortletUtil.NODEPARAMETER + "." +
PortletUtil.KEY_FIELD);
@@ -289,12 +290,15 @@
if (portlet != null) {
String pageNumber = portlet.getParameterValue(PAGE);
if (pageNumber != null) {
- page =
SiteManagement.getPage(Integer.valueOf(pageNumber));
+ NavigationItem clickItem =
SiteManagement.getNavigationItem(Integer.valueOf(pageNumber));
+ if (clickItem != null &&
Page.class.isInstance(clickItem)) {
+ page = Page.class.cast(clickItem);
portletWindowName = portlet.getParameterValue(WINDOW);
}
}
}
}
+ }
// Check if a portlet exists on this position
Integer portletId = page.getPortlet(portletWindowName);
if (portletId == -1) {
@@ -418,10 +422,12 @@
if (page != null) {
Cloud cloud = page.getCloud();
- Page pageObject = SiteManagement.getPage(page.getNumber());
- if (pageObject == null) {
+ NavigationItem item =
SiteManagement.getNavigationItem(page.getNumber());
+ if (item == null || !Page.class.isInstance(item)) {
return result;
}
+
+ Page pageObject = Page.class.cast(item);
Collection portlets = pageObject.getPortlets();
for (Integer portletId : portlets) {
Portlet portlet = SiteManagement.getPortlet(portletId);
@@ -499,7 +505,7 @@
@Override
- public String getPortletWindow(int pageId, String elementNumber, String
serverName) {
+ public String getPortletWindow(int pageId, String elementNumber) {
Cloud cloud =
ContextProvider.getDefaultCloudContext().getCloud("mmbase");
Node content = cloud.getNode(elementNumber);
if (ContentElementUtil.isContentElement(content)) {
@@ -509,7 +515,7 @@
}
if (!infos.isEmpty()) {
-Collections.sort(infos, new PageInfoComparator(serverName));
+Collections.sort(infos, new PageInfoComparator());
for (PageInfo pageInfo : infos) {
if (pageId == pageInfo.getPageNumber()) {
return pageInfo.getWindowName();
Index: PageInfoComparator.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search/PageInfoComparator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- PageInfoComparator.java 26 Nov 2007 11:43:45 - 1.4
+++ PageInfoComparator.java 28 Jan 2008 21:15:44 - 1.5
@@ -19,6 +19,10 @@
private String preferredSite;
+ public PageInfoComparator() {
+ // no preferred site
+ }
+
public PageInfoComparator(String serverName) {
this.preferredSite = serverName;
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement SiteCacheLoader.java SiteManagementAdmin.java SiteManagementServiceMMBaseImpl.java SiteM
Update of
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement
In directory
james.mmbase.org:/tmp/cvs-serv26804/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement
Modified Files:
SiteManagementAdmin.java SiteManagementServiceMMBaseImpl.java
SiteManagement.java WorkflowSiteManagementAdminService.java
SiteManagementService.java SiteModelManager.java
SiteManagementAdminServiceMMBaseImpl.java
SiteManagementAdminService.java SiteCache.java
Added Files:
SiteCacheLoader.java
Log Message:
CMSC-755 Navigation code refactored to use navigationitem
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement
See also: http://www.mmbase.org/jira/browse/CMSC-755
SiteCacheLoader.java is new
Index: SiteManagementAdmin.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/SiteManagementAdmin.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- SiteManagementAdmin.java26 Nov 2007 11:43:39 - 1.2
+++ SiteManagementAdmin.java28 Jan 2008 21:15:43 - 1.3
@@ -57,8 +57,8 @@
}
- public static boolean mayEdit(Page page) {
- return cService.mayEdit(page);
+ public static boolean mayEdit(NavigationItem item) {
+ return cService.mayEdit(item);
}
Index: SiteManagementServiceMMBaseImpl.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/SiteManagementServiceMMBaseImpl.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- SiteManagementServiceMMBaseImpl.java7 Jan 2008 20:27:17 -
1.12
+++ SiteManagementServiceMMBaseImpl.java28 Jan 2008 21:15:43 -
1.13
@@ -156,26 +156,13 @@
return sites;
}
-
- @Override
- public List getPages(Page page) {
- if (page != null) {
- List children = siteModelManager.getChildren(page);
- removeInvalidNavigationsFromList(children);
- return children;
- }
- return new ArrayList();
- }
-
-
- @Override
- public List getPages(Site site) {
- if (site != null) {
- List children = siteModelManager.getChildren(site);
+ public List getNavigationItems(NavigationItem
parent, Class childClazz) {
+ if (parent != null) {
+ List children = siteModelManager.getChildren(parent, childClazz);
removeInvalidNavigationsFromList(children);
return children;
}
- return new ArrayList();
+ return new ArrayList();
}
@Override
@@ -190,7 +177,7 @@
@Override
public List getStylesheetForPageByPath(String path, boolean
override) {
- List pagesToRoot = getListFromPath(path);// get all pages to root
+ List pagesToRoot = getPagesFromPath(path);// get all pages to root
List stylesheets = new ArrayList();
Page page = null;
@@ -241,19 +228,19 @@
@Override
- public List getListFromPath(String path) {
- List pagesForPath = siteModelManager.getPagesForPath(path);
+ public List getListFromPath(String path,
Class clazz) {
+ List itemsForPath = siteModelManager.getItemsForPath(path, clazz);
if (ServerUtil.isStaging()) {
- for (Iterator iterator =
pagesForPath.iterator(); iterator.hasNext();) {
- NavigationItem child = iterator.next();
+ for (Iterator iterator = itemsForPath.iterator();
iterator.hasNext();) {
+ E child = iterator.next();
if (!showNavigation(child)) {
-pagesForPath.clear();
+itemsForPath.clear();
break;
}
}
}
- return pagesForPath;
+ return itemsForPath;
}
@@ -264,13 +251,13 @@
@Override
- public String getPath(int pageId, boolean includeRoot) {
- Page page = (Page) siteModelManager.getNavigationItem(pageId);
- if (page == null) {
+ public String getPath(int itemId, boolean includeRoot) {
+ NavigationItem item = siteModelManager.getNavigationItem(itemId);
+ if (item == null) {
return null;
}
else {
- return siteModelManager.getPath(page, includeRoot);
+ return siteModelManager.getPath(item, includeRoot);
}
}
@@ -349,7 +336,7 @@
@Override
public List getPageImagesForPath(String name, String path) {
- List pagesToRoot = getListFromPath(path);// get all pages to root
+ List pagesToRoot = getPagesFromPath(path);// get all pages to root
for (int count = pagesToRoot.size() - 1; count >= 0; count--) {
Page page = pagesToRoot.get(c
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-ecard/src/java/com/finalist/portlets/ecard EcardPortlet.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-ecard/src/java/com/finalist/portlets/ecard
In directory
james.mmbase.org:/tmp/cvs-serv26765/portlets-ecard/src/java/com/finalist/portlets/ecard
Modified Files:
EcardPortlet.java
Log Message:
CMSC-755 Navigation code refactored to use navigationitem
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-ecard/src/java/com/finalist/portlets/ecard
See also: http://www.mmbase.org/jira/browse/CMSC-755
Index: EcardPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-ecard/src/java/com/finalist/portlets/ecard/EcardPortlet.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- EcardPortlet.java 26 Nov 2007 11:42:56 - 1.6
+++ EcardPortlet.java 28 Jan 2008 21:15:31 - 1.7
@@ -34,7 +34,7 @@
import org.mmbase.bridge.Node;
import org.mmbase.bridge.NodeManager;
-import com.finalist.cmsc.beans.om.Page;
+import com.finalist.cmsc.beans.om.NavigationItem;
import com.finalist.cmsc.mmbase.EmailUtil;
import com.finalist.cmsc.mmbase.PropertiesUtil;
import com.finalist.cmsc.navigation.ServerUtil;
@@ -203,8 +203,8 @@
String link = SiteManagement.getPath(pageid,
!ServerUtil.useServerName());
String host = null;
if (ServerUtil.useServerName()) {
- Page page = SiteManagement.getPage(pageid);
- host = SiteManagement.getSite(page);
+ NavigationItem item = SiteManagement.getNavigationItem(pageid);
+ host = SiteManagement.getSite(item);
}
else {
host = servletRequest.getServerName();
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter NewsletterContentPortlet.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter
In directory
james.mmbase.org:/tmp/cvs-serv26765/portlets-newsletter/src/java/com/finalist/portlets/newsletter
Modified Files:
NewsletterContentPortlet.java
Log Message:
CMSC-755 Navigation code refactored to use navigationitem
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter
See also: http://www.mmbase.org/jira/browse/CMSC-755
Index: NewsletterContentPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter/NewsletterContentPortlet.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- NewsletterContentPortlet.java 16 Jan 2008 19:15:18 - 1.13
+++ NewsletterContentPortlet.java 28 Jan 2008 21:15:31 - 1.14
@@ -13,6 +13,7 @@
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
+import com.finalist.cmsc.beans.om.NavigationItem;
import com.finalist.cmsc.beans.om.Page;
import com.finalist.cmsc.portalImpl.PortalConstants;
import com.finalist.cmsc.portlets.AbstractContentPortlet;
@@ -70,15 +71,15 @@
String duplicateHandling = preferences.getValue(DUPLICATE_HANDLING_TYPE,
null);
String currentPath = getUrlPath(request);
- Page result = SiteManagement.getPageFromPath(currentPath);
+ NavigationItem result =
SiteManagement.getNavigationItemFromPath(currentPath);
if (result != null) {
- int pageNumber = result.getId();
+ int itemNumber = result.getId();
- if (NewsletterUtil.isNewsletterOrPublication(pageNumber)) {
+ if (NewsletterUtil.isNewsletterOrPublication(itemNumber)) {
String displayType = determineDisplayType(request);
-int defaultTheme = NewsletterUtil.getDefaultTheme(pageNumber);
+int defaultTheme = NewsletterUtil.getDefaultTheme(itemNumber);
List defaultArticles =
NewsletterUtil.getArticlesForTheme(defaultTheme);
if (defaultArticles != null && defaultArticles.size() > 0) {
request.setAttribute(KEY_DEFAULTTHEME, defaultTheme);
@@ -86,12 +87,12 @@
}
List additionalThemes = null;
-List availableThemes =
NewsletterUtil.getAllThemes(pageNumber);
+List availableThemes =
NewsletterUtil.getAllThemes(itemNumber);
if (availableThemes != null && availableThemes.size() > 0) {
if (displayType.equals(DISPLAYTYPE_PERSONALIZED)) {
String userName = getUserName(session);
if (userName != null) {
- additionalThemes =
NewsletterSubscriptionUtil.compareToUserSubscribedThemes(availableThemes,
userName, pageNumber);
+ additionalThemes =
NewsletterSubscriptionUtil.compareToUserSubscribedThemes(availableThemes,
userName, itemNumber);
}
} else {
additionalThemes = availableThemes;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/css main.css
Update of
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/css
In directory
james.mmbase.org:/tmp/cvs-serv26105/cmsc/edit-webapp/src/webapp/editors/css
Modified Files:
main.css
Log Message:
CMSC-670 removed invalid css attributes. IE behaviour is added by cmsc:head
already
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/css
See also: http://www.mmbase.org/jira/browse/CMSC-670
Index: main.css
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/css/main.css,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- main.css28 Jan 2008 09:11:41 - 1.21
+++ main.css28 Jan 2008 21:01:24 - 1.22
@@ -1,8 +1,7 @@
-???body
+body
{
background-color: #97b7c8;
margin: 0px 4px 0px 7px;
- behavior: url('../css/hover.htc');
}
body, table, div, input
@@ -275,7 +274,6 @@
text-decoration: underline;
margin: 0px 2px 0px 0px;
white-space: nowrap;
- font-color: #00;
}
ul.shortcuts li.images { background-image:
url('../gfx/icons/images.png');}
@@ -341,7 +339,7 @@
-/* contentblocks PAARS */
+/* contentblocks purple */
div.content_block_purple
{
display: block;
@@ -1381,7 +1379,7 @@
visibility: hidden;
position: absolute;
width: 100%;
- text-alignment: center;
+ text-align: center;
}
.dashboard iframe {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] January 78% OFF
___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/util/xml BuilderReader.java
Update of /var/cvs/src/org/mmbase/util/xml
In directory james.mmbase.org:/tmp/cvs-serv22680
Modified Files:
Tag: MMBase-1_8
BuilderReader.java
Log Message:
MMB-1586
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/xml
See also: http://www.mmbase.org/jira/browse/MMB-1586
Index: BuilderReader.java
===
RCS file: /var/cvs/src/org/mmbase/util/xml/BuilderReader.java,v
retrieving revision 1.74.2.7
retrieving revision 1.74.2.8
diff -u -b -r1.74.2.7 -r1.74.2.8
--- BuilderReader.java 27 Jul 2007 14:35:23 - 1.74.2.7
+++ BuilderReader.java 28 Jan 2008 18:44:18 - 1.74.2.8
@@ -18,6 +18,7 @@
import org.mmbase.core.util.Fields;
import org.mmbase.datatypes.*;
import org.mmbase.datatypes.util.xml.DataTypeReader;
+import org.mmbase.datatypes.util.xml.DependencyException;
import org.mmbase.module.core.MMBase;
import org.mmbase.module.core.MMObjectBuilder;
import org.mmbase.storage.util.Index;
@@ -36,7 +37,7 @@
* @author Rico Jansen
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: BuilderReader.java,v 1.74.2.7 2007/07/27 14:35:23 michiel Exp
$
+ * @version $Id: BuilderReader.java,v 1.74.2.8 2008/01/28 18:44:18 michiel Exp
$
*/
public class BuilderReader extends DocumentReader {
@@ -160,8 +161,11 @@
inheritanceResolved = true;
} else {
inheritanceResolved = false;
-if (mmbase != null) {
+if (buildername.equals(getElementAttributeValue("builder",
"name"))) {
+
+} else if (mmbase != null) {
parentBuilder = mmbase.getBuilder(buildername);
+}
inheritanceResolved = (parentBuilder != null);
if (inheritanceResolved) { // fill inputPositions,
searchPositions
Iterator fields =
parentBuilder.getFields(NodeManager.ORDER_EDIT).iterator();
@@ -176,7 +180,6 @@
}
}
}
-}
return inheritanceResolved;
}
@@ -499,6 +502,8 @@
log.info("Found new function " + function + " for builder " +
buil.getTableName());
results.add(function);
+} catch (ClassNotFoundException cnfe) {
+log.warn("No such class " + cnfe.getMessage());
} catch (Throwable e) {
log.error(e.getMessage(), e);
}
@@ -704,7 +709,11 @@
requestedBaseDataType = baseDataType;
}
}
+try {
dataType = (BasicDataType)
DataTypeReader.readDataType(dataTypeElement, requestedBaseDataType,
collector).dataType;
+} catch (DependencyException de) {
+dataType = de.fallback();
+}
if (log.isDebugEnabled()) log.debug("Found datatype " + dataType +
" for field " + fieldName);
}
@@ -900,7 +909,7 @@
* @return the plural names in a Hashtable, accessible by language
*/
public Hashtable getPluralNames() {
-Hashtable results=new Hashtable();
+Hashtable results = new Hashtable();
for (Iterator iter = getChildElements("builder.names","plural");
iter.hasNext(); ) {
Element tmp = (Element)iter.next();
String lang = getElementAttributeValue(tmp,"xml:lang");
@@ -915,7 +924,7 @@
* @return the singular names in a Hashtable, accessible by language
*/
public Hashtable getSingularNames() {
-Hashtable results=new Hashtable();
+Hashtable results = new Hashtable();
for (Iterator iter = getChildElements("builder.names","singular");
iter.hasNext(); ) {
Element tmp = (Element)iter.next();
String lang = getElementAttributeValue(tmp,"xml:lang");
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/datatypes DataTypes.java
Update of /var/cvs/src/org/mmbase/datatypes
In directory james.mmbase.org:/tmp/cvs-serv22620
Modified Files:
Tag: MMBase-1_8
DataTypes.java
Log Message:
MMB-1586
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/datatypes
See also: http://www.mmbase.org/jira/browse/MMB-1586
Index: DataTypes.java
===
RCS file: /var/cvs/src/org/mmbase/datatypes/DataTypes.java,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -u -b -r1.21.2.1 -r1.21.2.2
--- DataTypes.java 10 Aug 2007 14:40:49 - 1.21.2.1
+++ DataTypes.java 28 Jan 2008 18:43:54 - 1.21.2.2
@@ -40,7 +40,7 @@
*
* @author Pierre van Rooden
* @since MMBase-1.8
- * @version $Id: DataTypes.java,v 1.21.2.1 2007/08/10 14:40:49 michiel Exp $
+ * @version $Id: DataTypes.java,v 1.21.2.2 2008/01/28 18:43:54 michiel Exp $
*/
public class DataTypes {
@@ -79,6 +79,17 @@
}
+private static void readFailedDependencies(List failed) {
+ListIterator i = failed.listIterator();
+while(i.hasNext()) {
+DependencyException de = (DependencyException) i.next();
+if (de.retry()) {
+log.debug("Resolved " + de.getId() + " after all");
+i.remove();
+}
+}
+}
+
/**
* Initialize the type handlers defaultly supported by the system, plus
those configured in WEB-INF/config.
*/
@@ -86,6 +97,7 @@
List resources = loader.getResourceList(resource);
if (log.isDebugEnabled()) log.debug("Using " + resources);
ListIterator i = resources.listIterator();
+List failed = new ArrayList();
while (i.hasNext()) i.next();
while (i.hasPrevious()) {
try {
@@ -97,12 +109,21 @@
DocumentBuilder db =
DocumentReader.getDocumentBuilder(true, true, new XMLErrorHandler(), new
XMLEntityResolver(true, DataTypeReader.class));
Document doc = db.parse(dataTypesSource);
Element dataTypesElement = doc.getDocumentElement(); //
fieldtypedefinitons or datatypes element
-DataTypeReader.readDataTypes(dataTypesElement,
dataTypeCollector);
+
failed.addAll(DataTypeReader.readDataTypes(dataTypesElement,
dataTypeCollector));
}
} catch (Exception e) {
log.error(e.getMessage(), e);
}
}
+int previousFailedSize = -1;
+while (failed.size() > 0 && failed.size() > previousFailedSize) {
+previousFailedSize = failed.size();
+log.debug(failed);
+readFailedDependencies(failed);
+}
+if (failed.size() > 0) {
+log.error("Failed " + failed);
+}
if (log.isDebugEnabled()) log.debug(dataTypeCollector.toString());
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/datatypes/util/xml DependencyException.java DataTypeDefinition.java DataTypeReader.java
Update of /var/cvs/src/org/mmbase/datatypes/util/xml
In directory james.mmbase.org:/tmp/cvs-serv22577
Modified Files:
Tag: MMBase-1_8
DataTypeDefinition.java DataTypeReader.java
Added Files:
Tag: MMBase-1_8
DependencyException.java
Log Message:
MMB-1586
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/datatypes/util/xml
See also: http://www.mmbase.org/jira/browse/MMB-1586
DependencyException.java is new
Index: DataTypeDefinition.java
===
RCS file: /var/cvs/src/org/mmbase/datatypes/util/xml/DataTypeDefinition.java,v
retrieving revision 1.55.2.2
retrieving revision 1.55.2.3
diff -u -b -r1.55.2.2 -r1.55.2.3
--- DataTypeDefinition.java 9 Oct 2007 07:16:21 - 1.55.2.2
+++ DataTypeDefinition.java 28 Jan 2008 18:43:28 - 1.55.2.3
@@ -34,7 +34,7 @@
*
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: DataTypeDefinition.java,v 1.55.2.2 2007/10/09 07:16:21
michiel Exp $
+ * @version $Id: DataTypeDefinition.java,v 1.55.2.3 2008/01/28 18:43:28
michiel Exp $
* @since MMBase-1.8
**/
public class DataTypeDefinition {
@@ -123,7 +123,7 @@
/**
* Configures the data type definition, using data from a DOM element
*/
-DataTypeDefinition configure(Element dataTypeElement, BasicDataType
requestBaseDataType) {
+DataTypeDefinition configure(Element dataTypeElement, BasicDataType
requestBaseDataType) throws DependencyException {
String id = DataTypeXml.getAttribute(dataTypeElement, "id");
@@ -149,7 +149,8 @@
}
if (definedBaseDataType == null) {
-log.warn("Attribute 'base' ('" + base + "') of datatype '" +
id + "' is an unknown datatype.");
+log.debug("Attribute 'base' ('" + base + "') of datatype '" +
id + "' is an unknown datatype (in " +
dataTypeElement.getOwnerDocument().getDocumentURI() + ").");
+throw new DependencyException(dataTypeElement,
requestBaseDataType, this);
} else {
requestBaseDataType = definedBaseDataType;
}
Index: DataTypeReader.java
===
RCS file: /var/cvs/src/org/mmbase/datatypes/util/xml/DataTypeReader.java,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -u -b -r1.20 -r1.20.2.1
--- DataTypeReader.java 10 Apr 2006 15:21:37 - 1.20
+++ DataTypeReader.java 28 Jan 2008 18:43:28 - 1.20.2.1
@@ -22,7 +22,7 @@
* This class contains static methods used for reading a 'datatypes' XML into
a DataTypeCollector.
*
* @author Pierre van Rooden
- * @version $Id: DataTypeReader.java,v 1.20 2006/04/10 15:21:37 michiel Exp $
+ * @version $Id: DataTypeReader.java,v 1.20.2.1 2008/01/28 18:43:28 michiel
Exp $
* @since MMBase-1.8
**/
public class DataTypeReader {
@@ -61,15 +61,16 @@
/**
* Initialize the data types default supported by the system.
*/
-public static void readDataTypes(Element dataTypesElement,
DataTypeCollector collector) {
-readDataTypes(dataTypesElement, collector, null);
+public static List readDataTypes(Element dataTypesElement,
DataTypeCollector collector) {
+return readDataTypes(dataTypesElement, collector, null);
}
/**
* Initialize the data types default supported by the system.
*/
-public static void readDataTypes(Element dataTypesElement,
DataTypeCollector collector, BasicDataType baseDataType) {
+public static List readDataTypes(Element dataTypesElement,
DataTypeCollector collector, BasicDataType baseDataType) {
NodeList childNodes = dataTypesElement.getChildNodes();
+List failed = new ArrayList();
for (int k = 0; k < childNodes.getLength(); k++) {
if (childNodes.item(k) instanceof Element) {
Element childElement = (Element) childNodes.item(k);
@@ -90,17 +91,21 @@
}
readDataTypes(childElement, collector, dataType);
}
+} catch (DependencyException de) {
+de.setCollector(collector);
+failed.add(de);
} catch (Exception e) {
log.error("Error while parsing element '" +
org.mmbase.util.xml.XMLWriter.write(childElement, true, true) + "': " +
e.getMessage(), e);
}
}
}
+return failed;
}
/**
* Reads a datatype.
*/
-public static DataTypeDefinition readDataType(Element typeElement,
BasicDataType baseDataType, DataTypeCollector collector) {
+public static DataTypeDefinition readDataType(Element typeElement,
BasicDataType baseDataType, DataTypeCollector collector) throws
DependencyException {
DataTypeDefinition definition = collector.getDataTypeDefinition();
definition.configure(typeElement, b
[MMBASE CVS] contributions/didactor2/src/education/templates/education/wizards/modes educations.jsp whichimage.jsp
Update of
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/modes
In directory james.mmbase.org:/tmp/cvs-serv21091/modes
Modified Files:
educations.jsp whichimage.jsp
Log Message:
converted yet another file to jspx, added some comments about what still should
happen
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/templates/education/wizards/modes
Index: educations.jsp
===
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/modes/educations.jsp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- educations.jsp 28 Jan 2008 16:44:03 - 1.16
+++ educations.jsp 28 Jan 2008 17:24:56 - 1.17
@@ -1,26 +1,29 @@
-<[EMAIL PROTECTED] contentType="application/xml;charset=UTF-8"
-%><[EMAIL PROTECTED] uri="http://www.mmbase.org/mmbase-taglib-2.0"; prefix="mm"
-%><[EMAIL PROTECTED] uri="http://www.didactor.nl/ditaglib_1.0"; prefix="di"
-%><%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions";
-%>
-
-
- String imageName = "";
- String sAltText = "";
-
-
-
-
+http://java.sun.com/JSP/Page";
+ xmlns:fn="http://java.sun.com/jsp/jstl/functions";
+ xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
+ xmlns:di="http://www.didactor.nl/ditaglib_1.0";>
+
+
+
+
+
+
+
-
+
- opleidingen
-
-
-
-
+
+
+
+
@@ -34,7 +37,7 @@
-
+
@@ -49,7 +52,7 @@
-<%// We have to detect the last element %>
+
@@ -77,74 +80,115 @@
- <%// The Education
starts from here %>
+
-<[EMAIL PROTECTED] file="whichimage.jsp"%>
+
-
+
+
+
-&wizard=config/education/educations&objectnumber=&path=" title="" target="text">
-
- <% session.setAttribute("eduname",eduname); %>
+
+ config/education/educations
+
+
+
+
+
+
+
- &number=" target="text">
+
+
+
-
-
-
-
- &wizard=educationslicense&objectnumber=${educationId}"
title="Bewerk licentie" style="font-size: 1em; text-decoration: none">??
-
-
+
+
+
+
+
+
+educationlicense
+
+??
+
+
+
-
+
- <% // We have to count all learnblocks %>
+
- <%-- Registration --%>
-
+
+
- ${educationId}"
title=""
target="text">
+
+
+
+
+
+
+
-
- <%-- I think it is hackery --%>
-
+
+
+
- ${educationId}"
title="" target="text">
+
+
+
+
+
+
[MMBASE CVS] contributions/didactor2/src/education/templates/education/wizards mode.include.jsp
Update of
/var/cvs/contributions/didactor2/src/education/templates/education/wizards
In directory james.mmbase.org:/tmp/cvs-serv21091
Modified Files:
mode.include.jsp
Log Message:
converted yet another file to jspx, added some comments about what still should
happen
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/templates/education/wizards
Index: mode.include.jsp
===
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/mode.include.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- mode.include.jsp4 Jun 2007 11:02:47 - 1.8
+++ mode.include.jsp28 Jan 2008 17:24:56 - 1.9
@@ -14,10 +14,12 @@
delegate
-
+
+
Provider ${provider}
-
+
+
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/education/templates/education/wizards code.jsp
Update of /var/cvs/contributions/didactor2/src/education/templates/education/wizards In directory james.mmbase.org:/tmp/cvs-serv20448 Modified Files: code.jsp Log Message: made reloading work better See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/templates/education/wizards Index: code.jsp === RCS file: /var/cvs/contributions/didactor2/src/education/templates/education/wizards/code.jsp,v retrieving revision 1.107 retrieving revision 1.108 diff -u -b -r1.107 -r1.108 --- code.jsp4 Jun 2007 11:03:32 - 1.107 +++ code.jsp28 Jan 2008 16:44:03 - 1.108 @@ -11,6 +11,7 @@ +0
[MMBASE CVS] contributions/didactor2/src/education/templates/education/wizards/modes educations.jsp
Update of /var/cvs/contributions/didactor2/src/education/templates/education/wizards/modes In directory james.mmbase.org:/tmp/cvs-serv20448/modes Modified Files: educations.jsp Log Message: made reloading work better See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/templates/education/wizards/modes Index: educations.jsp === RCS file: /var/cvs/contributions/didactor2/src/education/templates/education/wizards/modes/educations.jsp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -b -r1.15 -r1.16 --- educations.jsp 24 Jan 2008 16:20:26 - 1.15 +++ educations.jsp 28 Jan 2008 16:44:03 - 1.16 @@ -8,7 +8,7 @@ String imageName = ""; String sAltText = ""; - + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/education/templates/education/wizards index.jsp
Update of /var/cvs/contributions/didactor2/src/education/templates/education/wizards In directory james.mmbase.org:/tmp/cvs-serv20398 Modified Files: index.jsp Log Message: removed some superflous logging See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/templates/education/wizards Index: index.jsp === RCS file: /var/cvs/contributions/didactor2/src/education/templates/education/wizards/index.jsp,v retrieving revision 1.27 retrieving revision 1.28 diff -u -b -r1.27 -r1.28 --- index.jsp 10 Jan 2008 15:08:47 - 1.27 +++ index.jsp 28 Jan 2008 16:43:51 - 1.28 @@ -3,9 +3,7 @@ xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"; xmlns:di="http://www.didactor.nl/ditaglib_1.0";> -hoi - bla ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/datatypes DataTypes.java
Update of /var/cvs/src/org/mmbase/datatypes
In directory james.mmbase.org:/tmp/cvs-serv20157
Modified Files:
DataTypes.java
Log Message:
MMB-1586
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/datatypes
See also: http://www.mmbase.org/jira/browse/MMB-1586
Index: DataTypes.java
===
RCS file: /var/cvs/src/org/mmbase/datatypes/DataTypes.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- DataTypes.java 25 Nov 2007 18:26:23 - 1.26
+++ DataTypes.java 28 Jan 2008 16:31:29 - 1.27
@@ -39,7 +39,7 @@
*
* @author Pierre van Rooden
* @since MMBase-1.8
- * @version $Id: DataTypes.java,v 1.26 2007/11/25 18:26:23 nklasens Exp $
+ * @version $Id: DataTypes.java,v 1.27 2008/01/28 16:31:29 michiel Exp $
*/
public class DataTypes {
@@ -78,6 +78,18 @@
}
+
+private static void readFailedDependencies(List
failed) {
+ListIterator i = failed.listIterator();
+while(i.hasNext()) {
+DependencyException de = i.next();
+if (de.retry()) {
+log.debug("Resolved " + de.getId() + " after all");
+i.remove();
+}
+}
+}
+
/**
* Initialize the type handlers defaultly supported by the system, plus
those configured in WEB-INF/config.
*/
@@ -85,6 +97,7 @@
List resources = loader.getResourceList(resource);
if (log.isDebugEnabled()) log.debug("Using " + resources);
ListIterator i = resources.listIterator();
+List failed = new
ArrayList();
while (i.hasNext()) i.next();
while (i.hasPrevious()) {
try {
@@ -96,12 +109,21 @@
DocumentBuilder db =
DocumentReader.getDocumentBuilder(true, true, new XMLErrorHandler(), new
XMLEntityResolver(true, DataTypeReader.class));
Document doc = db.parse(dataTypesSource);
Element dataTypesElement = doc.getDocumentElement(); //
fieldtypedefinitons or datatypes element
-DataTypeReader.readDataTypes(dataTypesElement,
dataTypeCollector);
+
failed.addAll(DataTypeReader.readDataTypes(dataTypesElement,
dataTypeCollector));
}
} catch (Exception e) {
log.error(e.getMessage(), e);
}
}
+int previousFailedSize = -1;
+while (failed.size() > 0 && failed.size() > previousFailedSize) {
+previousFailedSize = failed.size();
+log.debug(failed);
+readFailedDependencies(failed);
+}
+if (failed.size() > 0) {
+log.error("Failed " + failed);
+}
if (log.isDebugEnabled()) log.debug(dataTypeCollector.toString());
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/framework Setting.java
Update of /var/cvs/src/org/mmbase/framework
In directory james.mmbase.org:/tmp/cvs-serv20083
Modified Files:
Setting.java
Log Message:
MMB-1586
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/framework
See also: http://www.mmbase.org/jira/browse/MMB-1586
Index: Setting.java
===
RCS file: /var/cvs/src/org/mmbase/framework/Setting.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- Setting.java25 Jan 2008 09:37:10 - 1.5
+++ Setting.java28 Jan 2008 16:28:22 - 1.6
@@ -10,6 +10,7 @@
package org.mmbase.framework;
import org.mmbase.datatypes.*;
import org.mmbase.datatypes.util.xml.DataTypeReader;
+import org.mmbase.datatypes.util.xml.DependencyException;
import org.mmbase.util.LocalizedString;
import org.w3c.dom.Element;
@@ -25,7 +26,7 @@
*
*
* @author Michiel Meeuwissen
- * @version $Id: Setting.java,v 1.5 2008/01/25 09:37:10 michiel Exp $
+ * @version $Id: Setting.java,v 1.6 2008/01/28 16:28:22 michiel Exp $
* @since MMBase-1.9
*/
public class Setting {
@@ -46,7 +47,13 @@
parent = component;
Element dataTypeElement = (Element)
element.getElementsByTagName("datatype").item(0);
BasicDataType base =
dataTypeCollector.getDataType(dataTypeElement.getAttribute("base"), true);
-dataType = DataTypeReader.readDataType(dataTypeElement, base,
dataTypeCollector).dataType;
+BasicDataType dt;
+try {
+dt = DataTypeReader.readDataType(dataTypeElement, base,
dataTypeCollector).dataType;
+} catch (DependencyException de) {
+dt = de.fallback();
+}
+dataType = dt;
}
/**
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/util/xml BuilderReader.java
Update of /var/cvs/src/org/mmbase/util/xml
In directory james.mmbase.org:/tmp/cvs-serv20043
Modified Files:
BuilderReader.java
Log Message:
MMB-1586
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/xml
See also: http://www.mmbase.org/jira/browse/MMB-1586
Index: BuilderReader.java
===
RCS file: /var/cvs/src/org/mmbase/util/xml/BuilderReader.java,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- BuilderReader.java 5 Dec 2007 16:30:54 - 1.91
+++ BuilderReader.java 28 Jan 2008 16:28:00 - 1.92
@@ -19,6 +19,7 @@
import org.mmbase.core.util.Fields;
import org.mmbase.datatypes.*;
import org.mmbase.datatypes.util.xml.DataTypeReader;
+import org.mmbase.datatypes.util.xml.DependencyException;
import org.mmbase.module.core.MMBase;
import org.mmbase.module.core.MMObjectBuilder;
import org.mmbase.storage.util.Index;
@@ -37,7 +38,7 @@
* @author Rico Jansen
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: BuilderReader.java,v 1.91 2007/12/05 16:30:54 michiel Exp $
+ * @version $Id: BuilderReader.java,v 1.92 2008/01/28 16:28:00 michiel Exp $
*/
public class BuilderReader extends DocumentReader {
@@ -498,14 +499,17 @@
}
};
}
-Function existing = results.get(functionName);
+
+String key = function.getName();
+Function existing = results.get(key);
+
if (existing != null) {
-log.info("Function " + functionName + " already defined,
will combine it");
+log.info("Function " + key + " already defined, will
combine it");
CombinedFunction cf;
if (existing instanceof CombinedFunction) {
cf = (CombinedFunction) existing;
} else {
-cf = new CombinedFunction(functionName);
+cf = new CombinedFunction(key);
cf.addFunction(existing);
}
cf.addFunction(function);
@@ -515,8 +519,10 @@
NodeFunction nf = NodeFunction.wrap(function);
if (nf != null) function = nf;
-results.put(functionName, function);
+results.put(key, function);
log.debug("functions are now: " + results);
+} catch (ClassNotFoundException cnfe) {
+log.warn(cnfe.getMessage());
} catch (Throwable e) {
log.error(e.getMessage(), e);
}
@@ -727,7 +733,11 @@
requestedBaseDataType = baseDataType;
}
}
+try {
dataType = DataTypeReader.readDataType(dataTypeElement,
requestedBaseDataType, collector).dataType;
+} catch (DependencyException de) {
+dataType = de.fallback();
+}
if (log.isDebugEnabled()) log.debug("Found datatype " + dataType +
" for field " + fieldName);
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/datatypes/util/xml DependencyException.java DataTypeDefinition.java DataTypeReader.java
Update of /var/cvs/src/org/mmbase/datatypes/util/xml
In directory james.mmbase.org:/tmp/cvs-serv19989
Modified Files:
DataTypeDefinition.java DataTypeReader.java
Added Files:
DependencyException.java
Log Message:
MMB-1586
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/datatypes/util/xml
See also: http://www.mmbase.org/jira/browse/MMB-1586
DependencyException.java is new
Index: DataTypeDefinition.java
===
RCS file: /var/cvs/src/org/mmbase/datatypes/util/xml/DataTypeDefinition.java,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- DataTypeDefinition.java 10 Aug 2007 13:05:19 - 1.61
+++ DataTypeDefinition.java 28 Jan 2008 16:27:38 - 1.62
@@ -30,7 +30,7 @@
*
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: DataTypeDefinition.java,v 1.61 2007/08/10 13:05:19 michiel
Exp $
+ * @version $Id: DataTypeDefinition.java,v 1.62 2008/01/28 16:27:38 michiel
Exp $
* @since MMBase-1.8
**/
public class DataTypeDefinition {
@@ -119,7 +119,7 @@
/**
* Configures the data type definition, using data from a DOM element
*/
-DataTypeDefinition configure(Element dataTypeElement, BasicDataType
requestBaseDataType) {
+DataTypeDefinition configure(Element dataTypeElement, BasicDataType
requestBaseDataType) throws DependencyException {
String id = DataTypeXml.getAttribute(dataTypeElement, "id");
@@ -145,7 +145,8 @@
}
if (definedBaseDataType == null) {
-log.warn("Attribute 'base' ('" + base + "') of datatype '" +
id + "' is an unknown datatype.");
+log.debug("Attribute 'base' ('" + base + "') of datatype '" +
id + "' is an unknown datatype (in " +
dataTypeElement.getOwnerDocument().getDocumentURI() + ").");
+throw new DependencyException(dataTypeElement,
requestBaseDataType, this);
} else {
requestBaseDataType = definedBaseDataType;
}
Index: DataTypeReader.java
===
RCS file: /var/cvs/src/org/mmbase/datatypes/util/xml/DataTypeReader.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- DataTypeReader.java 14 Oct 2006 14:35:39 - 1.21
+++ DataTypeReader.java 28 Jan 2008 16:27:38 - 1.22
@@ -9,6 +9,7 @@
*/
package org.mmbase.datatypes.util.xml;
+import java.util.*;
import org.w3c.dom.*;
import org.w3c.dom.NodeList;
@@ -20,7 +21,7 @@
* This class contains static methods used for reading a 'datatypes' XML into
a DataTypeCollector.
*
* @author Pierre van Rooden
- * @version $Id: DataTypeReader.java,v 1.21 2006/10/14 14:35:39 nklasens Exp $
+ * @version $Id: DataTypeReader.java,v 1.22 2008/01/28 16:27:38 michiel Exp $
* @since MMBase-1.8
**/
public class DataTypeReader {
@@ -50,15 +51,17 @@
/**
* Initialize the data types default supported by the system.
*/
-public static void readDataTypes(Element dataTypesElement,
DataTypeCollector collector) {
-readDataTypes(dataTypesElement, collector, null);
+public static List readDataTypes(Element
dataTypesElement, DataTypeCollector collector) {
+return readDataTypes(dataTypesElement, collector, null);
}
/**
* Initialize the data types default supported by the system.
+ * @return a list of failures.
*/
-public static void readDataTypes(Element dataTypesElement,
DataTypeCollector collector, BasicDataType baseDataType) {
+public static List readDataTypes(Element
dataTypesElement, DataTypeCollector collector, BasicDataType baseDataType) {
NodeList childNodes = dataTypesElement.getChildNodes();
+List failed = new
ArrayList();
for (int k = 0; k < childNodes.getLength(); k++) {
if (childNodes.item(k) instanceof Element) {
Element childElement = (Element) childNodes.item(k);
@@ -79,17 +82,21 @@
}
readDataTypes(childElement, collector, dataType);
}
+} catch (DependencyException de) {
+de.setCollector(collector);
+failed.add(de);
} catch (Exception e) {
log.error("Error while parsing element '" +
org.mmbase.util.xml.XMLWriter.write(childElement, true, true) + "': " +
e.getMessage(), e);
}
}
}
+return failed;
}
/**
* Reads a datatype.
*/
-public static DataTypeDefinition readDataType(Element typeElement,
BasicDataType baseDataType, DataTypeCollector collector) {
+public static DataTypeDefinition readDataType(Element typeElement,
BasicDataType baseDataType, DataTypeCollector collector) throws
DependencyException {
DataTypeDefinition definitio
[MMBASE CVS] contributions/didactor2/src/core/config datatypes.xml
Update of /var/cvs/contributions/didactor2/src/core/config In directory james.mmbase.org:/tmp/cvs-serv17510 Added Files: datatypes.xml Log Message: defining some didactor specific datatypes, which can more easily be overrided than an entire builder xml See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/core/config datatypes.xml is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/education/config/builders/didactor_education fillquestions.xml pages.xml
Update of /var/cvs/contributions/didactor2/src/education/config/builders/didactor_education In directory james.mmbase.org:/tmp/cvs-serv17428 Modified Files: fillquestions.xml pages.xml Log Message: more cleaning See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/config/builders/didactor_education Index: fillquestions.xml === RCS file: /var/cvs/contributions/didactor2/src/education/config/builders/didactor_education/fillquestions.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- fillquestions.xml 26 Jan 2008 12:40:05 - 1.2 +++ fillquestions.xml 28 Jan 2008 14:35:33 - 1.3 @@ -4,7 +4,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://www.mmbase.org/xmlns/builder http://www.mmbase.org/xmlns/builder.xsd"; name="fillquestions" maintainer="didactor.nl" version="2" extends="questions"> - nl.didactor.education.builders.OpenQuestionBuilder> + + nl.didactor.education.builders.OpenQuestionBuilder Fill Vraag Fill Question @@ -17,7 +18,6 @@ An open question, where the user can write his own answer - @@ -35,6 +35,7 @@ + Tekst van de vraag @@ -49,6 +50,7 @@ + Positie afbeelding @@ -70,16 +72,14 @@ + Kies flash of tekst Choose flash file or text - -flashOrText - http://www.mmbase.org/xmlns/datatypes"; > - + @@ -88,6 +88,6 @@ + - Index: pages.xml === RCS file: /var/cvs/contributions/didactor2/src/education/config/builders/didactor_education/pages.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- pages.xml 26 Jan 2008 12:40:05 - 1.2 +++ pages.xml 28 Jan 2008 14:35:33 - 1.3 @@ -52,36 +52,16 @@ http://www.mmbase.org/xmlns/datatypes"; /> - + - Layout afbeeldingen Images layout - Layout afbeeldingen Images layout -integer - - - - - 2 - - 2 - - 2 - - - - - -imagelayout - -INTEGER - + http://www.mmbase.org/xmlns/datatypes"; /> ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/core/config/builders/didactor_core educations.xml people.xml
Update of /var/cvs/contributions/didactor2/src/core/config/builders/didactor_core In directory james.mmbase.org:/tmp/cvs-serv17337 Modified Files: educations.xml people.xml Log Message: more cleaning See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/core/config/builders/didactor_core Index: educations.xml === RCS file: /var/cvs/contributions/didactor2/src/core/config/builders/didactor_core/educations.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- educations.xml 18 Oct 2007 14:40:04 - 1.2 +++ educations.xml 28 Jan 2008 14:35:12 - 1.3 @@ -6,7 +6,7 @@ name="educations" maintainer="didactor.nl" version="3" extends="object"> nl.didactor.builders.DidactorBuilder - -1 + 10 Opleiding @@ -21,7 +21,6 @@ -9 path,name @@ -41,25 +40,24 @@ 1 - http://www.mmbase.org/xmlns/datatypes"; /> - -STRING - + http://www.mmbase.org/xmlns/datatypes";> + + + -Introtekst +Introtekst, te gebruiken als 'description' Introductionary text Intro Intro - http://www.mmbase.org/xmlns/datatypes"; /> - -STRING - + http://www.mmbase.org/xmlns/datatypes";> + + @@ -76,10 +74,10 @@ 3 - http://www.mmbase.org/xmlns/datatypes"; /> - -STRING - + http://www.mmbase.org/xmlns/datatypes";> + + + @@ -96,7 +94,9 @@ 2 - http://www.mmbase.org/xmlns/datatypes"; /> + http://www.mmbase.org/xmlns/datatypes";> + + @@ -113,9 +113,7 @@ 2 - http://www.mmbase.org/xmlns/datatypes";> - - + http://www.mmbase.org/xmlns/datatypes"; /> @@ -127,11 +125,10 @@ Layout afbeeldingen Images layout - http://www.mmbase.org/xmlns/datatypes";> - - + http://www.mmbase.org/xmlns/datatypes"; /> + Index: people.xml === RCS file: /var/cvs/contributions/didactor2/src/core/config/builders/didactor_core/people.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -b -r1.11 -r1.12 --- people.xml 10 Jan 2008 15:57:45 - 1.11 +++ people.xml 28 Jan 2008 14:35:12 - 1.12 @@ -106,11 +106,7 @@ 3 - http://www.mmbase.org/xmlns/datatypes";> - - - - + http://www.mmbase.org/xmlns/datatypes"; /> @@ -179,14 +175,7 @@ ?? Lando - http://www.mmbase.org/xmlns/datatypes"; > - - - - - - + http://www.mmbase.org/xmlns/datatypes"; /> @@ -236,10 +225,7 @@ ???-? Retadreso - http://www.mmbase.org/xmlns/datatypes";> - - - + http://www.mmbase.org/xmlns/datatypes"; /> @@ -288,19 +274,7 @@ Age Leeftijd - http://www.mmbase.org/xmlns/datatypes";> - - - -dayofbirth - - - - -dayofbirth - - - + http://www.mmbase.org/xmlns/datatypes"; /> ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow HasPageTag.java TreeHasPageTag.java
Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow
In directory james.mmbase.org:/tmp/cvs-serv16588
Modified Files:
HasPageTag.java TreeHasPageTag.java
Log Message:
like mm:treeinclude made treehaspage fall beack to normal including
See also:
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow
Index: HasPageTag.java
===
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow/HasPageTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- HasPageTag.java 10 Feb 2007 16:49:27 - 1.2
+++ HasPageTag.java 28 Jan 2008 13:52:32 - 1.3
@@ -14,6 +14,7 @@
import java.net.*;
import java.io.*;
import javax.servlet.jsp.JspTagException;
+import javax.servlet.jsp.PageContext;
import javax.servlet.http.*;
import org.mmbase.util.*;
import org.mmbase.util.logging.Logger;
@@ -22,7 +23,7 @@
/**
*
* @author Michiel Meeuwissen
- * @version $Id: HasPageTag.java,v 1.2 2007/02/10 16:49:27 nklasens Exp $
+ * @version $Id: HasPageTag.java,v 1.3 2008/01/28 13:52:32 michiel Exp $
* @since MMBase-1.8
*/
@@ -43,13 +44,8 @@
return inverse.getBoolean(this, false);
}
-
-
-public int doStartTag() throws JspTagException {
-if (page == Attribute.NULL) {
-throw new JspTagException("Attribute 'page' was not specified");
-}
-String resource = page.getString(this);
+protected static String getResource(PageContext pageContext, String page) {
+String resource = page;
if (! resource.startsWith("/")) {
HttpServletRequest request =
(HttpServletRequest)pageContext.getRequest();
// Fetch the current servlet from request attribute.
@@ -70,6 +66,15 @@
}
}
+return resource;
+}
+
+
+public int doStartTag() throws JspTagException {
+if (page == Attribute.NULL) {
+throw new JspTagException("Attribute 'page' was not specified");
+}
+String resource = getResource(pageContext, page.getString(this));
try {
if
(ResourceLoader.getWebRoot().getResource(resource).openConnection().getDoInput()
!= getInverse()) {
return EVAL_BODY;
Index: TreeHasPageTag.java
===
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow/TreeHasPageTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- TreeHasPageTag.java 24 Jan 2008 16:48:05 - 1.3
+++ TreeHasPageTag.java 28 Jan 2008 13:52:32 - 1.4
@@ -27,7 +27,7 @@
/**
*
* @author Michiel Meeuwissen
- * @version $Id: TreeHasPageTag.java,v 1.3 2008/01/24 16:48:05 michiel Exp $
+ * @version $Id: TreeHasPageTag.java,v 1.4 2008/01/28 13:52:32 michiel Exp $
* @since MMBase-1.8.6
*/
@@ -68,6 +68,10 @@
String treePage = th.findTreeFile(page.getString(this),
objectList.getString(this), pageContext.getSession());
log.debug("Testing " + treePage);
boolean has = treePage != null && ! "".equals(treePage) &&
ResourceLoader.getWebRoot().getResource(treePage).openConnection().getDoInput();
+if (! has) {
+String resource = HasPageTag.getResource(pageContext,
page.getString(this));
+has =
ResourceLoader.getWebRoot().getResource(resource).openConnection().getDoInput();
+}
if (has != getInverse()){
return EVAL_BODY;
} else {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow HasPageTag.java TreeHasPageTag.java
Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow
In directory james.mmbase.org:/tmp/cvs-serv16512
Modified Files:
Tag: MMBase-1_8
HasPageTag.java TreeHasPageTag.java
Log Message:
like mm:treeinclude made treehaspage fall beack to normal including
See also:
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow
Index: HasPageTag.java
===
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow/HasPageTag.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- HasPageTag.java 18 Oct 2005 16:42:34 - 1.1
+++ HasPageTag.java 28 Jan 2008 13:50:20 - 1.1.2.1
@@ -14,6 +14,7 @@
import java.net.*;
import java.io.*;
import javax.servlet.jsp.JspTagException;
+import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.BodyContent;
import javax.servlet.http.*;
import javax.servlet.*;
@@ -27,7 +28,7 @@
/**
*
* @author Michiel Meeuwissen
- * @version $Id: HasPageTag.java,v 1.1 2005/10/18 16:42:34 michiel Exp $
+ * @version $Id: HasPageTag.java,v 1.1.2.1 2008/01/28 13:50:20 michiel Exp $
* @since MMBase-1.8
*/
@@ -48,13 +49,8 @@
return inverse.getBoolean(this, false);
}
-
-
-public int doStartTag() throws JspTagException {
-if (page == Attribute.NULL) {
-throw new JspTagException("Attribute 'page' was not specified");
-}
-String resource = page.getString(this);
+protected static String getResource(PageContext pageContext, String page) {
+String resource = page;
if (! resource.startsWith("/")) {
HttpServletRequest request =
(HttpServletRequest)pageContext.getRequest();
// Fetch the current servlet from request attribute.
@@ -75,6 +71,14 @@
}
}
+return resource;
+}
+
+public int doStartTag() throws JspTagException {
+if (page == Attribute.NULL) {
+throw new JspTagException("Attribute 'page' was not specified");
+}
+String resource = getResource(pageContext, page.getString(this));
try {
if
(ResourceLoader.getWebRoot().getResource(resource).openConnection().getDoInput()
!= getInverse()) {
return EVAL_BODY;
Index: TreeHasPageTag.java
===
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow/TreeHasPageTag.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- TreeHasPageTag.java 24 Jan 2008 16:47:44 - 1.1.2.2
+++ TreeHasPageTag.java 28 Jan 2008 13:50:20 - 1.1.2.3
@@ -27,7 +27,7 @@
/**
*
* @author Michiel Meeuwissen
- * @version $Id: TreeHasPageTag.java,v 1.1.2.2 2008/01/24 16:47:44 michiel Exp
$
+ * @version $Id: TreeHasPageTag.java,v 1.1.2.3 2008/01/28 13:50:20 michiel Exp
$
* @since MMBase-1.8.6
*/
@@ -68,6 +68,10 @@
String treePage = th.findTreeFile(page.getString(this),
objectList.getString(this), pageContext.getSession());
log.debug("Testing " + treePage);
boolean has = treePage != null && ! "".equals(treePage) &&
ResourceLoader.getWebRoot().getResource(treePage).openConnection().getDoInput();
+if (! has) {
+String resource = HasPageTag.getResource(pageContext,
page.getString(this));
+has =
ResourceLoader.getWebRoot().getResource(resource).openConnection().getDoInput();
+}
if (has != getInverse()){
return EVAL_BODY;
} else {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/taglib/src/tld cmsc.tld
Update of /var/cvs/contributions/CMSContainer/cmsc/taglib/src/tld In directory james.mmbase.org:/tmp/cvs-serv14734/cmsc/taglib/src/tld Modified Files: cmsc.tld Log Message: Added a function to the link tag to restrict searching for a given portlet to the current page. See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/taglib/src/tld Index: cmsc.tld === RCS file: /var/cvs/contributions/CMSContainer/cmsc/taglib/src/tld/cmsc.tld,v retrieving revision 1.29 retrieving revision 1.30 diff -u -b -r1.29 -r1.30 --- cmsc.tld21 Jan 2008 12:35:50 - 1.29 +++ cmsc.tld28 Jan 2008 12:38:28 - 1.30 @@ -445,6 +445,12 @@ false false + +Look only on the page tree or not. +restrictToCurrentPage +false +false + Tag to add a param to the surrounding link tag ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/navigation LinkTag.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/navigation
In directory
james.mmbase.org:/tmp/cvs-serv14734/cmsc/taglib/src/java/com/finalist/cmsc/taglib/navigation
Modified Files:
LinkTag.java
Log Message:
Added a function to the link tag to restrict searching for a given portlet to
the current page.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/navigation
Index: LinkTag.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/navigation/LinkTag.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- LinkTag.java11 Jan 2008 10:22:17 - 1.15
+++ LinkTag.java28 Jan 2008 12:38:28 - 1.16
@@ -44,6 +44,7 @@
private String window;
private String urlfragment;
private String portletdefinition;
+ private boolean restrictToCurrentPage;
/**
* Parameters added by nested param tag
@@ -126,6 +127,19 @@
private void setPageAndWindowBasedOnPortletDefinition(String path, String
portletdefinition) {
List pages = SiteManagement.getListFromPath(path);
int lastIndexOfPages = pages.size() - 1;
+
+ if (restrictToCurrentPage) {
+ if(lastIndexOfPages >= 0) {
+Page currentPage = pages.get(lastIndexOfPages);
+String portletPosition =
getPortletPositionWithDefinition(currentPage, portletdefinition);
+if (portletPosition != null) {
+ window = portletPosition;
+ page = currentPage;
+}
+ }
+ return;
+ }
+
for (int i = lastIndexOfPages; i >= 0; i--) {
Page currentPage = pages.get(i);
String portletPosition =
getPortletPositionWithDefinition(currentPage, portletdefinition);
@@ -267,6 +281,10 @@
this.portletdefinition = portletdefinition;
}
+ public void setRestrictToCurrentPage(boolean restrictToCurrentPage) {
+ this.restrictToCurrentPage = restrictToCurrentPage;
+ }
+
public void setWindow(String window) {
this.window = window;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors searchpage.jsp pages.jsp
Update of
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors
In directory
james.mmbase.org:/tmp/cvs-serv10450/cmsc/edit-webapp/src/webapp/editors
Modified Files:
pages.jsp
Added Files:
searchpage.jsp
Log Message:
fix.search pageing and normal paging works in different way,it is pity that
search pageing can not share same page.jsp with normal paging,we have to make a
duplicate copy for search paging.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors
searchpage.jsp is new
Index: pages.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/pages.jsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- pages.jsp 17 Jan 2008 12:55:24 - 1.9
+++ pages.jsp 28 Jan 2008 09:37:14 - 1.10
@@ -28,7 +28,7 @@
var inputValue = document.getElementById(targetfield).value;
var re = new RegExp("^[1-9][0-9]*$");
- if (re.test(inputValue) && inputValue <= Math.ceil(${maxPage})) {
+ if (re.test(inputValue) && inputValue <= Math.ceil(${pagessize})) {
var url = "?status=&offset=" + (inputValue - 1) + "&orderby=" +
"${extraparams}";
window.location.href = url;
} else {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository searchpages.jsp
Update of /var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository In directory james.mmbase.org:/tmp/cvs-serv10450/cmsc/contentrepository/src/webapp/editors/repository Modified Files: searchpages.jsp Log Message: fix.search pageing and normal paging works in different way,it is pity that search pageing can not share same page.jsp with normal paging,we have to make a duplicate copy for search paging. See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository Index: searchpages.jsp === RCS file: /var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/searchpages.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- searchpages.jsp 27 Dec 2007 02:25:47 - 1.4 +++ searchpages.jsp 28 Jan 2008 09:37:14 - 1.5 @@ -14,4 +14,4 @@ -<%@ include file="../pages.jsp" %> \ No newline at end of file +<%@ include file="../searchpage.jsp" %> \ No newline at end of file ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/css main.css
Update of
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/css
In directory
james.mmbase.org:/tmp/cvs-serv9964/cmsc/edit-webapp/src/webapp/editors/css
Modified Files:
main.css
Log Message:
CMSC-471 modify build script.function finised.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/css
See also: http://www.mmbase.org/jira/browse/CMSC-471
Index: main.css
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/css/main.css,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- main.css18 Jan 2008 11:21:29 - 1.20
+++ main.css28 Jan 2008 09:11:41 - 1.21
@@ -1,4 +1,4 @@
-body
+body
{
background-color: #97b7c8;
margin: 0px 4px 0px 7px;
@@ -317,6 +317,7 @@
ul.shortcuts li.visitor{
background-image: url('../gfx/icons/visitor.png');}
ul.shortcuts li.messageoftheday{ background-image:
url('../gfx/icons/messageoftheday.png');}
ul.shortcuts li.admindashboard { background-image:
url('../gfx/icons/admindashboard.png');}
+ul.shortcuts li.openoffice {
background-image: url('../gfx/icons/down.png');}
div.side_block div.body
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/openofficeintegration project.xml
Update of /var/cvs/contributions/CMSContainer_Modules/openofficeintegration In directory james.mmbase.org:/tmp/cvs-serv9896/openofficeintegration Modified Files: project.xml Log Message: CMSC-471 modify build script.function finised. See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/openofficeintegration See also: http://www.mmbase.org/jira/browse/CMSC-471 Index: project.xml === RCS file: /var/cvs/contributions/CMSContainer_Modules/openofficeintegration/project.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- project.xml 21 Jan 2008 06:00:47 - 1.1 +++ project.xml 28 Jan 2008 09:11:26 - 1.2 @@ -11,5 +11,16 @@ cmsc-modules-openofficeintegration CMS OpenOffice Integration CMS OpenOffice Integration + + + + src/java + + **/*.xsl + + + + + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository content.jsp
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
In directory
james.mmbase.org:/tmp/cvs-serv9964/cmsc/contentrepository/src/webapp/editors/repository
Modified Files:
content.jsp
Log Message:
CMSC-471 modify build script.function finised.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
See also: http://www.mmbase.org/jira/browse/CMSC-471
Index: content.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.jsp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- content.jsp 22 Jan 2008 10:26:23 - 1.17
+++ content.jsp 28 Jan 2008 09:11:41 - 1.18
@@ -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" %>
<%@ page import="com.finalist.cmsc.repository.RepositoryUtil" %>
<%@ page import="com.finalist.cmsc.security.*" %>
@@ -151,7 +151,7 @@
alt=""
title=""/>
');"
- title="">">"
alt=""/>
<% if (role != null && SecurityUtil.isWriter(role)) { %>
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/openofficeintegration/src/java/com/finalist/cmsc/openoffice/forms OODocUploadAction.java OODocStoreAction.java
Update of
/var/cvs/contributions/CMSContainer_Modules/openofficeintegration/src/java/com/finalist/cmsc/openoffice/forms
In directory
james.mmbase.org:/tmp/cvs-serv9896/openofficeintegration/src/java/com/finalist/cmsc/openoffice/forms
Modified Files:
OODocUploadAction.java OODocStoreAction.java
Log Message:
CMSC-471 modify build script.function finised.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/openofficeintegration/src/java/com/finalist/cmsc/openoffice/forms
See also: http://www.mmbase.org/jira/browse/CMSC-471
Index: OODocUploadAction.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/openofficeintegration/src/java/com/finalist/cmsc/openoffice/forms/OODocUploadAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- OODocUploadAction.java 22 Jan 2008 10:26:12 - 1.2
+++ OODocUploadAction.java 28 Jan 2008 09:11:26 - 1.3
@@ -1,45 +1,43 @@
package com.finalist.cmsc.openoffice.forms;
-import com.finalist.cmsc.openoffice.model.OdtDocument;
-import com.finalist.cmsc.openoffice.service.OODocUploadUtil;
-import org.apache.commons.lang.StringUtils;
+import java.io.File;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.mmbase.bridge.Cloud;
-import javax.servlet.http.HttpServletRequest;
-
-import java.io.File;
-import java.util.List;
+import com.finalist.cmsc.openoffice.model.OdtDocument;
+import com.finalist.cmsc.openoffice.service.OODocUploadUtil;
public class OODocUploadAction extends OpenOfficeIntegrationBaseAction {
private static Log log = LogFactory.getLog(OODocUploadAction.class);
@Override
-public ActionForward execute(ActionMapping mapping, HttpServletRequest
request, Cloud cloud) throws Exception {
+ public ActionForward execute(ActionMapping mapping,
+ HttpServletRequest request, Cloud cloud) throws
Exception {
// TODO Auto-generated method stub
-String dir = servlet.getServletContext().getRealPath("/") +
OODocUploadUtil.TEMP_PATH;
OODocUploadUtil docUpload = OODocUploadUtil.getInstance();
-boolean isOdtDoc = docUpload.upload(request, dir);
+ boolean isOdtDoc = docUpload.upload(request,
getBaseStoreLocation());
-/**channel number**/
+ /** channel number* */
String channel = docUpload.getChannel();
-if (StringUtils.isBlank(channel) || channel.equals("null"))
-channel = docUpload.getChannelbak();
-request.setAttribute("dir", dir);
-
-//save channel number at client
+ addToRequest(request, "dir", getBaseStoreLocation());
+ // save channel number at client
addToRequest(request, "parent", channel);
-List odts = docUpload.getOdtDocuments(dir+ File.separator
+ channel);
+ List odts =
docUpload.getOdtDocuments(getOdtFileStoreLocation(getBaseStoreLocation(),channel));
request.setAttribute("binaries", odts);
request.setAttribute("odtDoc", isOdtDoc);
-String forwardPath =
mapping.findForward(SUCCESS).getPath()+"?parent"+channel;
+ String forwardPath = mapping.findForward(SUCCESS).getPath() +
"?parent"
+ + channel;
return new ActionForward(forwardPath);
}
Index: OODocStoreAction.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/openofficeintegration/src/java/com/finalist/cmsc/openoffice/forms/OODocStoreAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- OODocStoreAction.java 22 Jan 2008 10:26:12 - 1.2
+++ OODocStoreAction.java 28 Jan 2008 09:11:26 - 1.3
@@ -26,8 +26,7 @@
/*retrieve channel number*/
String channelId = getChannelId(request);
-if(StringUtils.isEmpty(channelId) && request.getParameter("root") !=
null)
-{
+if(StringUtils.isEmpty(channelId) && request.getParameter("root") !=
null) {
channelId = OODocUploadUtil.SINGLE_FILE_PATH;
}
@@ -37,12 +36,13 @@
if (StringUtils.isEmpty(channelId)) {
channelId = RepositoryUtil.getRoot(cloud);
}
-if(request.getParameter("root") != null)
-{
- channelId = request.getParameter("root");
+if(request.getParameter("root") != null) {
+ channelId = request.getParameter("root");
}
-int nodenumber = store(cloud, odtStoreLocation, channelId,"");
+String requestContext =
r
[MMBASE CVS] contributions/CMSContainer_Modules/openofficeintegration/src/webapp/editors/repository uploadodt.jsp
Update of /var/cvs/contributions/CMSContainer_Modules/openofficeintegration/src/webapp/editors/repository In directory james.mmbase.org:/tmp/cvs-serv9896/openofficeintegration/src/webapp/editors/repository Modified Files: uploadodt.jsp Log Message: CMSC-471 modify build script.function finised. See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/openofficeintegration/src/webapp/editors/repository See also: http://www.mmbase.org/jira/browse/CMSC-471 Index: uploadodt.jsp === RCS file: /var/cvs/contributions/CMSContainer_Modules/openofficeintegration/src/webapp/editors/repository/uploadodt.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- uploadodt.jsp 22 Jan 2008 10:26:11 - 1.3 +++ uploadodt.jsp 28 Jan 2008 09:11:25 - 1.4 @@ -1,29 +1,29 @@ -<%@ page language="java" contentType="text/html;charset=utf-8" %> -<%@ include file="globals.jsp" %> -<%@ page import="com.finalist.util.http.BulkUploadUtil,com.finalist.cmsc.openoffice.service.OODocUploadUtil" %> +<[EMAIL PROTECTED] language="java" contentType="text/html;charset=utf-8"%> +<[EMAIL PROTECTED] file="globals.jsp" %> +<[EMAIL PROTECTED] import="com.finalist.util.http.BulkUploadUtil,com.finalist.cmsc.openoffice.service.OODocUploadUtil"%> http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> - +
[MMBASE CVS] contributions/CMSContainer_Modules/openofficeintegration/src/java/com/finalist/cmsc/openoffice/service ResolveDTD.java OODocUploadUtil.java OutFinishHtml.java transform.xsl OdtFileTranst
Update of
/var/cvs/contributions/CMSContainer_Modules/openofficeintegration/src/java/com/finalist/cmsc/openoffice/service
In directory
james.mmbase.org:/tmp/cvs-serv9896/openofficeintegration/src/java/com/finalist/cmsc/openoffice/service
Modified Files:
ResolveDTD.java OODocUploadUtil.java OutFinishHtml.java
transform.xsl OdtFileTranster.java Parserfactory.java
ChangeHtml.java ChangeContentXml.java
Log Message:
CMSC-471 modify build script.function finised.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/openofficeintegration/src/java/com/finalist/cmsc/openoffice/service
See also: http://www.mmbase.org/jira/browse/CMSC-471
Index: ResolveDTD.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/openofficeintegration/src/java/com/finalist/cmsc/openoffice/service/ResolveDTD.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ResolveDTD.java 21 Jan 2008 07:35:30 - 1.1
+++ ResolveDTD.java 28 Jan 2008 09:11:25 - 1.2
@@ -7,14 +7,12 @@
public class ResolveDTD implements EntityResolver {
public InputSource resolveEntity (String publicId, String systemId)
{
-if (systemId.endsWith(".dtd"))
-{
+if (systemId.endsWith(".dtd")){
StringReader stringInput =
new StringReader(" ");
return new InputSource(stringInput);
}
-else
-{
+else{
return null;// default behavior
}
}
Index: OODocUploadUtil.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/openofficeintegration/src/java/com/finalist/cmsc/openoffice/service/OODocUploadUtil.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- OODocUploadUtil.java22 Jan 2008 10:26:11 - 1.2
+++ OODocUploadUtil.java28 Jan 2008 09:11:25 - 1.3
@@ -2,7 +2,6 @@
import java.io.BufferedOutputStream;
import java.io.File;
-import java.io.FileFilter;
import java.io.FileOutputStream;
import java.io.FilenameFilter;
import java.io.IOException;
@@ -43,9 +42,9 @@
// set max size allowed
private static final int MAXSIZE = 16 * 1024 * 1024;
-private static final String OPENOFFICE_ODT_MIME_TYPES[] = new String[]{
+ private static final String OPENOFFICE_ODT_MIME_TYPES[] = new String[] {
"application/vnd.oasis.opendocument.text",
-"application/x-vnd.oasis.opendocument.text"};
+ "application/x-vnd.oasis.opendocument.text" };
private static final int INITIAL_CAPACITY = 10;
@@ -53,14 +52,9 @@
private String channel;
-private String channelbak;
-
private static final String CHANNEL_KEY = "channel";
-private static final String CHANNELBAK_KEY = "channelbak";
-
public static final String NODE_NUMBER = "node.number";
-//private static OODocUploadUtil docUploadUtil;
private OODocUploadUtil() {
}
@@ -77,9 +71,9 @@
return channel;
}
-public String getChannelbak() {
-return channelbak;
-}
+ // public String getChannelbak() {
+ // return channelbak;
+ // }
/**
* openoffice odt doc and put it in cache
@@ -99,7 +93,7 @@
if (StringUtils.isBlank(realPath))
realPath = dir;
-realPath += File.separator + getChannelId();
+ realPath += File.separator + channel;
if (realPath.endsWith("null"))
realPath = realPath.substring(0, realPath.length() - 5);
@@ -116,7 +110,6 @@
log.debug("contentType: " + binary.getContentType());
}
-
if (!isOdtFile(binary))
return false;
persistOdtDoc(binary, realPath);
@@ -124,13 +117,10 @@
return true;
}
-private String getChannelId() {
-return StringUtils.isEmpty(channel) || "null".equals(channel) ?
channelbak : channel;
-}
-
-// private static void addRelToWorkFlow(WorkflowService service, Node
node) {
-// service.create(node, null);
-// }
+ // private static void addRelToWorkFlow(WorkflowService service, Node
node)
+ // {
+ // service.create(node, null);
+ // }
private static synchronized void persistOdtDoc(
UploadUtil.BinaryData binary, String dir) throws IOException,
@@ -143,7 +133,8 @@
File file = new File(directory.getCanonicalPath() + File.separator
+ binary.getOriginalFileName());
if (!file.createNewFile()) {
-log.warn(" create empty file error while openoffice odt
document!");
+ log
+ .warn(" create empty file error while
openoffice odt d
