date:20080428

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util NewsletterPublicationUtil.java NewsletterUtil.java

2008-04-28 Thread kevinshen

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
In directory james.mmbase.org:/tmp/cvs-serv11719

Modified Files:
NewsletterPublicationUtil.java NewsletterUtil.java 
Log Message:
CMSC-711,Customized search option for edit-wizard,


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
See also: http://www.mmbase.org/jira/browse/CMSC-711


Index: NewsletterPublicationUtil.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterPublicationUtil.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- NewsletterPublicationUtil.java  29 Apr 2008 03:52:49 -  1.19
+++ NewsletterPublicationUtil.java  29 Apr 2008 06:09:02 -  1.20
@@ -89,7 +89,7 @@
  defaultTerm.setStringValue("name", "default");
  defaultTerm.setStringValue("subject", 
newsletterNode.getStringValue("title"));
  defaultTerm.commit();
- newsletterNode.createRelation(defaultTerm, 
newsletterNode.getCloud().getRelationManager("related")).commit();
+ newsletterNode.createRelation(defaultTerm, 
newsletterNode.getCloud().getRelationManager("posrel")).commit();
   }
}



Index: NewsletterUtil.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterUtil.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- NewsletterUtil.java 29 Apr 2008 01:37:04 -  1.17
+++ NewsletterUtil.java 29 Apr 2008 06:09:02 -  1.18
@@ -1,6 +1,10 @@
 package com.finalist.newsletter.util;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
 
 import net.sf.mmapps.commons.beans.MMBaseNodeMapper;
 import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
@@ -12,16 +16,11 @@
 import org.mmbase.bridge.NodeList;
 import org.mmbase.bridge.NodeManager;
 import org.mmbase.bridge.NodeQuery;
-import org.mmbase.bridge.Query;
 import org.mmbase.bridge.util.Queries;
 import org.mmbase.bridge.util.SearchUtil;
-import org.mmbase.storage.search.Constraint;
-import org.mmbase.storage.search.FieldValueInConstraint;
-import org.mmbase.storage.search.RelationStep;
 import org.mmbase.storage.search.Step;
 
 import com.finalist.cmsc.beans.om.ContentElement;
-import com.finalist.newsletter.cao.impl.NewsletterSubscriptionCAOImpl;
 import com.finalist.newsletter.domain.Term;
 import com.finalist.portlets.newsletter.NewsletterContentPortlet;
 
@@ -219,10 +218,9 @@
  NodeManager termNodeManager = cloud.getNodeManager("term");
  NodeList terms = newsletterNode.getRelatedNodes(termNodeManager);
  NodeManager articleNodeManager = cloud.getNodeManager("article");
- Node term = null;
  SortedSet sort = new TreeSet();
  for (int i = 0; i < terms.size(); i++) {
-term = terms.getNode(i);
+Node term = terms.getNode(i);
 sort.add(new Integer(term.getNumber()));
  }
  if (sort.size() == 0) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter search_term.xml search_tag.xml

2008-04-28 Thread kevinshen

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter
In directory james.mmbase.org:/tmp/cvs-serv10730

Added Files:
search_term.xml 
Removed Files:
search_tag.xml 
Log Message:
CMSC-711,Customized search option for edit-wizard,rename tag to term


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter
See also: http://www.mmbase.org/jira/browse/CMSC-711


search_term.xml is new



___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/config/applications/contentrepository/builders term.xml tag.xml

2008-04-28 Thread kevinshen

Update of 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/config/applications/contentrepository/builders
In directory james.mmbase.org:/tmp/cvs-serv10654

Added Files:
term.xml 
Removed Files:
tag.xml 
Log Message:
CMSC-711,Customized search option for edit-wizard,rename tag to term


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/config/applications/contentrepository/builders
See also: http://www.mmbase.org/jira/browse/CMSC-711


term.xml is new



___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/article article.xml load_article.xml

2008-04-28 Thread kevinshen

Update of 
/var/cvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/article
In directory james.mmbase.org:/tmp/cvs-serv10520

Modified Files:
article.xml load_article.xml 
Log Message:
CMSC-711,Customized search option for edit-wizard,rename tag to term


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/article
See also: http://www.mmbase.org/jira/browse/CMSC-711


Index: article.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/article/article.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- article.xml 29 Apr 2008 01:36:52 -  1.12
+++ article.xml 29 Apr 2008 05:31:18 -  1.13
@@ -19,14 +19,14 @@
   
 
 
-   
+   
 
   



 
-   
+   
 

 


Index: load_article.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/article/load_article.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- load_article.xml28 Apr 2008 07:44:01 -  1.9
+++ load_article.xml29 Apr 2008 05:31:18 -  1.10
@@ -24,7 +24,7 @@



-   
+   



___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/tags - New directory

2008-04-28 Thread mguo

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/tags
In directory 
james.mmbase.org:/tmp/cvs-serv8345/portlets-newsletter/src/webapp/WEB-INF/tags

Log Message:
Directory 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/tags
 added to the repository



See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/tags
___
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/newsletter/util NewsletterPublicationUtil.java

2008-04-28 Thread kevinshen

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
In directory james.mmbase.org:/tmp/cvs-serv8294

Modified Files:
NewsletterPublicationUtil.java 
Log Message:
CMSC-711,Customized search option for edit-wizard,add defaultTerm


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
See also: http://www.mmbase.org/jira/browse/CMSC-711


Index: NewsletterPublicationUtil.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterPublicationUtil.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- NewsletterPublicationUtil.java  16 Apr 2008 09:18:12 -  1.18
+++ NewsletterPublicationUtil.java  29 Apr 2008 03:52:49 -  1.19
@@ -9,6 +9,7 @@
 import org.mmbase.bridge.Cloud;
 import org.mmbase.bridge.Node;
 import org.mmbase.bridge.NodeList;
+import org.mmbase.bridge.NodeManager;
 import org.mmbase.bridge.Relation;
 import org.mmbase.bridge.RelationList;
 
@@ -58,6 +59,7 @@
   if (newsletterNumber > 0) {
  Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
  Node newsletterNode = cloud.getNode(newsletterNumber);
+ createDefaultTerm(newsletterNode);
  Node publicationNode = CloneUtil.cloneNode(newsletterNode, 
"newsletterpublication");
 
  if (publicationNode != null) {
@@ -80,6 +82,31 @@
   return (null);
}
 
+   private static void createDefaultTerm(Node newsletterNode) {
+
+  if(!hasDefaultTerm(newsletterNode)) {
+ Node defaultTerm = 
newsletterNode.getCloud().getNodeManager("term").createNode();
+ defaultTerm.setStringValue("name", "default");
+ defaultTerm.setStringValue("subject", 
newsletterNode.getStringValue("title"));
+ defaultTerm.commit();
+ newsletterNode.createRelation(defaultTerm, 
newsletterNode.getCloud().getRelationManager("related")).commit();
+  }
+   }
+   
+   private static boolean hasDefaultTerm(Node newsletterNode) {
+  NodeManager termNodeManager = 
newsletterNode.getCloud().getNodeManager("term");
+  NodeList terms = newsletterNode.getRelatedNodes(termNodeManager);
+  boolean hasDefaultTerm = false;
+  for(int i = 0 ; i < terms.size() ; i++) {
+Node term = terms.getNode(i);
+if(term.getStringValue("name") != null && 
term.getStringValue("name").equals("default")) {
+   hasDefaultTerm = true;
+   break;
+}
+  }
+  return hasDefaultTerm;
+   }
+   
// Delete a publication, only if not yet published
public static void deletePublication(int publicationNumber) {
   Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates list.jsp

2008-04-28 Thread kevinshen

Update of 
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates
In directory james.mmbase.org:/tmp/cvs-serv4549

Modified Files:
list.jsp 
Log Message:
CMSC-867,modify Newsletter Content Portlet.add tips if no content


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates
See also: http://www.mmbase.org/jira/browse/CMSC-867


Index: list.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/list.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- list.jsp10 Dec 2007 14:11:07 -  1.4
+++ list.jsp29 Apr 2008 02:07:16 -  1.5
@@ -43,6 +43,9 @@



+   
+ 
+   



___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/resources portlets-newslettercontent.properties portlets-newslettercontent_nl.properties

2008-04-28 Thread kevinshen

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources
In directory james.mmbase.org:/tmp/cvs-serv4478

Modified Files:
portlets-newslettercontent.properties 
portlets-newslettercontent_nl.properties 
Log Message:
CMSC-867,modify Newsletter Content Portlet.add tips if no content


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources
See also: http://www.mmbase.org/jira/browse/CMSC-867


Index: portlets-newslettercontent.properties
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/portlets-newslettercontent.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- portlets-newslettercontent.properties   23 Apr 2008 11:03:16 -  
1.5
+++ portlets-newslettercontent.properties   29 Apr 2008 02:06:48 -  
1.6
@@ -41,3 +41,5 @@
 edit_defaults.pagesindex.center=Center
 edit_defaults.pagesindex.forward=Forward
 edit_defaults.pagesindex.half-full=Half full
\ No newline at end of file
+
+edit_defaults.relation.nocontent=No Related Content 
\ No newline at end of file


Index: portlets-newslettercontent_nl.properties
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/portlets-newslettercontent_nl.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- portlets-newslettercontent_nl.properties23 Apr 2008 11:03:16 -  
1.2
+++ portlets-newslettercontent_nl.properties29 Apr 2008 02:06:48 -  
1.3
@@ -41,3 +41,4 @@
 edit_defaults.pagesindex.center=Center
 edit_defaults.pagesindex.forward=Forward
 edit_defaults.pagesindex.half-full=Half full
\ No newline at end of file
+edit_defaults.relation.nocontent=No Related Content 
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/view/fragment list.jsp welcome.jsp

2008-04-28 Thread mguo

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/view/fragment
In directory 
james.mmbase.org:/tmp/cvs-serv2264/portlets-newsletter/src/webapp/WEB-INF/templates/view/fragment

Modified Files:
list.jsp welcome.jsp 
Log Message:
CMSC-703 change tag to term


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/view/fragment
See also: http://www.mmbase.org/jira/browse/CMSC-703


Index: list.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/view/fragment/list.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- list.jsp28 Apr 2008 05:52:31 -  1.3
+++ list.jsp29 Apr 2008 01:37:05 -  1.4
@@ -1,7 +1,7 @@
 <[EMAIL PROTECTED] file="/WEB-INF/templates/portletglobals.jsp" %>
 <%@ page import="java.util.*"%>
 <%@ page import="com.finalist.newsletter.domain.Newsletter"%>
-<%@ page import="com.finalist.newsletter.domain.Tag"%>
+<%@ page import="com.finalist.newsletter.domain.Term"%>
 <%@ page import="com.finalist.newsletter.domain.Subscription"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
 
@@ -87,7 +87,7 @@
 Subscription subscription = (Subscription) it.next();
 Newsletter newsletter = subscription.getNewsletter();
 String title = newsletter.getTitle();
-Set tags = subscription.getTags();
+Set terms = subscription.getTags();
 int newsletterId = newsletter.getId();
 String format = subscription.getMimeType();
 String status = subscription.getStatus().toString();
@@ -158,7 +158,7 @@
 <%  Iterator tagit = tags.iterator(); 
  for(int j=0;j
 <%@ page import="java.util.*"%>
 <%@ page import="com.finalist.newsletter.domain.Newsletter"%>
-<%@ page import="com.finalist.newsletter.domain.Tag"%>
+<%@ page import="com.finalist.newsletter.domain.Term"%>
 <%@ page import="com.finalist.newsletter.domain.Subscription"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
 
@@ -90,7 +90,7 @@
 Subscription subscription = (Subscription) it.next();
 Newsletter newsletter = subscription.getNewsletter();
 String title = newsletter.getTitle();
-Set tags = subscription.getTags();
+Set terms = subscription.getTags();
 int newsletterId = newsletter.getId();
 String format = subscription.getMimeType();
 String status = subscription.getStatus().toString();
@@ -161,7 +161,7 @@
 <%  Iterator tagit = tags.iterator(); 
  for(int j=0;jhttp://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms NewsletterPublicationPublish.java

2008-04-28 Thread mguo

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory 
james.mmbase.org:/tmp/cvs-serv2264/portlets-newsletter/src/java/com/finalist/newsletter/forms

Modified Files:
NewsletterPublicationPublish.java 
Log Message:
CMSC-703 change tag to term


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
See also: http://www.mmbase.org/jira/browse/CMSC-703


Index: NewsletterPublicationPublish.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationPublish.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- NewsletterPublicationPublish.java   22 Apr 2008 03:44:12 -  1.7
+++ NewsletterPublicationPublish.java   29 Apr 2008 01:37:05 -  1.8
@@ -17,10 +17,15 @@
 import org.mmbase.bridge.Node;
 
 import com.finalist.cmsc.navigation.NavigationUtil;
+import com.finalist.cmsc.navigation.ServerUtil;
 import com.finalist.cmsc.security.SecurityUtil;
 import com.finalist.cmsc.security.UserRole;
 import com.finalist.cmsc.struts.MMBaseFormlessAction;
-import com.finalist.newsletter.publisher.NewsletterPublisher;
+import com.finalist.cmsc.services.publish.Publish;
+import com.finalist.newsletter.util.NewsletterUtil;
+import com.finalist.newsletter.services.NewsletterServiceFactory;
+import com.finalist.newsletter.services.NewsletterPublicationService;
+import com.finalist.newsletter.domain.Publication;
 
 public class NewsletterPublicationPublish extends MMBaseFormlessAction {
 
@@ -33,6 +38,7 @@
@Override
public ActionForward execute(ActionMapping mapping, HttpServletRequest 
request, Cloud cloud) throws Exception {
 
+  NewsletterPublicationService publciationService = 
NewsletterServiceFactory.getNewsletterPublicationService();
   int number = Integer.parseInt(getParameter(request, "number", true));
   Node publicationNode = cloud.getNode(number);
 
@@ -44,8 +50,14 @@
  if (NavigationUtil.getChildCount(publicationNode) > 0 && 
!isWebMaster) {
 return mapping.findForward("confirmationpage");
  }
-// Thread publisher = new NewsletterPublisher(number);
-// publisher.start();
+
+ if (ServerUtil.isSinle()) {
+publciationService.deliver(number);
+ }
+ else {
+publciationService.setStatus(number, Publication.STATUS.READY);
+Publish.publish(publicationNode);
+ }
 
  return mapping.findForward(SUCCESS);
   }
@@ -56,12 +68,6 @@
  return new ActionForward(forwardPath);
   }
 
-  // neither remove or cancel, show confirmation page
-
-  String publishDate = publicationNode.getStringValue("publishdate");
-  if (publishDate != null && publishDate.length() > 0 ) {
- return mapping.findForward("confirm_resend");
-  }
   return mapping.findForward("confirm_send");
}
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/config/applications newsletter.xml

2008-04-28 Thread mguo

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/config/applications
In directory 
james.mmbase.org:/tmp/cvs-serv2264/portlets-newsletter/config/applications

Modified Files:
newsletter.xml 
Log Message:
CMSC-703 change tag to term


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/config/applications
See also: http://www.mmbase.org/jira/browse/CMSC-703


Index: newsletter.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- newsletter.xml  28 Apr 2008 07:47:17 -  1.18
+++ newsletter.xml  29 Apr 2008 01:37:05 -  1.19
@@ -23,17 +23,17 @@

 
 
-
+


-   
+   
   




-   
-   
+   
+   



___
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/newsletter/cao/util NewsletterSubscriptionUtil.java

2008-04-28 Thread mguo

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/util
In directory 
james.mmbase.org:/tmp/cvs-serv2264/portlets-newsletter/src/java/com/finalist/newsletter/cao/util

Modified Files:
NewsletterSubscriptionUtil.java 
Log Message:
CMSC-703 change tag to term


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/util
See also: http://www.mmbase.org/jira/browse/CMSC-703


Index: NewsletterSubscriptionUtil.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/util/NewsletterSubscriptionUtil.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- NewsletterSubscriptionUtil.java 22 Apr 2008 02:53:56 -  1.3
+++ NewsletterSubscriptionUtil.java 29 Apr 2008 01:37:05 -  1.4
@@ -1,16 +1,14 @@
 package com.finalist.newsletter.cao.util;
 
-import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Set;
 
 import org.mmbase.bridge.Node;
 import org.mmbase.bridge.NodeList;
 
 import com.finalist.newsletter.domain.Newsletter;
-import com.finalist.newsletter.domain.Tag;
+import com.finalist.newsletter.domain.Term;
 
 public class NewsletterSubscriptionUtil {
public static Newsletter populateNewsletter(Node node,Newsletter 
newsletter){
@@ -18,17 +16,17 @@
return newsletter;
}

-   public static Newsletter convertNodeListtoTagList(NodeList 
list,Newsletter newsletter){
+   public static Newsletter convertNodeListtoTermList(NodeList 
list,Newsletter newsletter){
Iterator nodelist = list.iterator();
-   Set taglist= new HashSet();
+   Set termSet= new HashSet();

for (int j = 0; j < list.size(); j++) {
-   Tag tag = new Tag();
+   Term term = new Term();
Node node = nodelist.next();
-   tag.setName(node.getStringValue("name"));
-   taglist.add(tag);
+   term.setName(node.getStringValue("name"));
+   termSet.add(term);
}
-   newsletter.setTags(taglist);
+   newsletter.setTerms(termSet);
return newsletter;
}
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/test/com/finalist/newsletter/cao NewsletterCAOTest.java

2008-04-28 Thread mguo

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/test/com/finalist/newsletter/cao
In directory 
james.mmbase.org:/tmp/cvs-serv2264/portlets-newsletter/src/test/com/finalist/newsletter/cao

Modified Files:
NewsletterCAOTest.java 
Log Message:
CMSC-703 change tag to term


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/test/com/finalist/newsletter/cao
See also: http://www.mmbase.org/jira/browse/CMSC-703


Index: NewsletterCAOTest.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/test/com/finalist/newsletter/cao/NewsletterCAOTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- NewsletterCAOTest.java  23 Apr 2008 03:40:45 -  1.4
+++ NewsletterCAOTest.java  29 Apr 2008 01:37:05 -  1.5
@@ -25,24 +25,24 @@
node.setStringValue("title", "food");
node.commit();
 
-   NodeManager tagManager = cloud.getNodeManager("tag");
+   NodeManager termManager = cloud.getNodeManager("term");
 
-   Node tag1 = tagManager.createNode();
-   tag1.setStringValue("name", "meet");
-   tag1.commit();
-   Node tag2 = tagManager.createNode();
-   tag2.setStringValue("name", "bread");
-   tag2.commit();
+   Node term = termManager.createNode();
+   term.setStringValue("name", "meet");
+   term.commit();
+   Node term2 = termManager.createNode();
+   term2.setStringValue("name", "bread");
+   term2.commit();

 
-   RelationManager insrel = 
cloud.getRelationManager("newsletter","tag", "tagged");
+   RelationManager insrel = 
cloud.getRelationManager("newsletter","term", "termed");

-   node.createRelation(tag1, insrel).commit();
-   node.createRelation(tag2, insrel).commit();
+   node.createRelation(term, insrel).commit();
+   node.createRelation(term2, insrel).commit();

 
   assertNotNull(cao.getNewsletterById(node.getNumber()));
- 
assertEquals(2,cao.getNewsletterById(node.getNumber()).getTags().size()); 
+ 
assertEquals(2,cao.getNewsletterById(node.getNumber()).getTerms().size());
}
 
 }
___
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/newsletter/cao/impl NewsletterCAOImpl.java NewsletterPublicationCAOImpl.java NewsletterSubscriptionCAOImpl.j

2008-04-28 Thread mguo

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
In directory 
james.mmbase.org:/tmp/cvs-serv2264/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl

Modified Files:
NewsletterCAOImpl.java NewsletterPublicationCAOImpl.java 
NewsletterSubscriptionCAOImpl.java 
Log Message:
CMSC-703 change tag to term


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
See also: http://www.mmbase.org/jira/browse/CMSC-703


Index: NewsletterCAOImpl.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterCAOImpl.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- NewsletterCAOImpl.java  24 Apr 2008 09:21:03 -  1.9
+++ NewsletterCAOImpl.java  29 Apr 2008 01:37:04 -  1.10
@@ -7,14 +7,13 @@
 import org.mmbase.bridge.Node;
 import org.mmbase.bridge.NodeList;
 import org.mmbase.bridge.NodeQuery;
-import org.mmbase.bridge.Query;
 import org.mmbase.storage.search.Step;
 
 import com.finalist.newsletter.cao.util.NlUtil;
 
 import com.finalist.newsletter.cao.NewsletterCAO;
 import com.finalist.newsletter.domain.Newsletter;
-import com.finalist.newsletter.domain.Tag;
+import com.finalist.newsletter.domain.Term;
 
 public class NewsletterCAOImpl implements NewsletterCAO {
private Cloud cloud;
@@ -40,16 +39,16 @@
 
newsletter.setId(newsletterNode.getIntValue("number"));
newsletter.setTitle(newsletterNode.getStringValue("title"));
-   List tagList = newsletterNode.getRelatedNodes("tag");
-   Iterator tagIt = tagList.iterator();
+   List terms = newsletterNode.getRelatedNodes("term");
+   Iterator termsIt = terms.iterator();
 
-   for (int i = 0; i < tagList.size(); i++) {
-   Tag tag = new Tag();
-   Node tagNode = (Node) tagIt.next();
-   tag.setId(tagNode.getNumber());
-   tag.setName(tagNode.getStringValue("name"));
-   tag.setSubscription(false);
-   newsletter.getTags().add(tag);
+   for (int i = 0; i < terms.size(); i++) {
+   Term term = new Term();
+   Node termNode = (Node) termsIt.next();
+   term.setId(termNode.getNumber());
+   term.setName(termNode.getStringValue("name"));
+   term.setSubscription(false);
+   newsletter.getTerms().add(term);
}
 
return newsletter;


Index: NewsletterPublicationCAOImpl.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterPublicationCAOImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- NewsletterPublicationCAOImpl.java   22 Apr 2008 03:35:53 -  1.5
+++ NewsletterPublicationCAOImpl.java   29 Apr 2008 01:37:04 -  1.6
@@ -1,29 +1,25 @@
 package com.finalist.newsletter.cao.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.mmbase.bridge.Cloud;
-import org.mmbase.bridge.Field;
-import org.mmbase.bridge.Node;
-import org.mmbase.bridge.NodeManager;
-import org.mmbase.bridge.NodeQuery;
+import com.finalist.cmsc.mmbase.PropertiesUtil;
+import com.finalist.cmsc.navigation.NavigationUtil;
+import com.finalist.newsletter.NewsletterSendFailException;
+import com.finalist.newsletter.cao.NewsletterPublicationCAO;
+import com.finalist.newsletter.domain.Newsletter;
+import com.finalist.newsletter.domain.Publication;
+import com.finalist.newsletter.domain.Term;
+import com.finalist.newsletter.util.POConvertUtils;
+import com.finalist.portlets.newsletter.NewsletterContentPortlet;
+import org.apache.commons.lang.StringUtils;
+import org.mmbase.bridge.*;
 import org.mmbase.bridge.util.SearchUtil;
 import org.mmbase.storage.search.Constraint;
 import org.mmbase.storage.search.Step;
 import org.mmbase.util.logging.Logger;
 import org.mmbase.util.logging.Logging;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.lang.StringUtils;
 
-import com.finalist.newsletter.cao.NewsletterPublicationCAO;
-import com.finalist.newsletter.domain.Publication;
-import com.finalist.newsletter.domain.Newsletter;
-import com.finalist.newsletter.util.POConvertUtils;
-import com.finalist.newsletter.NewsletterSendFailException;
-import com.finalist.cmsc.navigation.NavigationUtil;
-import com.finalist.cmsc.mmbase.PropertiesUtil;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher Personaliser.java NewsletterPublisher.java NewsletterGenerator.java

2008-04-28 Thread mguo

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher
In directory 
james.mmbase.org:/tmp/cvs-serv2264/portlets-newsletter/src/java/com/finalist/newsletter/publisher

Modified Files:
Personaliser.java NewsletterPublisher.java 
NewsletterGenerator.java 
Log Message:
CMSC-703 change tag to term


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher
See also: http://www.mmbase.org/jira/browse/CMSC-703


Index: Personaliser.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher/Personaliser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Personaliser.java   17 Apr 2008 02:50:45 -  1.1
+++ Personaliser.java   29 Apr 2008 01:37:05 -  1.2
@@ -1,7 +1,8 @@
 package com.finalist.newsletter.publisher;
 
 import com.finalist.newsletter.domain.Subscription;
+import com.finalist.newsletter.domain.Publication;
 
 public interface Personaliser {
-   public String personalise(String rawHtmlContent, Subscription subscription);
+   public String personalise(String rawHtmlContent, Subscription subscription, 
Publication publication);
 }


Index: NewsletterPublisher.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher/NewsletterPublisher.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- NewsletterPublisher.java25 Apr 2008 18:18:34 -  1.19
+++ NewsletterPublisher.java29 Apr 2008 01:37:05 -  1.20
@@ -2,8 +2,10 @@
 
 import com.finalist.newsletter.domain.Subscription;
 import com.finalist.newsletter.domain.Publication;
+import com.finalist.newsletter.domain.Newsletter;
 import com.finalist.newsletter.publisher.NewsletterGenerator;
 import com.finalist.newsletter.NewsletterSendFailException;
+import com.finalist.newsletter.util.NewsletterUtil;
 import com.finalist.cmsc.mmbase.PropertiesUtil;
 import org.mmbase.module.Module;
 import org.mmbase.util.logging.Logger;
@@ -33,16 +35,20 @@
   NewsletterPublisher.personaliser = personaliser;
}
 
-   public void deliver(String url, String recipient, String mineType, String 
title,
-   String fromAddress, String fromName, String 
replyAddress, String replyName) {
+   public void deliver(Publication publication, Subscription subscription) {
   try {
  Message message = new MimeMessage(getMailSession());
- setSenderInfomation(message, fromAddress, fromName, replyAddress, 
replyName);
-
- setRecipient(message, recipient);
- setBody(message, url, mineType);
- setTitle(message, title);
- setMIME(message, mineType);
+ Newsletter newsletter = publication.getNewsletter();
+ setSenderInfomation(message,
+   newsletter.getFromAddress(),
+   newsletter.getFromName(),
+   newsletter.getReplyAddress(),
+   newsletter.getReplyName());
+
+ setRecipient(message, subscription.getEmail());
+ setBody(publication, subscription, message);
+ setTitle(message, publication.getTitle());
+ setMIME(message, subscription.getMimeType());
 
  Transport.send(message);
  log.debug("mail send!");
@@ -55,12 +61,18 @@
   }
}
 
+   private void setBody(Publication publication, Subscription subscription, 
Message message) throws MessagingException {
+  String url = 
NewsletterUtil.getTermURL(publication.getUrl(),subscription.getTerms(),publication.getId());
+  String content = NewsletterGenerator.generate(url, 
subscription.getMimeType());
+
+  if (null != getPersonalise()) {
+ content = getPersonalise().personalise(content, subscription, 
publication);
+  }
 
-   protected void setBody(Message message, String url, String mimeType) throws 
MessagingException {
-  String content = NewsletterGenerator.generate(url, mimeType);
   message.setText(content + "\n");
}
 
+
private void setSenderInfomation(Message message, String fromAddress, 
String fromName, String replyAddress, String replyName)
  throws MessagingException, UnsupportedEncodingException {
 
@@ -146,17 +158,15 @@
   return parameter;
}
 
-   private static String personalise(String rawHtmlContent, Subscription 
subscription) {
-  String result = rawHtmlContent;
-
+   private Personaliser getPersonalise() {
+  Personaliser ps = null;
   if (null == personaliser) {
  personaliser = PropertiesUtil.getProperty("newsletter.personaliser");
   }
 
   if (StringUtils.isNotEmpty(personaliser)) {
  try {
-Personaliser ps = (Personalise

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree NewsletterPublicationTreeItemRenderer.java

2008-04-28 Thread mguo

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree
In directory 
james.mmbase.org:/tmp/cvs-serv2264/portlets-newsletter/src/java/com/finalist/newsletter/tree

Modified Files:
NewsletterPublicationTreeItemRenderer.java 
Log Message:
CMSC-703 change tag to term


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree
See also: http://www.mmbase.org/jira/browse/CMSC-703


Index: NewsletterPublicationTreeItemRenderer.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree/NewsletterPublicationTreeItemRenderer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- NewsletterPublicationTreeItemRenderer.java  15 Apr 2008 08:40:24 -  
1.10
+++ NewsletterPublicationTreeItemRenderer.java  29 Apr 2008 01:37:04 -  
1.11
@@ -1,20 +1,24 @@
 package com.finalist.newsletter.tree;
 
 import org.mmbase.bridge.Node;
+import org.mmbase.util.logging.Logger;
+import org.mmbase.util.logging.Logging;
 
-import com.finalist.cmsc.navigation.NavigationRenderer;
-import com.finalist.cmsc.navigation.NavigationTreeItemRenderer;
-import com.finalist.cmsc.navigation.NavigationUtil;
-import com.finalist.cmsc.navigation.PagesUtil;
+import com.finalist.cmsc.navigation.*;
 import com.finalist.cmsc.security.SecurityUtil;
 import com.finalist.cmsc.security.UserRole;
 import com.finalist.cmsc.services.publish.Publish;
 import com.finalist.tree.TreeElement;
 import com.finalist.tree.TreeModel;
 import com.finalist.util.module.ModuleUtil;
+import com.finalist.newsletter.services.NewsletterServiceFactory;
+import com.finalist.newsletter.domain.Publication;
+
 
 public class NewsletterPublicationTreeItemRenderer implements 
NavigationTreeItemRenderer {
 
+   private static Logger log = 
Logging.getLoggerInstance(NewsletterPublicationTreeItemRenderer.class.getName());
+
protected static final String FEATURE_WORKFLOW = "workflowitem";
 
@SuppressWarnings("unused")
@@ -36,16 +40,24 @@
  element.addOption(renderer.createTreeOption("edit_defaults.png", 
"site.newsletterpublication.edit", "newsletter",
"../newsletter/NewsletterPublicationEdit.do?number=" + id));
 
- if (SecurityUtil.isWebmaster(role) || 
(model.getChildCount(parentNode) == 0 && !Publish.isPublished(parentNode))) {
+ boolean isSingleApplication = true;
+ boolean isPublished;
+
+ if (isSingleApplication) {
+Publication.STATUS status = 
NewsletterServiceFactory.getNewsletterPublicationService().getStatus(parentNode.getNumber());
+isPublished = Publication.STATUS.DELIVERED.equals(status);
+ }
+ else {
+isPublished = Publish.isPublished(parentNode);
+ }
+
+ log.debug("Publication "+parentNode.getNumber()+"'s publication 
status:"+isPublished+" in single:"+isSingleApplication);
+
+ if (SecurityUtil.isWebmaster(role) || 
(model.getChildCount(parentNode) == 0 && !isPublished)) {
 element.addOption(renderer.createTreeOption("delete.png", 
"site.newsletterpublication.remove", "newsletter",
   "../newsletter/NewsletterPublicationDelete.do?number=" + 
id));
-   // element.addOption(renderer.createTreeOption("mail.png", 
"site.newsletterpublication.publish", "newsletter",
-   //   "../newsletter/NewsletterPublicationPublish.do?number=" + 
id));
-/*
-element.addOption(renderer.createTreeOption("mail.png", 
"site.newsletterpublication.test", "newsletter",
-  "../newsletter/NewsletterPublicationTest.do?number=" + id));
-*/
-
+element.addOption(renderer.createTreeOption("mail.png", 
"site.newsletterpublication.publish", "newsletter",
+  "../newsletter/NewsletterPublicationPublish.do?number=" + 
id));
  element.addOption(renderer.createTreeOption("mail.png", 
"site.newsletterpublication.test", "newsletter",
"../newsletter/NewsletterPublicationTest.do?number=" + id));
  }
@@ -59,6 +71,7 @@
   "../workflow/publish.jsp?number=" + id));
  }
   }
+
   element.addOption(renderer.createTreeOption("rights.png", 
"site.page.rights", "../usermanagement/pagerights.jsp?number=" + id));
 
   return element;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter services.jsp

2008-04-28 Thread mguo

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter
In directory 
james.mmbase.org:/tmp/cvs-serv2264/portlets-newsletter/src/webapp/editors/newsletter

Modified Files:
services.jsp 
Log Message:
CMSC-703 change tag to term


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter
See also: http://www.mmbase.org/jira/browse/CMSC-703


Index: services.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/services.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- services.jsp28 Apr 2008 05:54:51 -  1.5
+++ services.jsp29 Apr 2008 01:37:05 -  1.6
@@ -8,7 +8,7 @@
NewsletterSubscriptionServices service = 
NewsletterServiceFactory.getNewsletterSubscriptionServices();
int userId = CommunityModuleAdapter.getCurrentUser().getId().intValue();
int newsletterId = 0;
-   int tagId = 0;
+   int termId = 0;
boolean hasSelect = false;
String status = "INACTIVE";
String format = "html";
@@ -22,9 +22,9 @@
{
newsletterId = Integer.parseInt(request.getParameter("newsletterId"));
}
-   if(null!=request.getParameter("tagId"))
+   if(null!=request.getParameter("termId"))
{
-   tagId = Integer.parseInt(request.getParameter("tagId"));
+   termId = Integer.parseInt(request.getParameter("termId"));
}
if(null!=request.getParameter("select"))
{
@@ -77,10 +77,10 @@
if("modifyTag".equals(action))
{   
if(hasSelect){
-   
service.selectTagInLetter(userId,newsletterId,tagId);   
+   service.selectTermInLetter(userId,newsletterId, 
termId);
}
else{
-   
service.unSelectTagInLetter(userId,newsletterId,tagId); 
+   
service.unSelectTermInLetter(userId,newsletterId, termId);
}
}

___
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/newsletter/services/impl NewsletterSubscriptionServicesImpl.java NewsletterPublicationServiceImpl.java

2008-04-28 Thread mguo

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl
In directory 
james.mmbase.org:/tmp/cvs-serv2264/portlets-newsletter/src/java/com/finalist/newsletter/services/impl

Modified Files:
NewsletterSubscriptionServicesImpl.java 
NewsletterPublicationServiceImpl.java 
Log Message:
CMSC-703 change tag to term


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl
See also: http://www.mmbase.org/jira/browse/CMSC-703


Index: NewsletterSubscriptionServicesImpl.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl/NewsletterSubscriptionServicesImpl.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- NewsletterSubscriptionServicesImpl.java 25 Apr 2008 18:18:35 -  
1.9
+++ NewsletterSubscriptionServicesImpl.java 29 Apr 2008 01:37:04 -  
1.10
@@ -13,7 +13,7 @@
 import com.finalist.newsletter.cao.NewsletterSubscriptionCAO;
 import com.finalist.newsletter.domain.Newsletter;
 import com.finalist.newsletter.domain.Subscription;
-import com.finalist.newsletter.domain.Tag;
+import com.finalist.newsletter.domain.Term;
 import com.finalist.newsletter.services.NewsletterSubscriptionServices;
 
 public class NewsletterSubscriptionServicesImpl implements 
NewsletterSubscriptionServices{
@@ -51,23 +51,23 @@
if(subscription==null){
Subscription newSubscription = new Subscription();
newSubscription.setNewsletter(newsletter);
-   newSubscription.setTags(newsletter.getTags());  
+   newSubscription.setTerms(newsletter.getTerms());
return newSubscription;
}else{
-   Set newsletterTags = newsletter.getTags();
-   Set subscriptionTags = subscription.getTags();
-   Iterator newsletterTagListIt = 
newsletterTags.iterator();
-   Iterator selectListIt = subscriptionTags.iterator();
-   for(int i=0;i newsletterTerms = newsletter.getTerms();
+   Set subscriptionTerms = subscription.getTerms();
+   Iterator newsletterTermList = 
newsletterTerms.iterator();
+   Iterator selectListIt = subscriptionTerms.iterator();
+   for(int i=0;i tagList = subscription.getTags();
-   Iterator it = tagList.iterator();
-   for(int i=0;i termList = subscription.getTerms();
+   Iterator it = termList.iterator();
+   for(int i=0;i tagList = subscription.getTags();
-   Iterator it = tagList.iterator();
-   for(int i=0;i termList = subscription.getTerms();
+   Iterator it = termList.iterator();
+   for(int i=0;i publications = publicationCAO.getIntimePublication();
-  for(Publication publication:publications){
- deliver(publication);
-  }
+   //service method.
+   public STATUS getStatus(int publicationId) {
+  return publicationCAO.getPublication(publicationId).getStatus();
}
 
-   private void deliver(Publication publication) {
-  List subscriptions = 
subscriptionCAO.getSubscription(publication.getNewsletter().getId());
-  publisher.deliver(publication,subscriptions);
-  statisticCAO.logPubliction(publication.getId(),subscriptions.size());
-  publicationCAO.setStatus(publication, STATUS.DELIVERED);
+   public void setStatus(int publicationId, STATUS status) {
+  publicationCAO.setStatus(publicationId, status);
}
 
-   public void deliver(int newsletterId,String email,String mimeType) {
+   /**
+* deliver all READY publications in the system
+*/
+   public void deliverAllPublication() {
+  log.info("starting deliver all publications in READY status");
 
-  log.debug("deliver newsletter "+newsletterId+" to "+email+" in mimetype 
"+mimeType);
+  List publications = publicationCAO.getIntimePublicationIds();
   
-  Publication publication = publicationCAO.getPublication(newsletterId);
-  Subscription subscription = new Subscription();
+  log.debug(publications.size() + " publications found");
 
-  subscription.setMimeType(mimeType);
+  for (int publicationId : publications) {
+ deliver(publicationId);
+  }
+   }
 
-  subscription.setNewsletter(publication.getNewsletter());
+   /**
+* deliver specific publication.
+*
+* @param publicationId The id of the publication to be sent out
+*/
+   public void deliver(int publicationId) {
 
-  Person person = new Person();
-  person.setEmail(email);
-  subscription.setSubscriber(person);
+  int newsletterId =

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util POConvertUtils.java NewsletterUtil.java

2008-04-28 Thread mguo

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
In directory 
james.mmbase.org:/tmp/cvs-serv2264/portlets-newsletter/src/java/com/finalist/newsletter/util

Modified Files:
POConvertUtils.java NewsletterUtil.java 
Log Message:
CMSC-703 change tag to term


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
See also: http://www.mmbase.org/jira/browse/CMSC-703


Index: POConvertUtils.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/POConvertUtils.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- POConvertUtils.java 23 Apr 2008 09:05:54 -  1.5
+++ POConvertUtils.java 29 Apr 2008 01:37:04 -  1.6
@@ -1,34 +1,14 @@
 package com.finalist.newsletter.util;
 
-import com.finalist.cmsc.services.community.person.Person;
-import com.finalist.newsletter.domain.Subscription;
-import com.finalist.newsletter.services.CommunityModuleAdapter;
 import org.apache.commons.beanutils.BeanUtils;
 import org.mmbase.bridge.Node;
 import org.mmbase.util.logging.Logger;
 import org.mmbase.util.logging.Logging;
 
 import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
 
 public class POConvertUtils {
  private static Logger log = 
Logging.getLoggerInstance(POConvertUtils.class.getName());
-   public static List convertSubscriptions(List nodes) {
-  List subscriptions = new ArrayList();
-  for (Node node : nodes) {
- subscriptions.add(convertSubscription(node));
-  }
-  return subscriptions;
-   }
-
-   public static Subscription convertSubscription(Node node) {
-  Subscription subscription = new Subscription();
-//  Person subscripber = CommunityModuleAdapter.;
-//  subscription.setSubscriber(subscripber);
-  return subscription;
-   }
-
 
public void convert(T target, Node node) {
 


Index: NewsletterUtil.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterUtil.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- NewsletterUtil.java 28 Apr 2008 12:39:44 -  1.16
+++ NewsletterUtil.java 29 Apr 2008 01:37:04 -  1.17
@@ -1,9 +1,6 @@
 package com.finalist.newsletter.util;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.SortedSet;
-import java.util.TreeSet;
+import java.util.*;
 
 import net.sf.mmapps.commons.beans.MMBaseNodeMapper;
 import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
@@ -25,6 +22,8 @@
 
 import com.finalist.cmsc.beans.om.ContentElement;
 import com.finalist.newsletter.cao.impl.NewsletterSubscriptionCAOImpl;
+import com.finalist.newsletter.domain.Term;
+import com.finalist.portlets.newsletter.NewsletterContentPortlet;
 
 public abstract class NewsletterUtil {
private static Log log = LogFactory
@@ -125,7 +124,8 @@
   String themeType = themeNode.getNodeManager().getName();
   if (themeType.equals("newslettertheme")) {
  managerName = "newsletter";
-  } else {
+  }
+  else {
  managerName = "newsletterpublication";
   }
   Node newsletterNode = SearchUtil.findRelatedNode(themeNode, managerName, 
"newslettertheme");
@@ -210,35 +210,33 @@
   return (null);
}

-   public static List getArticlesByNewsletter(int 
newsletterNumber,int offset,int elementsPerPage,String orderBy,String 
direction) {
+   public static List getArticlesByNewsletter(int 
newsletterNumber, int offset, int elementsPerPage, String orderBy, String 
direction) {
   if (newsletterNumber > 0) {
  List articles = new ArrayList();
  Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
  Node newsletterNode = cloud.getNode(newsletterNumber);
  
- NodeManager tagNodeManager = cloud.getNodeManager("tag");   
- NodeList tags = newsletterNode.getRelatedNodes(tagNodeManager);
+ NodeManager termNodeManager = cloud.getNodeManager("term");
+ NodeList terms = newsletterNode.getRelatedNodes(termNodeManager);
  NodeManager articleNodeManager = cloud.getNodeManager("article"); 
- Node tag = null; 
- SortedSet sort= new TreeSet();
- for (int i = 0 ; i < tags.size(); i++) {
-tag =  tags.getNode(i);
-sort.add(new Integer(tag.getNumber()));
+ Node term = null;
+ SortedSet sort = new TreeSet();
+ for (int i = 0; i < terms.size(); i++) {
+term = terms.getNode(i);
+sort.add(new Integer(term.getNumber()));
  }
- if(sort.size() == 0) {
+ if (sort.size() == 0) {

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao NewsletterPublicationCAO.java NewsletterSubscriptionCAO.java

2008-04-28 Thread mguo

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao
In directory 
james.mmbase.org:/tmp/cvs-serv2264/portlets-newsletter/src/java/com/finalist/newsletter/cao

Modified Files:
NewsletterPublicationCAO.java NewsletterSubscriptionCAO.java 
Log Message:
CMSC-703 change tag to term


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao
See also: http://www.mmbase.org/jira/browse/CMSC-703


Index: NewsletterPublicationCAO.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/NewsletterPublicationCAO.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- NewsletterPublicationCAO.java   16 Apr 2008 10:47:39 -  1.4
+++ NewsletterPublicationCAO.java   29 Apr 2008 01:37:04 -  1.5
@@ -1,12 +1,16 @@
 package com.finalist.newsletter.cao;
 
 import java.util.List;
+import java.util.Set;
 
 import com.finalist.newsletter.domain.Publication;
+import com.finalist.newsletter.domain.Newsletter;
+import com.finalist.newsletter.domain.Term;
 
 public interface NewsletterPublicationCAO {
-   public List getIntimePublication();
-   public void setStatus(Publication publication,Publication.STATUS status);
+   public List getIntimePublicationIds();
+   public void setStatus(int publicationId,Publication.STATUS status);
public Publication getPublication(int number);
+   public int getNewsletterId(int publicationId);
 }

\ No newline at end of file


Index: NewsletterSubscriptionCAO.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/NewsletterSubscriptionCAO.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- NewsletterSubscriptionCAO.java  25 Apr 2008 18:18:35 -  1.8
+++ NewsletterSubscriptionCAO.java  29 Apr 2008 01:37:04 -  1.9
@@ -6,7 +6,7 @@
 import org.mmbase.bridge.Node;
 
 import com.finalist.newsletter.domain.Subscription;
-import com.finalist.newsletter.domain.Tag;
+import com.finalist.newsletter.domain.Term;
 
 public interface NewsletterSubscriptionCAO {
 
@@ -18,13 +18,13 @@
 
public void modifySubscriptionFormat(Subscription subscription);
 
-   public void addSubscriptionTag(Subscription subscription,int tagId);
+   public void addSubscriptionTerm(Subscription subscription,int termId);
 
-   public void removeSubscriptionTag(Subscription subscription,int tagId); 
+   public void removeSubscriptionTerm(Subscription subscription,int 
termId);
 
-   public List getSubscriptionByNewsletterId(int 
newsletterId);
+   public List getSubscription(int newsletterId);
 
public Subscription getSubscription(int newsletterId, int userId);
 
-   Set getTags(int id);
+   Set getTerms(int id);
 }
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter search_article_insrel_term.xml search_newsletter_posrel_term.xml load_newsletter.xml search_t

2008-04-28 Thread mguo

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter
In directory 
james.mmbase.org:/tmp/cvs-serv2264/portlets-newsletter/src/webapp/editors/config/newsletter

Modified Files:
load_newsletter.xml search_tag.xml edit_newsletter.xml 
Added Files:
search_article_insrel_term.xml 
search_newsletter_posrel_term.xml 
Removed Files:
search_article_insrel_tag.xml search_newsletter_posrel_tag.xml 
Log Message:
CMSC-703 change tag to term


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter
See also: http://www.mmbase.org/jira/browse/CMSC-703


search_article_insrel_term.xml is new



search_newsletter_posrel_term.xml is new



Index: load_newsletter.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/load_newsletter.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- load_newsletter.xml 28 Apr 2008 07:47:17 -  1.11
+++ load_newsletter.xml 29 Apr 2008 01:37:04 -  1.12
@@ -26,7 +26,7 @@



-   
+   





Index: search_tag.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/search_tag.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- search_tag.xml  28 Apr 2008 07:47:17 -  1.1
+++ search_tag.xml  29 Apr 2008 01:37:04 -  1.2
@@ -1,13 +1,13 @@
 
 http://www.mmbase.org/dtd/wizard-schema_1_0.dtd";>
-
-   Tag selecteren
-   Tag selection
+
+   Term selecteren
+   Term selection
 


-   tag
-   tag
+   term
+   term

   
newsletter
@@ -15,12 +15,12 @@


 
-   
-   Search tag
-   Zoek tag
+   
+   Search term
+   Zoek term

-   Tag Name contains
-   Tag Name bevat
+   Term Name contains
+   Term Name bevat
[name]

   
@@ -31,8 +31,8 @@

 

-   
-   
+   
+   





Index: edit_newsletter.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/edit_newsletter.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- edit_newsletter.xml 28 Apr 2008 07:47:17 -  1.11
+++ edit_newsletter.xml 29 Apr 2008 01:37:04 -  1.12
@@ -100,5 +100,5 @@



-   
+   
 




___
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

2008-04-28 Thread mguo

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter
In directory 
james.mmbase.org:/tmp/cvs-serv2264/portlets-newsletter/src/java/com/finalist/portlets/newsletter

Modified Files:
NewsletterContentPortlet.java 
Log Message:
CMSC-703 change tag to term


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-703


Index: NewsletterContentPortlet.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter/NewsletterContentPortlet.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- NewsletterContentPortlet.java   23 Apr 2008 11:03:16 -  1.16
+++ NewsletterContentPortlet.java   29 Apr 2008 01:37:04 -  1.17
@@ -22,6 +22,8 @@
 
 public class NewsletterContentPortlet extends AbstractContentPortlet {
 
+   public static final String DEFINITION = "newslettercontentportlet";
+   
protected static final String DISPLAYTYPE_PARAM = "displayType";
 
protected static final String USE_PAGING = "usePaging";
___
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/newsletter/services CommunityModuleAdapter.java NewsletterPublicationService.java NewsletterSubscriptionServ

2008-04-28 Thread mguo

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services
In directory 
james.mmbase.org:/tmp/cvs-serv2264/portlets-newsletter/src/java/com/finalist/newsletter/services

Modified Files:
CommunityModuleAdapter.java NewsletterPublicationService.java 
NewsletterSubscriptionServices.java 
Log Message:
CMSC-703 change tag to term


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services
See also: http://www.mmbase.org/jira/browse/CMSC-703


Index: CommunityModuleAdapter.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/CommunityModuleAdapter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- CommunityModuleAdapter.java 25 Apr 2008 18:24:23 -  1.5
+++ CommunityModuleAdapter.java 29 Apr 2008 01:37:04 -  1.6
@@ -36,6 +36,19 @@
   return person;
}
 
+   public static boolean isUserLogin(){
+  return null != getCurrentUser();
+   }
+   
+   public static int getCurrentUserId(){
+  Person person = getCurrentUser();
+  if(null==person){
+ return -1;
+  }
+
+  return person.getId().intValue();
+   }
+
public static Person getUserById(String id) {
   
   PersonService personService = (PersonService) 
ApplicationContextFactory.getApplicationContext().getBean("personService");


Index: NewsletterPublicationService.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/NewsletterPublicationService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- NewsletterPublicationService.java   16 Apr 2008 10:47:39 -  1.3
+++ NewsletterPublicationService.java   29 Apr 2008 01:37:04 -  1.4
@@ -1,9 +1,19 @@
 package com.finalist.newsletter.services;
 
+import com.finalist.newsletter.domain.Publication;
+import com.finalist.newsletter.domain.Term;
+
+import java.util.Set;
+
 
 public interface NewsletterPublicationService {
public void deliverAllPublication();
 
-   public void deliver(int number,String email,String mimeType);
-   public void deliverPublication(int number);
+   public void deliver(int publicationId, String email, String mimeType);
+
+   public Publication.STATUS getStatus(int publicationId);
+
+   public void setStatus(int publciationId, Publication.STATUS status);
+
+   public void deliver(int publidcation);
 }


Index: NewsletterSubscriptionServices.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/NewsletterSubscriptionServices.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- NewsletterSubscriptionServices.java 23 Apr 2008 10:32:05 -  1.6
+++ NewsletterSubscriptionServices.java 29 Apr 2008 01:37:04 -  1.7
@@ -23,8 +23,8 @@
public boolean hasSubscription(int userId);
public Subscription addRecordInfo(int newsletterId, int userId);
public boolean noSubscriptionRecord(int userId,int newsletterId);
-   public void selectTagInLetter(int userId,int newsletterId,int tagId);
-   public void unSelectTagInLetter(int userId,int newsletterId,int tagId);
+   public void selectTermInLetter(int userId,int newsletterId,int termId);
+   public void unSelectTermInLetter(int userId,int newsletterId,int 
termId);
public void modifyFormat(int userId,int newsletterId,String format);
public void modifyStauts(int userId,int newsletterId,String status);
public void addNewRecord(int userId,int newsletterId);
___
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/newsletter/domain Term.java Newsletter.java Publication.java Subscription.java Tag.java

2008-04-28 Thread mguo

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/domain
In directory 
james.mmbase.org:/tmp/cvs-serv2264/portlets-newsletter/src/java/com/finalist/newsletter/domain

Modified Files:
Newsletter.java Publication.java Subscription.java 
Added Files:
Term.java 
Removed Files:
Tag.java 
Log Message:
CMSC-703 change tag to term


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/domain
See also: http://www.mmbase.org/jira/browse/CMSC-703


Term.java is new



Index: Newsletter.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/domain/Newsletter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- Newsletter.java 24 Apr 2008 09:21:02 -  1.8
+++ Newsletter.java 29 Apr 2008 01:37:04 -  1.9
@@ -1,9 +1,7 @@
 package com.finalist.newsletter.domain;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
 public class Newsletter {
@@ -18,7 +16,7 @@
 
private Date interval;
 
-   private Set tags = new HashSet();
+   private Set terms = new HashSet();
 
private String title;
 
@@ -102,13 +100,11 @@
this.fromAddress = fromAddress;
}
 
-   public Set getTags() {
-   return tags;
+   public Set getTerms() {
+  return terms;
}
 
-   public void setTags(Set tags) {
-   this.tags = tags;
+   public void setTerms(Set terms) {
+  this.terms = terms;
}
-
-
 }


Index: Publication.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/domain/Publication.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- Publication.java18 Apr 2008 08:02:22 -  1.7
+++ Publication.java29 Apr 2008 01:37:04 -  1.8
@@ -9,9 +9,11 @@
private int id;
private Date deliverTime;
private STATUS status = STATUS.INITIAL;
-   private String url;
private Newsletter newsletter;
+   private int newsletterId;
+   private String url;
 
+   private String title;
 
public int getId() {
   return id;
@@ -50,12 +52,27 @@
   this.status = status;
}
 
+   public int getNewsletterId() {
+  return newsletterId;
+   }
+
+   public void setNewsletterId(int newsletterId) {
+  this.newsletterId = newsletterId;
+   }
+
public String getUrl() {
-//  String newsletterPath = 
NavigationUtil.getPathToRootString(publicationNode, true);
   return url;
}
 
public void setUrl(String url) {
   this.url = url;
}
+
+   public String getTitle() {
+  return title;
+   }
+
+   public void setTitle(String title) {
+  this.title = title;
+   }
 }


Index: Subscription.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/domain/Subscription.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- Subscription.java   25 Apr 2008 18:18:35 -  1.7
+++ Subscription.java   29 Apr 2008 01:37:04 -  1.8
@@ -12,16 +12,18 @@
private String mimeType;
private STATUS status = STATUS.INACTIVE;
 
-   private Set tags = new HashSet();
+   private Set terms = new HashSet();
private Newsletter newsletter;
private String subscriberId;
-
+   private String email;
private int id;
+   private String url;
 
 public enum STATUS {
  ACTIVE, PAUSED, INACTIVE
   }
 
+
public Person getSubscriber() {
return subscriber;
}
@@ -50,12 +52,13 @@
return newsletter;
}
 
-   public Set getTags() {
-   return tags;
+
+   public Set getTerms() {
+  return terms;
}
 
-   public void setTags(Set tags) {
-   this.tags = tags;
+   public void setTerms(Set terms) {
+  this.terms = terms;
}
 
public void setNewsletter(Newsletter newsletter) {
@@ -77,4 +80,12 @@
public void setSubscriberId(String subscriberId) {
   this.subscriberId = subscriberId;
}
+
+   public String getEmail() {
+  return email;
+   }
+
+   public void setEmail(String email) {
+  this.email = email;
+   }
 }


___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/article article.xml

2008-04-28 Thread mguo

Update of 
/var/cvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/article
In directory 
james.mmbase.org:/tmp/cvs-serv2242/cmsc/basicmodel/src/webapp/editors/config/article

Modified Files:
article.xml 
Log Message:
CMSC-703 change tag to term


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/article
See also: http://www.mmbase.org/jira/browse/CMSC-703


Index: article.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/article/article.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- article.xml 28 Apr 2008 07:44:01 -  1.11
+++ article.xml 29 Apr 2008 01:36:52 -  1.12
@@ -26,7 +26,7 @@


 
-
+   
 

 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/migration migration_1.3_to_1.4.txt

2008-04-28 Thread jkoster

Update of /var/cvs/contributions/CMSContainer/migration
In directory james.mmbase.org:/tmp/cvs-serv21677/migration

Modified Files:
  Tag: b1_4
migration_1.3_to_1.4.txt 
Log Message:
CMSC-873 - Updates to XML files for better formatting and language. Also added 
entries to migration script


See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/migration
See also: http://www.mmbase.org/jira/browse/CMSC-873


Index: migration_1.3_to_1.4.txt
===
RCS file: 
/var/cvs/contributions/CMSContainer/migration/migration_1.3_to_1.4.txt,v
retrieving revision 1.4.2.6
retrieving revision 1.4.2.7
diff -u -b -r1.4.2.6 -r1.4.2.7
--- migration_1.3_to_1.4.txt15 Apr 2008 08:08:14 -  1.4.2.6
+++ migration_1.3_to_1.4.txt28 Apr 2008 16:48:06 -  1.4.2.7
@@ -164,3 +164,17 @@
 *
 *
 *
\ No newline at end of file
+
+
+Name: Update field size of the dynamic forms
+Goal: increase size of text to be entered.
+Type: sql-script
+--- Start script ---
+ALTER TABLE mm_savedfieldvalue MODIFY column m_value text;
+ALTER TABLE live_savedfieldvalue MODIFY column m_value text;
+--- End script ---
+Exceptions/errors/other problems and what to do:
+*
+*
+*
+
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-dynamicforms/src/webapp/editors/config/formfieldvalue delete_formfieldvalue.xml

2008-04-28 Thread jkoster

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/src/webapp/editors/config/formfieldvalue
In directory 
james.mmbase.org:/tmp/cvs-serv21642/portlets-dynamicforms/src/webapp/editors/config/formfieldvalue

Modified Files:
delete_formfieldvalue.xml 
Log Message:
CMSC-873 - Updates to XML files for better formatting and language. Also added 
entries to migration script


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/src/webapp/editors/config/formfieldvalue
See also: http://www.mmbase.org/jira/browse/CMSC-873


Index: delete_formfieldvalue.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/src/webapp/editors/config/formfieldvalue/delete_formfieldvalue.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-dynamicforms/config/applications/responseform/builders savedfieldvalue.xml responseform.xml formfield.xml savedform.xml formfieldvalue.xml

2008-04-28 Thread jkoster

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/config/applications/responseform/builders
In directory 
james.mmbase.org:/tmp/cvs-serv21642/portlets-dynamicforms/config/applications/responseform/builders

Modified Files:
savedfieldvalue.xml responseform.xml formfield.xml 
savedform.xml formfieldvalue.xml 
Log Message:
CMSC-873 - Updates to XML files for better formatting and language. Also added 
entries to migration script


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/config/applications/responseform/builders
See also: http://www.mmbase.org/jira/browse/CMSC-873


Index: savedfieldvalue.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/config/applications/responseform/builders/savedfieldvalue.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- savedfieldvalue.xml 9 Nov 2007 08:34:03 -   1.2
+++ savedfieldvalue.xml 28 Apr 2008 16:47:58 -  1.3
@@ -14,11 +14,11 @@
 Names can be provided in various languages. -->

   
-  Bewaarde feld waarde
+  Opgeslagen veldwaarde
   Saved field value
  ä¿åæ¡å¼
   
-  Bewaarde feld waarden
+  Opgeslagen veldwaarden
   Saved field value
  ä¿åæ¡å¼



Index: responseform.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/config/applications/responseform/builders/responseform.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- responseform.xml9 Nov 2007 08:34:03 -   1.4
+++ responseform.xml28 Apr 2008 16:47:58 -  1.5
@@ -104,7 +104,7 @@
  
  
 
-saveanswer
+saveanswer
 
 INTEGER
  
@@ -121,8 +121,8 @@
  
  
  
-Email addresses
-Email adressen
+Email adressen
+Email addresses
é®ä»¶å°å
  
  
@@ -209,7 +209,7 @@
  
  
 
-useremailsender
+useremailsender
 
 STRING
  
@@ -244,7 +244,7 @@
  
  
 
-useremailsendername
+useremailsendername
 
 STRING
  
@@ -331,7 +331,7 @@
  
  
  
-Gebruikersemail tekst na gegevens
+Gebruikersemailtekst na gegevens
 User email body after data
ç¨æ·é®ä»¶ä¸»ä½å¨æ°æ®å
  
@@ -454,7 +454,7 @@
  
  
 
-includedata
+includedata
 
 INTEGER
  
@@ -466,7 +466,7 @@



-   Bevestigings 
bericht
+   Bevestigingsbericht
Confirmation 
message   
ç¡®è®¤ä¿¡æ¯



Index: formfield.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/config/applications/responseform/builders/formfield.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4


Index: savedform.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/config/applications/responseform/builders/savedform.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- savedform.xml   9 Nov 2007 08:34:03 -   1.2
+++ savedform.xml   28 Apr 2008 16:47:58 -  1.3
@@ -18,7 +18,7 @@
 Names can be provided in various languages. -->

   
-  Bewaarde formulier
+  Bewaard formulier
   Saved form
  
   


Index: formfieldvalue.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/config/applications/responseform/builders/formfieldvalue.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- formfieldvalue.xml  9 Nov 2007 08:34:03 -   1.2
+++ formfieldvalue.xml  28 Apr 2008 16:47:58 -  1.3
@@ -13,11 +13,11 @@
 Names can be provided in various languages. -->

   
-  Formulier feld waarde
+  Formulier veldwaarden
   Form Field Value
  è¡¨åæ¡å¼
   
-  Formulier veld waarden
+  Formulier veldwaarden
   Form field values
  è¡¨åæ¡å¼

___
Cvs mailing list
Cvs@li

[MMBASE CVS] contributions/CMSContainer/migration migration_1.1_to_1.2.txt migration_1.3_to_1.4.txt

2008-04-28 Thread jkoster

Update of /var/cvs/contributions/CMSContainer/migration
In directory james.mmbase.org:/tmp/cvs-serv21626/migration

Modified Files:
migration_1.1_to_1.2.txt migration_1.3_to_1.4.txt 
Log Message:
CMSC-873 - Updates to XML files for better formatting and language. Also added 
entries to migration script


See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/migration
See also: http://www.mmbase.org/jira/browse/CMSC-873


Index: migration_1.1_to_1.2.txt
===
RCS file: 
/var/cvs/contributions/CMSContainer/migration/migration_1.1_to_1.2.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- migration_1.1_to_1.2.txt7 Aug 2007 08:38:04 -   1.1
+++ migration_1.1_to_1.2.txt28 Apr 2008 16:47:53 -  1.2
@@ -9,7 +9,7 @@
 
 
 Name: Create new column (modules) for properties
-Goal: So seperate module specific properties can be stored
+Goal: So separate module specific properties can be stored
 Type: sql-script
 --- Start script ---
 alter table mm_properties add column module varchar(255);


Index: migration_1.3_to_1.4.txt
===
RCS file: 
/var/cvs/contributions/CMSContainer/migration/migration_1.3_to_1.4.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- migration_1.3_to_1.4.txt15 Apr 2008 08:08:22 -  1.11
+++ migration_1.3_to_1.4.txt28 Apr 2008 16:47:53 -  1.12
@@ -152,6 +152,7 @@
 *
 *
 
+
 Name: Add detailsupport to views.
 Goal: SearchService will use this setting for determination of detail pages
 Type: sql-script
@@ -163,3 +164,17 @@
 *
 *
 *
\ No newline at end of file
+
+
+Name: Update field size of the dynamic forms
+Goal: increase size of text to be entered.
+Type: sql-script
+--- Start script ---
+ALTER TABLE mm_savedfieldvalue MODIFY column m_value text;
+ALTER TABLE live_savedfieldvalue MODIFY column m_value text;
+--- End script ---
+Exceptions/errors/other problems and what to do:
+*
+*
+*
+
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-dynamicforms/config/applications/responseform/builders formfieldvalue.xml formfield.xml savedform.xml responseform.xml savedfieldvalue.xml

2008-04-28 Thread jkoster

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/config/applications/responseform/builders
In directory 
james.mmbase.org:/tmp/cvs-serv21447/portlets-dynamicforms/config/applications/responseform/builders

Modified Files:
  Tag: b1_4
formfieldvalue.xml formfield.xml savedform.xml 
responseform.xml savedfieldvalue.xml 
Log Message:
CMSC-873 - Updates to XML files for better formatting and language


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/config/applications/responseform/builders
See also: http://www.mmbase.org/jira/browse/CMSC-873


Index: formfieldvalue.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/config/applications/responseform/builders/formfieldvalue.xml,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -b -r1.2 -r1.2.2.1
--- formfieldvalue.xml  9 Nov 2007 08:34:03 -   1.2
+++ formfieldvalue.xml  28 Apr 2008 16:39:23 -  1.2.2.1
@@ -13,11 +13,11 @@
 Names can be provided in various languages. -->

   
-  Formulier feld waarde
+  Formulier veldwaarden
   Form Field Value
  è¡¨åæ¡å¼
   
-  Formulier veld waarden
+  Formulier veldwaarden
   Form field values
  è¡¨åæ¡å¼



Index: formfield.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/config/applications/responseform/builders/formfield.xml,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -b -r1.2 -r1.2.2.1


Index: savedform.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/config/applications/responseform/builders/savedform.xml,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -b -r1.2 -r1.2.2.1
--- savedform.xml   9 Nov 2007 08:34:03 -   1.2
+++ savedform.xml   28 Apr 2008 16:39:23 -  1.2.2.1
@@ -18,7 +18,7 @@
 Names can be provided in various languages. -->

   
-  Bewaarde formulier
+  Bewaard formulier
   Saved form
  
   


Index: responseform.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/config/applications/responseform/builders/responseform.xml,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -b -r1.4 -r1.4.2.1
--- responseform.xml9 Nov 2007 08:34:03 -   1.4
+++ responseform.xml28 Apr 2008 16:39:23 -  1.4.2.1
@@ -104,7 +104,7 @@
  
  
 
-saveanswer
+saveanswer
 
 INTEGER
  
@@ -121,8 +121,8 @@
  
  
  
-Email addresses
-Email adressen
+Email adressen
+Email addresses
é®ä»¶å°å
  
  
@@ -209,7 +209,7 @@
  
  
 
-useremailsender
+useremailsender
 
 STRING
  
@@ -244,7 +244,7 @@
  
  
 
-useremailsendername
+useremailsendername
 
 STRING
  
@@ -331,7 +331,7 @@
  
  
  
-Gebruikersemail tekst na gegevens
+Gebruikersemailtekst na gegevens
 User email body after data
ç¨æ·é®ä»¶ä¸»ä½å¨æ°æ®å
  
@@ -454,7 +454,7 @@
  
  
 
-includedata
+includedata
 
 INTEGER
  
@@ -466,7 +466,7 @@



-   Bevestigings 
bericht
+   Bevestigingsbericht
Confirmation 
message   
ç¡®è®¤ä¿¡æ¯



Index: savedfieldvalue.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/config/applications/responseform/builders/savedfieldvalue.xml,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -b -r1.2 -r1.2.2.1
--- savedfieldvalue.xml 9 Nov 2007 08:34:03 -   1.2
+++ savedfieldvalue.xml 28 Apr 2008 16:39:23 -  1.2.2.1
@@ -14,11 +14,11 @@
 Names can be provided in various languages. -->

   
-  Bewaarde feld waarde
+  Opgeslagen veldwaarde
   Saved field value
  ä¿åæ¡å¼
   
-  Bewaarde feld waarden
+  Opgeslagen veldwaarden
   Saved field value
  ä¿åæ¡å¼

[MMBASE CVS] contributions/natmm/config/applications/NatMM/builders/natmm inschrijvingen.xml

2008-04-28 Thread jruijter

Update of /var/cvs/contributions/natmm/config/applications/NatMM/builders/natmm
In directory 
james.mmbase.org:/tmp/cvs-serv20275/config/applications/NatMM/builders/natmm

Modified Files:
inschrijvingen.xml 
Log Message:
NMCMS-491


See also: 
http://cvs.mmbase.org/viewcvs/contributions/natmm/config/applications/NatMM/builders/natmm
See also: http://www.mmbase.org/jira/browse/NMCMS-491


Index: inschrijvingen.xml
===
RCS file: 
/var/cvs/contributions/natmm/config/applications/NatMM/builders/natmm/inschrijvingen.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- inschrijvingen.xml  27 Jun 2006 20:02:42 -  1.4
+++ inschrijvingen.xml  28 Apr 2008 15:40:18 -  1.5
@@ -198,6 +198,29 @@
 
   
  
+
+
+ 
+ 
+HerkomstBoeking
+TicketOfficeSource
+string
+ 
+ 
+
+   12
+   12
+   12
+
+ 
+ 
+ticket_office_source
+STRING
+ 
+  
+
+  
+ 
 Comma separated users list
 Comma separated users list
  
@@ -208,9 +231,9 @@
  
  
 
-   12
-   12
-   12
+   13
+   13
+   13
 
  
  
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/natmm/templates/editors/evenementen subscribe.jsp

2008-04-28 Thread jruijter

Update of /var/cvs/contributions/natmm/templates/editors/evenementen
In directory james.mmbase.org:/tmp/cvs-serv20275/templates/editors/evenementen

Modified Files:
subscribe.jsp 
Log Message:
NMCMS-491


See also: 
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/editors/evenementen
See also: http://www.mmbase.org/jira/browse/NMCMS-491


Index: subscribe.jsp
===
RCS file: 
/var/cvs/contributions/natmm/templates/editors/evenementen/subscribe.jsp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- subscribe.jsp   1 Jun 2007 13:30:17 -   1.26
+++ subscribe.jsp   28 Apr 2008 15:40:18 -  1.27
@@ -183,6 +183,9 @@
} %>">
 
 
+
+
+
 
 
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/natmm/templates/natmm/includes/events subscribe.jsp

2008-04-28 Thread jruijter

Update of /var/cvs/contributions/natmm/templates/natmm/includes/events
In directory james.mmbase.org:/tmp/cvs-serv20275/templates/natmm/includes/events

Modified Files:
subscribe.jsp 
Log Message:
NMCMS-491


See also: 
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm/includes/events
See also: http://www.mmbase.org/jira/browse/NMCMS-491


Index: subscribe.jsp
===
RCS file: 
/var/cvs/contributions/natmm/templates/natmm/includes/events/subscribe.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- subscribe.jsp   18 Aug 2006 17:24:13 -  1.7
+++ subscribe.jsp   28 Apr 2008 15:40:18 -  1.8
@@ -17,6 +17,7 @@
 int ti = 1;
 %>
 
+
 <%
 boolean isDemoLayout = sRubriekLayout.equals("" + NatMMConfig.DEMO_LAYOUT);
 boolean isEventTemplate = true;
@@ -28,6 +29,13 @@
 
 " scope="session">
 
+
+
+   
+  
+   
+
+
 
 
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/natmm/templates/natmm events.jsp

2008-04-28 Thread jruijter

Update of /var/cvs/contributions/natmm/templates/natmm
In directory james.mmbase.org:/tmp/cvs-serv20275/templates/natmm

Modified Files:
events.jsp 
Log Message:
NMCMS-491


See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm
See also: http://www.mmbase.org/jira/browse/NMCMS-491


Index: events.jsp
===
RCS file: /var/cvs/contributions/natmm/templates/natmm/events.jsp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- events.jsp  15 Apr 2008 09:06:11 -  1.13
+++ events.jsp  28 Apr 2008 15:40:18 -  1.14
@@ -84,6 +84,7 @@
 } else {
%>
   
+  
   
<%
 }
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/natmm/templates/mmbase/edit/wizard/data/config/inschrijvingen edit_inschrijvingen.xml load_inschrijvingen.xml

2008-04-28 Thread jruijter

Update of 
/var/cvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/inschrijvingen
In directory 
james.mmbase.org:/tmp/cvs-serv20275/templates/mmbase/edit/wizard/data/config/inschrijvingen

Modified Files:
edit_inschrijvingen.xml load_inschrijvingen.xml 
Log Message:
NMCMS-491


See also: 
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/inschrijvingen
See also: http://www.mmbase.org/jira/browse/NMCMS-491


Index: edit_inschrijvingen.xml
===
RCS file: 
/var/cvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/inschrijvingen/edit_inschrijvingen.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- edit_inschrijvingen.xml 5 Mar 2006 21:44:34 -   1.1
+++ edit_inschrijvingen.xml 28 Apr 2008 15:40:18 -  1.2
@@ -10,6 +10,7 @@
   datum ingang 
machtiging
   omschrijving
   bron
+  herkomst 
aanmelding
   
   
   


Index: load_inschrijvingen.xml
===
RCS file: 
/var/cvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/inschrijvingen/load_inschrijvingen.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- load_inschrijvingen.xml 5 Mar 2006 21:44:34 -   1.1
+++ load_inschrijvingen.xml 28 Apr 2008 15:40:18 -  1.2
@@ -8,6 +8,7 @@
   
   
   
+  
   
   
   
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/natmm/templates/nmintra/update/sql_scripts migrate.20080421.sql

2008-04-28 Thread jruijter

Update of /var/cvs/contributions/natmm/templates/nmintra/update/sql_scripts
In directory 
james.mmbase.org:/tmp/cvs-serv20275/templates/nmintra/update/sql_scripts

Modified Files:
migrate.20080421.sql 
Log Message:
NMCMS-491


See also: 
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/nmintra/update/sql_scripts
See also: http://www.mmbase.org/jira/browse/NMCMS-491


Index: migrate.20080421.sql
===
RCS file: 
/var/cvs/contributions/natmm/templates/nmintra/update/sql_scripts/migrate.20080421.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- migrate.20080421.sql21 Apr 2008 14:20:37 -  1.1
+++ migrate.20080421.sql28 Apr 2008 15:40:18 -  1.2
@@ -1,2 +1,5 @@
 ## NMCMS-486
-update v1_editwizards set name = 'link' where number = 8501;
\ No newline at end of file
+UPDATE v1_editwizards SET name = 'link' WHERE number = 8501;
+
+## NMCMS-491
+ALTER TABLE v1_inschrijvingen ADD ticket_office_source VARCHAR(255);
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/natmm/src/nl/leocms/evenementen/forms SubscribeAction.java SubscribeForm.java

2008-04-28 Thread jruijter

Update of /var/cvs/contributions/natmm/src/nl/leocms/evenementen/forms
In directory james.mmbase.org:/tmp/cvs-serv20275/src/nl/leocms/evenementen/forms

Modified Files:
SubscribeAction.java SubscribeForm.java 
Log Message:
NMCMS-491


See also: 
http://cvs.mmbase.org/viewcvs/contributions/natmm/src/nl/leocms/evenementen/forms
See also: http://www.mmbase.org/jira/browse/NMCMS-491


Index: SubscribeAction.java
===
RCS file: 
/var/cvs/contributions/natmm/src/nl/leocms/evenementen/forms/SubscribeAction.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- SubscribeAction.java21 Nov 2007 12:48:02 -  1.25
+++ SubscribeAction.java28 Apr 2008 15:40:18 -  1.26
@@ -746,6 +746,7 @@
 
thisSubscription.setStringValue("source",subscribeForm.getSource());
 
thisSubscription.setStringValue("description",subscribeForm.getDescription());
 
thisSubscription.setStringValue("ticket_office",subscribeForm.getTicketOffice());
+
thisSubscription.setStringValue("ticket_office_source",subscribeForm.getTicketOfficeSource());
 thisSubscription.setStringValue("betaalwijze", 
subscribeForm.getPaymentType());
 thisSubscription.setStringValue("bank_of_gironummer", 
subscribeForm.getBankaccount());
 thisSubscription.commit();


Index: SubscribeForm.java
===
RCS file: 
/var/cvs/contributions/natmm/src/nl/leocms/evenementen/forms/SubscribeForm.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- SubscribeForm.java  22 Dec 2006 13:17:28 -  1.16
+++ SubscribeForm.java  28 Apr 2008 15:40:18 -  1.17
@@ -100,6 +100,7 @@
private String status;
 
private String TicketOffice;
+   private String TicketOfficeSource;   
private String userId;
private String paymentType;
private String pageNumber;
@@ -263,6 +264,9 @@
public String getTicketOffice() { return TicketOffice; }
public void setTicketOffice(String TicketOffice) { this.TicketOffice = 
TicketOffice; }
 
+   public String getTicketOfficeSource() { return TicketOfficeSource; }
+   public void setTicketOfficeSource(String TicketOfficeSource) { 
this.TicketOfficeSource = TicketOfficeSource; }
+
public String getUserId() { return userId; }
public void setUserId(String userId ) { this.userId = userId; }
 
@@ -359,6 +363,7 @@
   this.status = "";
 
   this.TicketOffice = "backoffice";
+  this.TicketOfficeSource = "";
 
   this.lastSentMessage = "";
   this.extraText = "";  
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Modules/glossary/config/applications/glossary/builders glossary.xml

2008-04-28 Thread jkoster

Update of 
/var/cvs/contributions/CMSContainer_Modules/glossary/config/applications/glossary/builders
In directory 
james.mmbase.org:/tmp/cvs-serv19092/glossary/config/applications/glossary/builders

Modified Files:
  Tag: b1_4
glossary.xml 
Log Message:
CMSC-792 - Removed wrong builders and updated language in files.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/glossary/config/applications/glossary/builders
See also: http://www.mmbase.org/jira/browse/CMSC-792


Index: glossary.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/glossary/config/applications/glossary/builders/glossary.xml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- glossary.xml10 Oct 2007 09:41:32 -  1.1
+++ glossary.xml28 Apr 2008 14:47:34 -  1.1.2.1
@@ -15,12 +15,15 @@
 
 glossary
 glossary
-glossary
-glossary
+æ¯è¯è¡¨
+glossaries
+glossaries
+   æ¯è¯è¡¨
 
 
 
 
+   
 
 
 
@@ -28,10 +31,12 @@
 
 
 
+   
 
 
-Definition
+Definitie
 Definition
+   å®ä¹
 
 
 
@@ -50,10 +55,12 @@
 
 
 
+   
 
 
-Term
+Woord
 Term
+   æ¯è¯å
 
 
 
@@ -72,10 +79,12 @@
 
 
 
+   
 
 
-Editornote
-Editornote
+Bewerkers notitie
+Editor note
+   ç¼è¾æ³¨è§£
 
 
 
@@ -94,10 +103,12 @@
 
 
 
+   
 
 
 Gewijzigd
-Lastmodifieddate
+Last modified date
+   æåä¿®æ¹æ¶é´
 
 
 
@@ -116,10 +127,12 @@
 
 
 
+   
 
 
 Aangemaakt
-Creationdate
+Creation date
+   åå»ºæ¶é´
 
 
 
@@ -138,10 +151,12 @@
 
 
 
+   
 
 
 Gewijzigd door
-Lastmodifier
+Last modifier
+   æåä¿®æ¹äºº
 
 
 
@@ -160,9 +175,10 @@
 
 
 
+   
 
 
-Creator
+Aangemaakt door
 Creator
 
 
@@ -179,5 +195,4 @@
 
 
 
-
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Modules/glossary/src/tld cmsc-glossary.tld

2008-04-28 Thread jkoster

Update of /var/cvs/contributions/CMSContainer_Modules/glossary/src/tld
In directory james.mmbase.org:/tmp/cvs-serv19092/glossary/src/tld

Modified Files:
  Tag: b1_4
cmsc-glossary.tld 
Log Message:
CMSC-792 - Removed wrong builders and updated language in files.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/glossary/src/tld
See also: http://www.mmbase.org/jira/browse/CMSC-792


Index: cmsc-glossary.tld
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/glossary/src/tld/cmsc-glossary.tld,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -b -r1.2 -r1.2.2.1
--- cmsc-glossary.tld   10 Oct 2007 11:52:30 -  1.2
+++ cmsc-glossary.tld   28 Apr 2008 14:47:34 -  1.2.2.1
@@ -9,7 +9,6 @@
cmsc-glossary
http://finalist.com/cmsc-glossary
 
-

Tag that make words in glossary module highlight 
and hover link in the body text
glossary
@@ -17,5 +16,4 @@
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_Modules/glossary/src/java/com/finalist/cmsc/module/glossary Glossary.java GlossaryFactory.java

2008-04-28 Thread jkoster

Update of 
/var/cvs/contributions/CMSContainer_Modules/glossary/src/java/com/finalist/cmsc/module/glossary
In directory 
james.mmbase.org:/tmp/cvs-serv19092/glossary/src/java/com/finalist/cmsc/module/glossary

Modified Files:
  Tag: b1_4
Glossary.java GlossaryFactory.java 
Log Message:
CMSC-792 - Removed wrong builders and updated language in files.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/glossary/src/java/com/finalist/cmsc/module/glossary
See also: http://www.mmbase.org/jira/browse/CMSC-792


Index: Glossary.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/glossary/src/java/com/finalist/cmsc/module/glossary/Glossary.java,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -b -r1.7 -r1.7.2.1
--- Glossary.java   26 Nov 2007 11:42:15 -  1.7
+++ Glossary.java   28 Apr 2008 14:47:34 -  1.7.2.1
@@ -11,10 +11,6 @@
private static Glossary glossary = null;
 
 
-   private Glossary() {
-   }
-
-
void addTerm(String term, String description) {
   TERMS.put(term, description);
}
@@ -68,7 +64,7 @@
}
 
 
-   public Map getTerms() {
+   public Map getTerms() {
   return TERMS;
}
 


Index: GlossaryFactory.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/glossary/src/java/com/finalist/cmsc/module/glossary/GlossaryFactory.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -b -r1.5 -r1.5.2.1
--- GlossaryFactory.java26 Nov 2007 11:42:15 -  1.5
+++ GlossaryFactory.java28 Apr 2008 14:47:34 -  1.5.2.1
@@ -13,9 +13,6 @@
 
 public class GlossaryFactory {
 
-   public GlossaryFactory() {
-   }
-
 
public static Glossary getGlossary() {
   Glossary glossary = Glossary.instance();
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Modules/glossary/src/test/com/finalist/cmsc/module/glossary GlossaryTest.java

2008-04-28 Thread jkoster

Update of 
/var/cvs/contributions/CMSContainer_Modules/glossary/src/test/com/finalist/cmsc/module/glossary
In directory 
james.mmbase.org:/tmp/cvs-serv19092/glossary/src/test/com/finalist/cmsc/module/glossary

Modified Files:
  Tag: b1_4
GlossaryTest.java 
Log Message:
CMSC-792 - Removed wrong builders and updated language in files.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/glossary/src/test/com/finalist/cmsc/module/glossary
See also: http://www.mmbase.org/jira/browse/CMSC-792


Index: GlossaryTest.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/glossary/src/test/com/finalist/cmsc/module/glossary/GlossaryTest.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -b -r1.3 -r1.3.2.1
--- GlossaryTest.java   9 Nov 2007 03:35:21 -   1.3
+++ GlossaryTest.java   28 Apr 2008 14:47:34 -  1.3.2.1
@@ -4,10 +4,6 @@
 
 public class GlossaryTest extends TestCase {
 
-public GlossaryTest()
-{
-}
-
 protected void setUp()
 throws Exception
 {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Modules/glossary/src/webapp/editors/config/glossary edit_glossary.xml delete_glossary.xml glossary.xml

2008-04-28 Thread jkoster

Update of 
/var/cvs/contributions/CMSContainer_Modules/glossary/src/webapp/editors/config/glossary
In directory 
james.mmbase.org:/tmp/cvs-serv19092/glossary/src/webapp/editors/config/glossary

Modified Files:
  Tag: b1_4
edit_glossary.xml delete_glossary.xml glossary.xml 
Log Message:
CMSC-792 - Removed wrong builders and updated language in files.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/glossary/src/webapp/editors/config/glossary
See also: http://www.mmbase.org/jira/browse/CMSC-792


Index: edit_glossary.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/glossary/src/webapp/editors/config/glossary/edit_glossary.xml,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -b -r1.2 -r1.2.2.1
--- edit_glossary.xml   9 Nov 2007 03:35:21 -   1.2
+++ edit_glossary.xml   28 Apr 2008 14:47:34 -  1.2.2.1
@@ -7,7 +7,7 @@
 

Term
-   Termijn
+   Woord
æ¯è¯

 
@@ -17,7 +17,7 @@

  
Editornote
-   Editornote
+   Bewerkers notitie
ç¼è¾æ³¨è§£

 
\ No newline at end of file


Index: delete_glossary.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/glossary/src/webapp/editors/config/glossary/delete_glossary.xml,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -b -r1.2 -r1.2.2.1
--- delete_glossary.xml 9 Nov 2007 03:35:21 -   1.2
+++ delete_glossary.xml 28 Apr 2008 14:47:34 -  1.2.2.1
@@ -1,10 +1,10 @@
 
 http://www.mmbase.org/dtd/wizard-schema_1_0.dtd";>
 
-   Delete Term from glossary ?
-   Schrap Termijn van verklarende 
woordenlijst
+   Delete term from glossary?
+   Verwijder woord van verklarende 
woordenlijst?
ä»å³é®åç´¢å¼ä¸å é¤æ¬é¡¹ï¼
Delete a term from glossary
-   Schrap een termijn van verklarende 
woordenlijst
+   Verwijder woord van verklarende 
woordenlijst
ä»å³é®åç´¢å¼ä¸å é¤ä¸é¡¹æ°æ®
 
\ No newline at end of file


Index: glossary.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/glossary/src/webapp/editors/config/glossary/glossary.xml,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -b -r1.2 -r1.2.2.1
--- glossary.xml9 Nov 2007 03:35:21 -   1.2
+++ glossary.xml28 Apr 2008 14:47:34 -  1.2.2.1
@@ -9,7 +9,6 @@


 
-

   

___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Modules/glossary/config/applications/glossarys/builders glossary.xml

2008-04-28 Thread jkoster

Update of 
/var/cvs/contributions/CMSContainer_Modules/glossary/config/applications/glossarys/builders
In directory 
james.mmbase.org:/tmp/cvs-serv19092/glossary/config/applications/glossarys/builders

Removed Files:
  Tag: b1_4
glossary.xml 
Log Message:
CMSC-792 - Removed wrong builders and updated language in files.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/glossary/config/applications/glossarys/builders
See also: http://www.mmbase.org/jira/browse/CMSC-792


___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Modules/glossary/config/applications/glossarys/builders glossary.xml

2008-04-28 Thread jkoster

Update of 
/var/cvs/contributions/CMSContainer_Modules/glossary/config/applications/glossarys/builders
In directory 
james.mmbase.org:/tmp/cvs-serv19027/glossary/config/applications/glossarys/builders

Removed Files:
glossary.xml 
Log Message:
CMSC-792 - Removed wrong builders and updated language in files.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/glossary/config/applications/glossarys/builders
See also: http://www.mmbase.org/jira/browse/CMSC-792


___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Modules/glossary/src/webapp/editors/config/glossary glossary.xml edit_glossary.xml delete_glossary.xml

2008-04-28 Thread jkoster

Update of 
/var/cvs/contributions/CMSContainer_Modules/glossary/src/webapp/editors/config/glossary
In directory 
james.mmbase.org:/tmp/cvs-serv19027/glossary/src/webapp/editors/config/glossary

Modified Files:
glossary.xml edit_glossary.xml delete_glossary.xml 
Log Message:
CMSC-792 - Removed wrong builders and updated language in files.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/glossary/src/webapp/editors/config/glossary
See also: http://www.mmbase.org/jira/browse/CMSC-792


Index: glossary.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/glossary/src/webapp/editors/config/glossary/glossary.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- glossary.xml9 Nov 2007 03:35:21 -   1.2
+++ glossary.xml28 Apr 2008 14:47:27 -  1.3
@@ -9,7 +9,6 @@


 
-

   



Index: edit_glossary.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/glossary/src/webapp/editors/config/glossary/edit_glossary.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- edit_glossary.xml   9 Nov 2007 03:35:21 -   1.2
+++ edit_glossary.xml   28 Apr 2008 14:47:27 -  1.3
@@ -7,7 +7,7 @@
 

Term
-   Termijn
+   Woord
æ¯è¯

 
@@ -17,7 +17,7 @@

  
Editornote
-   Editornote
+   Bewerkers notitie
ç¼è¾æ³¨è§£

 
\ No newline at end of file


Index: delete_glossary.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/glossary/src/webapp/editors/config/glossary/delete_glossary.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- delete_glossary.xml 9 Nov 2007 03:35:21 -   1.2
+++ delete_glossary.xml 28 Apr 2008 14:47:27 -  1.3
@@ -1,10 +1,10 @@
 
 http://www.mmbase.org/dtd/wizard-schema_1_0.dtd";>
 
-   Delete Term from glossary ?
-   Schrap Termijn van verklarende 
woordenlijst
+   Delete term from glossary?
+   Verwijder woord van verklarende 
woordenlijst?
ä»å³é®åç´¢å¼ä¸å é¤æ¬é¡¹ï¼
Delete a term from glossary
-   Schrap een termijn van verklarende 
woordenlijst
+   Verwijder woord van verklarende 
woordenlijst
ä»å³é®åç´¢å¼ä¸å é¤ä¸é¡¹æ°æ®
 
\ 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/glossary/src/tld cmsc-glossary.tld

2008-04-28 Thread jkoster

Update of /var/cvs/contributions/CMSContainer_Modules/glossary/src/tld
In directory james.mmbase.org:/tmp/cvs-serv19027/glossary/src/tld

Modified Files:
cmsc-glossary.tld 
Log Message:
CMSC-792 - Removed wrong builders and updated language in files.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/glossary/src/tld
See also: http://www.mmbase.org/jira/browse/CMSC-792


Index: cmsc-glossary.tld
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/glossary/src/tld/cmsc-glossary.tld,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- cmsc-glossary.tld   10 Oct 2007 11:52:30 -  1.2
+++ cmsc-glossary.tld   28 Apr 2008 14:47:27 -  1.3
@@ -9,7 +9,6 @@
cmsc-glossary
http://finalist.com/cmsc-glossary
 
-

Tag that make words in glossary module highlight 
and hover link in the body text
glossary
@@ -17,5 +16,4 @@
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_Modules/glossary/config/applications/glossary/builders glossary.xml

2008-04-28 Thread jkoster

Update of 
/var/cvs/contributions/CMSContainer_Modules/glossary/config/applications/glossary/builders
In directory 
james.mmbase.org:/tmp/cvs-serv19027/glossary/config/applications/glossary/builders

Modified Files:
glossary.xml 
Log Message:
CMSC-792 - Removed wrong builders and updated language in files.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/glossary/config/applications/glossary/builders
See also: http://www.mmbase.org/jira/browse/CMSC-792


Index: glossary.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/glossary/config/applications/glossary/builders/glossary.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- glossary.xml10 Oct 2007 09:41:32 -  1.1
+++ glossary.xml28 Apr 2008 14:47:27 -  1.2
@@ -15,12 +15,15 @@
 
 glossary
 glossary
-glossary
-glossary
+æ¯è¯è¡¨
+glossaries
+glossaries
+   æ¯è¯è¡¨
 
 
 
 
+   
 
 
 
@@ -28,10 +31,12 @@
 
 
 
+   
 
 
-Definition
+Definitie
 Definition
+   å®ä¹
 
 
 
@@ -50,10 +55,12 @@
 
 
 
+   
 
 
-Term
+Woord
 Term
+   æ¯è¯å
 
 
 
@@ -72,10 +79,12 @@
 
 
 
+   
 
 
-Editornote
-Editornote
+Bewerkers notitie
+Editor note
+   ç¼è¾æ³¨è§£
 
 
 
@@ -94,10 +103,12 @@
 
 
 
+   
 
 
 Gewijzigd
-Lastmodifieddate
+Last modified date
+   æåä¿®æ¹æ¶é´
 
 
 
@@ -116,10 +127,12 @@
 
 
 
+   
 
 
 Aangemaakt
-Creationdate
+Creation date
+   åå»ºæ¶é´
 
 
 
@@ -138,10 +151,12 @@
 
 
 
+   
 
 
 Gewijzigd door
-Lastmodifier
+Last modifier
+   æåä¿®æ¹äºº
 
 
 
@@ -160,9 +175,10 @@
 
 
 
+   
 
 
-Creator
+Aangemaakt door
 Creator
 
 
@@ -179,5 +195,4 @@
 
 
 
-
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository ContentElementUtil.java

2008-04-28 Thread jkoster

Update of 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository
In directory 
james.mmbase.org:/tmp/cvs-serv17083/cmsc/contentrepository/src/java/com/finalist/cmsc/repository

Modified Files:
ContentElementUtil.java 
Log Message:
CMSC-645 typo fix


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository
See also: http://www.mmbase.org/jira/browse/CMSC-645


Index: ContentElementUtil.java
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/ContentElementUtil.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- ContentElementUtil.java 22 Apr 2008 16:31:44 -  1.9
+++ ContentElementUtil.java 28 Apr 2008 13:13:26 -  1.10
@@ -398,7 +398,7 @@
 
 
 /**
- * judege if the content's archive date is in the archive time scope
+ * judge if the content's archive date is in the archive time scope
  * @param content the node to be match
  * @param archive spcifiy how to calculate the archive time scrop.accept 
"all" "old" or other String as parameter,
  * @return true if archive is "all" or content is empty.
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl wizard.xsl

2008-04-28 Thread jkoster

Update of 
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl
In directory 
james.mmbase.org:/tmp/cvs-serv16703/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl

Modified Files:
  Tag: b1_4
wizard.xsl 
Log Message:
CMSC-876 - Layouts of rulers now use a (mod 4)+1. Cleaned up css file.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl
See also: http://www.mmbase.org/jira/browse/CMSC-876


Index: wizard.xsl
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl/wizard.xsl,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -b -r1.8 -r1.8.2.1
--- wizard.xsl  22 Dec 2007 15:49:38 -  1.8
+++ wizard.xsl  28 Apr 2008 13:03:39 -  1.8.2.1
@@ -346,7 +346,7 @@
 What to do with 'lists'.
   -->
   
-ruler
+ruler
   
   
   
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/style/extra wizard.css

2008-04-28 Thread jkoster

Update of 
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/style/extra
In directory 
james.mmbase.org:/tmp/cvs-serv16703/cmsc/edit-webapp/src/webapp/editors/editwizards_new/style/extra

Modified Files:
  Tag: b1_4
wizard.css 
Log Message:
CMSC-876 - Layouts of rulers now use a (mod 4)+1. Cleaned up css file.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/style/extra
See also: http://www.mmbase.org/jira/browse/CMSC-876


Index: wizard.css
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/style/extra/wizard.css,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -b -r1.3.4.1 -r1.3.4.2
--- wizard.css  28 Mar 2008 10:13:49 -  1.3.4.1
+++ wizard.css  28 Apr 2008 13:03:39 -  1.3.4.2
@@ -274,11 +274,7 @@
display: block;
 }
 
-div.ruler1,
-div.ruler5,
-div.ruler9,
-div.ruler13,
-div.ruler17
+div.ruler1
 {
background-color: #ff;  
height: 18px;   
@@ -291,11 +287,7 @@
width: 100%;
 }
 
-div.ruler1 div,
-div.ruler5 div,
-div.ruler9 div,
-div.ruler13 div,
-div.ruler17 div
+div.ruler1 div
 {  
display: inline;
margin-left: 40px;
@@ -313,11 +305,7 @@
background-repeat: no-repeat;   
 }
 
-div.ruler2,
-div.ruler6,
-div.ruler10,
-div.ruler14,
-div.ruler18
+div.ruler2
 {
background-color: #ff;  
 
@@ -331,11 +319,7 @@
width: 100%;
 }
 
-div.ruler2 div,
-div.ruler6 div,
-div.ruler10 div,
-div.ruler14 div,
-div.ruler18 div
+div.ruler2 div
 {
display: inline;
margin-left: 40px;
@@ -353,11 +337,7 @@
background-repeat: no-repeat;   
 }
 
-div.ruler3,
-div.ruler7,
-div.ruler11,
-div.ruler15,
-div.ruler19
+div.ruler3
 {
background-color: #ff;  
 
@@ -371,11 +351,7 @@
width: 100%;
 }
 
-div.ruler3 div,
-div.ruler7 div,
-div.ruler11 div,
-div.ruler15 div,
-div.ruler19 div
+div.ruler3 div
 {
display: inline;
margin-left: 40px;
@@ -393,11 +369,7 @@
background-repeat: no-repeat;
 }
 
-div.ruler4,
-div.ruler8,
-div.ruler12,
-div.ruler16,
-div.ruler20
+div.ruler4
 {
background-color: #ff;  
 
@@ -411,11 +383,7 @@
width: 100%;
 }
 
-div.ruler4 div,
-div.ruler8 div,
-div.ruler12 div,
-div.ruler16 div,
-div.ruler20 div
+div.ruler4 div
 {
display: inline;
margin-left: 40px;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl wizard.xsl

2008-04-28 Thread jkoster

Update of 
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl
In directory 
james.mmbase.org:/tmp/cvs-serv16673/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl

Modified Files:
wizard.xsl 
Log Message:
CMSC-876 - Layouts of rulers now use a (mod 4)+1. Cleaned up css file.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl
See also: http://www.mmbase.org/jira/browse/CMSC-876


Index: wizard.xsl
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl/wizard.xsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- wizard.xsl  15 Apr 2008 09:10:07 -  1.9
+++ wizard.xsl  28 Apr 2008 13:03:33 -  1.10
@@ -346,7 +346,7 @@
 What to do with 'lists'.
   -->
   
-ruler
+ruler
   
   
   
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/style/extra wizard.css

2008-04-28 Thread jkoster

Update of 
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/style/extra
In directory 
james.mmbase.org:/tmp/cvs-serv16673/cmsc/edit-webapp/src/webapp/editors/editwizards_new/style/extra

Modified Files:
wizard.css 
Log Message:
CMSC-876 - Layouts of rulers now use a (mod 4)+1. Cleaned up css file.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/style/extra
See also: http://www.mmbase.org/jira/browse/CMSC-876


Index: wizard.css
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/style/extra/wizard.css,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- wizard.css  28 Mar 2008 10:16:36 -  1.4
+++ wizard.css  28 Apr 2008 13:03:33 -  1.5
@@ -274,11 +274,7 @@
display: block;
 }
 
-div.ruler1,
-div.ruler5,
-div.ruler9,
-div.ruler13,
-div.ruler17
+div.ruler1
 {
background-color: #ff;  
height: 18px;   
@@ -291,11 +287,7 @@
width: 100%;
 }
 
-div.ruler1 div,
-div.ruler5 div,
-div.ruler9 div,
-div.ruler13 div,
-div.ruler17 div
+div.ruler1 div
 {  
display: inline;
margin-left: 40px;
@@ -313,11 +305,7 @@
background-repeat: no-repeat;   
 }
 
-div.ruler2,
-div.ruler6,
-div.ruler10,
-div.ruler14,
-div.ruler18
+div.ruler2
 {
background-color: #ff;  
 
@@ -331,11 +319,7 @@
width: 100%;
 }
 
-div.ruler2 div,
-div.ruler6 div,
-div.ruler10 div,
-div.ruler14 div,
-div.ruler18 div
+div.ruler2 div
 {
display: inline;
margin-left: 40px;
@@ -353,11 +337,7 @@
background-repeat: no-repeat;   
 }
 
-div.ruler3,
-div.ruler7,
-div.ruler11,
-div.ruler15,
-div.ruler19
+div.ruler3
 {
background-color: #ff;  
 
@@ -371,11 +351,7 @@
width: 100%;
 }
 
-div.ruler3 div,
-div.ruler7 div,
-div.ruler11 div,
-div.ruler15 div,
-div.ruler19 div
+div.ruler3 div
 {
display: inline;
margin-left: 40px;
@@ -393,11 +369,7 @@
background-repeat: no-repeat;
 }
 
-div.ruler4,
-div.ruler8,
-div.ruler12,
-div.ruler16,
-div.ruler20
+div.ruler4
 {
background-color: #ff;  
 
@@ -411,11 +383,7 @@
width: 100%;
 }
 
-div.ruler4 div,
-div.ruler8 div,
-div.ruler12 div,
-div.ruler16 div,
-div.ruler20 div
+div.ruler4 div
 {
display: inline;
margin-left: 40px;
___
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/beans/om NavigationItem.java

2008-04-28 Thread Nico Klasens

Update of 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/beans/om
In directory 
james.mmbase.org:/tmp/cvs-serv16228/cmsc/sitemanagement/src/java/com/finalist/cmsc/beans/om

Modified Files:
  Tag: b1_4
NavigationItem.java 
Log Message:
 CMSC-875 NavigationItem expirydate field should be expiredate


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/beans/om
See also: http://www.mmbase.org/jira/browse/CMSC-875


Index: NavigationItem.java
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/beans/om/NavigationItem.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -b -r1.5 -r1.5.2.1
--- NavigationItem.java 16 Jan 2008 10:56:09 -  1.5
+++ NavigationItem.java 28 Apr 2008 12:45:11 -  1.5.2.1
@@ -13,7 +13,7 @@
private Date creationdate;
private Date lastmodifieddate;
private Date publishdate;
-   private Date expirydate;
+   private Date expiredate;
private boolean use_expiry;
private String lastmodifier;
private boolean inmenu;
@@ -85,13 +85,13 @@
}
 
 
-   public Date getExpirydate() {
-  return expirydate;
+   public Date getExpiredate() {
+  return expiredate;
}
 
 
-   public void setExpirydate(Date expirydate) {
-  this.expirydate = expirydate;
+   public void setExpiredate(Date expirydate) {
+  this.expiredate = expirydate;
}
 
 
___
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 SiteManagementServiceMMBaseImpl.java

2008-04-28 Thread Nico Klasens

Update of 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement
In directory 
james.mmbase.org:/tmp/cvs-serv16228/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement

Modified Files:
  Tag: b1_4
SiteManagementServiceMMBaseImpl.java 
Log Message:
 CMSC-875 NavigationItem expirydate field should be expiredate


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-875


Index: SiteManagementServiceMMBaseImpl.java
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/SiteManagementServiceMMBaseImpl.java,v
retrieving revision 1.13.2.2
retrieving revision 1.13.2.3
diff -u -b -r1.13.2.2 -r1.13.2.3
--- SiteManagementServiceMMBaseImpl.java28 Mar 2008 15:48:49 -  
1.13.2.2
+++ SiteManagementServiceMMBaseImpl.java28 Apr 2008 12:45:11 -  
1.13.2.3
@@ -110,7 +110,7 @@
private boolean isValidNavigation(NavigationItem item) {
if (item.isUse_expirydate()) {
Date now = new Date();
-   return now.after(item.getPublishdate()) && 
now.before(item.getExpirydate());
+   return now.after(item.getPublishdate()) && 
now.before(item.getExpiredate());
}
return true;
}
___
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 SiteManagementServiceMMBaseImpl.java

2008-04-28 Thread Nico Klasens

Update of 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement
In directory 
james.mmbase.org:/tmp/cvs-serv16188/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement

Modified Files:
SiteManagementServiceMMBaseImpl.java 
Log Message:
 CMSC-875 NavigationItem expirydate field should be expiredate


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-875


Index: SiteManagementServiceMMBaseImpl.java
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/SiteManagementServiceMMBaseImpl.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- SiteManagementServiceMMBaseImpl.java12 Apr 2008 14:26:07 -  
1.16
+++ SiteManagementServiceMMBaseImpl.java28 Apr 2008 12:45:05 -  
1.17
@@ -110,7 +110,7 @@
private boolean isValidNavigation(NavigationItem item) {
if (item.isUse_expirydate()) {
Date now = new Date();
-   return now.after(item.getPublishdate()) && 
now.before(item.getExpirydate());
+   return now.after(item.getPublishdate()) && 
now.before(item.getExpiredate());
}
return true;
}
___
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/beans/om NavigationItem.java

2008-04-28 Thread Nico Klasens

Update of 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/beans/om
In directory 
james.mmbase.org:/tmp/cvs-serv16188/cmsc/sitemanagement/src/java/com/finalist/cmsc/beans/om

Modified Files:
NavigationItem.java 
Log Message:
 CMSC-875 NavigationItem expirydate field should be expiredate


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/beans/om
See also: http://www.mmbase.org/jira/browse/CMSC-875


Index: NavigationItem.java
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/beans/om/NavigationItem.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- NavigationItem.java 16 Jan 2008 10:56:09 -  1.5
+++ NavigationItem.java 28 Apr 2008 12:45:05 -  1.6
@@ -13,7 +13,7 @@
private Date creationdate;
private Date lastmodifieddate;
private Date publishdate;
-   private Date expirydate;
+   private Date expiredate;
private boolean use_expiry;
private String lastmodifier;
private boolean inmenu;
@@ -85,13 +85,13 @@
}
 
 
-   public Date getExpirydate() {
-  return expirydate;
+   public Date getExpiredate() {
+  return expiredate;
}
 
 
-   public void setExpirydate(Date expirydate) {
-  this.expirydate = expirydate;
+   public void setExpiredate(Date expirydate) {
+  this.expiredate = expirydate;
}
 
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/edit_defaults/newsletter newslettercontent.jsp

2008-04-28 Thread kevinshen

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/edit_defaults/newsletter
In directory 
james.mmbase.org:/tmp/cvs-serv16055/webapp/WEB-INF/templates/edit_defaults/newsletter

Modified Files:
newslettercontent.jsp 
Log Message:
CMSC-867,modify Newsletter Content Portlet.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/edit_defaults/newsletter
See also: http://www.mmbase.org/jira/browse/CMSC-867


Index: newslettercontent.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/edit_defaults/newsletter/newslettercontent.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- newslettercontent.jsp   23 Apr 2008 11:03:16 -  1.7
+++ newslettercontent.jsp   28 Apr 2008 12:39:44 -  1.8
@@ -72,6 +72,58 @@


 
+
+
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+



___
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/newsletter/util NewsletterUtil.java

2008-04-28 Thread kevinshen

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
In directory 
james.mmbase.org:/tmp/cvs-serv16055/java/com/finalist/newsletter/util

Modified Files:
NewsletterUtil.java 
Log Message:
CMSC-867,modify Newsletter Content Portlet.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
See also: http://www.mmbase.org/jira/browse/CMSC-867


Index: NewsletterUtil.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterUtil.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- NewsletterUtil.java 23 Apr 2008 11:03:16 -  1.15
+++ NewsletterUtil.java 28 Apr 2008 12:39:44 -  1.16
@@ -2,22 +2,33 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.SortedSet;
+import java.util.TreeSet;
 
 import net.sf.mmapps.commons.beans.MMBaseNodeMapper;
 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 org.mmbase.bridge.NodeManager;
 import org.mmbase.bridge.NodeQuery;
+import org.mmbase.bridge.Query;
 import org.mmbase.bridge.util.Queries;
 import org.mmbase.bridge.util.SearchUtil;
+import org.mmbase.storage.search.Constraint;
+import org.mmbase.storage.search.FieldValueInConstraint;
+import org.mmbase.storage.search.RelationStep;
+import org.mmbase.storage.search.Step;
 
 import com.finalist.cmsc.beans.om.ContentElement;
+import com.finalist.newsletter.cao.impl.NewsletterSubscriptionCAOImpl;
 
 public abstract class NewsletterUtil {
-
+   private static Log log = LogFactory
+   .getLog(NewsletterUtil.class);
public static final String NEWSLETTER = "newsletter";
public static final String NEWSLETTERPUBLICATION = "newsletterpublication";
 
@@ -204,8 +215,26 @@
  List articles = new ArrayList();
  Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
  Node newsletterNode = cloud.getNode(newsletterNumber);
+ 
+ NodeManager tagNodeManager = cloud.getNodeManager("tag");   
+ NodeList tags = newsletterNode.getRelatedNodes(tagNodeManager);
  NodeManager articleNodeManager = cloud.getNodeManager("article"); 

- NodeQuery  query =  
Queries.createRelatedNodesQuery(newsletterNode,articleNodeManager,null,null);
+ Node tag = null; 
+ SortedSet sort= new TreeSet();
+ for (int i = 0 ; i < tags.size(); i++) {
+tag =  tags.getNode(i);
+sort.add(new Integer(tag.getNumber()));
+ }
+ if(sort.size() == 0) {
+return (null);
+ }
+ NodeQuery query = cloud.createNodeQuery();
+ Step parameterStep = query.addStep(articleNodeManager);
+ query.setNodeStep(parameterStep);
+ query.addRelationStep(tagNodeManager,
+   null, null);
+ SearchUtil.addInConstraint(query, tagNodeManager
+   .getField("number"), sort);   
  Queries.addSortOrders(query, orderBy, direction);
  query.setOffset(offset);
  query.setMaxNumber(elementsPerPage);
@@ -222,12 +251,33 @@
   }
   return (null);
}
+   
public static int countArticlesByNewsletter(int newsletterNumber) {
   if (newsletterNumber > 0) {
  Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
  Node newsletterNode = cloud.getNode(newsletterNumber);
+ 
+ NodeManager tagNodeManager = cloud.getNodeManager("tag");   
+ NodeList tags = newsletterNode.getRelatedNodes(tagNodeManager);
  NodeManager articleNodeManager = cloud.getNodeManager("article"); 

- NodeQuery  query =  
Queries.createRelatedNodesQuery(newsletterNode,articleNodeManager,null,null);
+ Node tag = null; 
+ SortedSet sort= new TreeSet();
+ for (int i = 0 ; i < tags.size(); i++) {
+tag =  tags.getNode(i);
+sort.add(new Integer(tag.getNumber()));
+ }
+ if(sort.size() == 0) {
+return (0);
+ }
+ NodeQuery query = cloud.createNodeQuery();
+ Step parameterStep = query.addStep(articleNodeManager);
+ query.setNodeStep(parameterStep);
+ query.addRelationStep(tagNodeManager,
+   null, null);
+ SearchUtil.addInConstraint(query, tagNodeManager
+   .getField("number"), sort);  
+ 
+// NodeQuery  query =  
Queries.createRelatedNodesQuery(tag,articleNodeManager,null,null);
  return Queries.count(query);
   }
   return (0);

[MMBASE CVS] contributions/CMSContainer_Modules/language-redirect/src/webapp/editors/config/page page.xml

2008-04-28 Thread Nico Klasens

Update of 
/var/cvs/contributions/CMSContainer_Modules/language-redirect/src/webapp/editors/config/page
In directory 
james.mmbase.org:/tmp/cvs-serv16016/language-redirect/src/webapp/editors/config/page

Modified Files:
page.xml 
Log Message:
CMSC-874 anguage redirect page does not show all tables


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/language-redirect/src/webapp/editors/config/page
See also: http://www.mmbase.org/jira/browse/CMSC-874


Index: page.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/language-redirect/src/webapp/editors/config/page/page.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- page.xml1 Feb 2008 16:25:34 -   1.3
+++ page.xml28 Apr 2008 12:39:22 -  1.4
@@ -19,7 +19,7 @@
  -->


-   
+   
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Modules/language-redirect/src/webapp/editors/config/page page.xml

2008-04-28 Thread Nico Klasens

Update of 
/var/cvs/contributions/CMSContainer_Modules/language-redirect/src/webapp/editors/config/page
In directory 
james.mmbase.org:/tmp/cvs-serv15993/language-redirect/src/webapp/editors/config/page

Modified Files:
  Tag: b1_4
page.xml 
Log Message:
CMSC-874 anguage redirect page does not show all tables


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/language-redirect/src/webapp/editors/config/page
See also: http://www.mmbase.org/jira/browse/CMSC-874


Index: page.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/language-redirect/src/webapp/editors/config/page/page.xml,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -b -r1.3 -r1.3.2.1
--- page.xml1 Feb 2008 16:25:34 -   1.3
+++ page.xml28 Apr 2008 12:39:16 -  1.3.2.1
@@ -19,7 +19,7 @@
  -->


-   
+   
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] applications/richtext/META-INF/tags/mm/rich body.tagx

2008-04-28 Thread Sander de Boer

Update of /var/cvs/applications/richtext/META-INF/tags/mm/rich
In directory james.mmbase.org:/tmp/cvs-serv12580

Modified Files:
body.tagx 
Log Message:
typo



See also: 
http://cvs.mmbase.org/viewcvs/applications/richtext/META-INF/tags/mm/rich


Index: body.tagx
===
RCS file: /var/cvs/applications/richtext/META-INF/tags/mm/rich/body.tagx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- body.tagx   25 Apr 2008 21:33:18 -  1.5
+++ body.tagx   28 Apr 2008 09:57:06 -  1.6
@@ -4,7 +4,7 @@
 xmlns:jsp="http://java.sun.com/JSP/Page";
 xmlns:os="http://www.opensymphony.com/oscache";
 version="2.0">
-  
@@ -39,7 +39,7 @@
   />
 
   
 
   http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation breadcrumb.jsp

2008-04-28 Thread Nico Klasens

Update of 
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation
In directory 
james.mmbase.org:/tmp/cvs-serv11756/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation

Modified Files:
breadcrumb.jsp 
Log Message:
two lines are also in portletglobals.jsp


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation


Index: breadcrumb.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/breadcrumb.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- breadcrumb.jsp  12 Oct 2007 14:09:30 -  1.2
+++ breadcrumb.jsp  28 Apr 2008 09:15:40 -  1.3
@@ -1,7 +1,4 @@
 <[EMAIL PROTECTED] file="/WEB-INF/templates/portletglobals.jsp" %>
-<[EMAIL PROTECTED] uri="http://java.sun.com/jsp/jstl/functions"; prefix="fn" %>
-
-
 
 
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/config/applications/contentrepository/builders tag.xml

2008-04-28 Thread kevinshen

Update of 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/config/applications/contentrepository/builders
In directory james.mmbase.org:/tmp/cvs-serv11126

Modified Files:
tag.xml 
Log Message:
CMSC-711,Customized search option for edit-wizard,add a field  "subject"


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/config/applications/contentrepository/builders
See also: http://www.mmbase.org/jira/browse/CMSC-711


Index: tag.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/config/applications/contentrepository/builders/tag.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tag.xml 17 Apr 2008 10:07:27 -  1.2
+++ tag.xml 28 Apr 2008 08:55:22 -  1.3
@@ -55,5 +55,27 @@
STRING


+  
+   
+   
+   
+   
+   
+   Onderwerp
+   Subject
+   
+   
+   
+   1
+   -1
+   -1
+   
+   
+   http://www.mmbase.org/xmlns/datatypes"; >
+   
+   subject
+   STRING
+   
+   

 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/WEB-INF web.xml

2008-04-28 Thread mguo

Update of 
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/WEB-INF
In directory 
james.mmbase.org:/tmp/cvs-serv10643/demo.cmscontainer.org/war-community/src/webapp/WEB-INF

Modified Files:
web.xml 
Log Message:
CMSC-708 modify maven pom file.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/WEB-INF
See also: http://www.mmbase.org/jira/browse/CMSC-708


Index: web.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- web.xml 15 Feb 2008 12:29:49 -  1.4
+++ web.xml 28 Apr 2008 08:37:57 -  1.5
@@ -85,7 +85,7 @@
 
 
   contextConfigLocation
-  /WEB-INF/spring-community.xml
+  /WEB-INF/spring-*.xml
 
 
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community project.xml

2008-04-28 Thread mguo

Update of 
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community
In directory 
james.mmbase.org:/tmp/cvs-serv10643/demo.cmscontainer.org/war-community

Modified Files:
project.xml 
Log Message:
CMSC-708 modify maven pom file.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community
See also: http://www.mmbase.org/jira/browse/CMSC-708


Index: project.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community/project.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- project.xml 8 Mar 2008 16:00:23 -   1.8
+++ project.xml 28 Apr 2008 08:37:57 -  1.9
@@ -177,14 +177,13 @@
 
 
 
-
 
 finalist
 cmsc-portlets-newsletter
 ${cmscportlets.version}
 mmbase-module
 
--->

[MMBASE CVS] contributions/CMSContainer_Demo/demo.cmscontainer.org/maven-base project.xml

2008-04-28 Thread mguo

Update of 
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/maven-base
In directory 
james.mmbase.org:/tmp/cvs-serv10643/demo.cmscontainer.org/maven-base

Modified Files:
project.xml 
Log Message:
CMSC-708 modify maven pom file.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/maven-base
See also: http://www.mmbase.org/jira/browse/CMSC-708


Index: project.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/maven-base/project.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- project.xml 22 Apr 2008 10:45:53 -  1.14
+++ project.xml 28 Apr 2008 08:37:57 -  1.15
@@ -77,12 +77,6 @@
   
 
 finalist
-cmsc-portlets-newsletter  
  
-${cmscportlets.version}
-mmbase-module
-
-  
- finalist
  cmsc-portlets-google
  ${cmscportlets.version}
  mmbase-module
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/config/applications newsletter.xml

2008-04-28 Thread kevinshen

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/config/applications
In directory james.mmbase.org:/tmp/cvs-serv9718/config/applications

Modified Files:
newsletter.xml 
Log Message:
CMSC-711,Customized search option for edit-wizard,add tag relation into 
newsletter


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/config/applications
See also: http://www.mmbase.org/jira/browse/CMSC-711


Index: newsletter.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- newsletter.xml  17 Apr 2008 10:08:40 -  1.17
+++ newsletter.xml  28 Apr 2008 07:47:17 -  1.18
@@ -26,6 +26,7 @@
 


+   



@@ -52,6 +53,7 @@



-   
+   
+   

 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter search_article_insrel_tag.xml search_tag.xml edit_newsletter.xml load_newsletter.xml search_n

2008-04-28 Thread kevinshen

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter
In directory 
james.mmbase.org:/tmp/cvs-serv9718/src/webapp/editors/config/newsletter

Modified Files:
edit_newsletter.xml load_newsletter.xml 
search_newsletter_posrel_tag.xml 
Added Files:
search_article_insrel_tag.xml search_tag.xml 
Log Message:
CMSC-711,Customized search option for edit-wizard,add tag relation into 
newsletter


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter
See also: http://www.mmbase.org/jira/browse/CMSC-711


search_article_insrel_tag.xml is new



search_tag.xml is new



Index: edit_newsletter.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/edit_newsletter.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- edit_newsletter.xml 18 Apr 2008 06:15:39 -  1.10
+++ edit_newsletter.xml 28 Apr 2008 07:47:17 -  1.11
@@ -100,5 +100,5 @@



-   
+   
 


Index: load_newsletter.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/load_newsletter.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- load_newsletter.xml 18 Apr 2008 06:15:39 -  1.10
+++ load_newsletter.xml 28 Apr 2008 07:47:17 -  1.11
@@ -26,10 +26,10 @@



+   





-   
 


Index: search_newsletter_posrel_tag.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/search_newsletter_posrel_tag.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- search_newsletter_posrel_tag.xml17 Apr 2008 10:14:03 -  1.1
+++ search_newsletter_posrel_tag.xml28 Apr 2008 07:47:17 -  1.2
@@ -1,28 +1,27 @@
-
+ï»¿
 http://www.mmbase.org/dtd/wizard-schema_1_0.dtd";>
 


TAG
-   æ ç¾
+
 


Name
Name
-   åç§°


 

Search tag
Zoek bijlage
-   æ¥æ¾æ ç¾
+

Name
Titel
-   æ ç¾
+
[name]


@@ -30,13 +29,15 @@

New
Nieuw
-   æ°å»º
+

 


{sum(//[EMAIL PROTECTED]'posrel' and 
@firstitem='true']/[EMAIL PROTECTED]'tag']/../[EMAIL 
PROTECTED]'pos'])-{$pos}}
-   
+   
+ [EMAIL PROTECTED]'newsletter']/[EMAIL 
PROTECTED]'title']}
+ 


 
\ 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/basicmodel/src/webapp/editors/config/article article.xml load_article.xml

2008-04-28 Thread kevinshen

Update of 
/var/cvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/article
In directory james.mmbase.org:/tmp/cvs-serv9590

Modified Files:
article.xml load_article.xml 
Log Message:
CMSC-711,Customized search option for edit-wizard,add tag tab into article 
section


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/article
See also: http://www.mmbase.org/jira/browse/CMSC-711


Index: article.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/article/article.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- article.xml 17 Apr 2008 10:08:08 -  1.10
+++ article.xml 28 Apr 2008 07:44:01 -  1.11
@@ -19,14 +19,14 @@
   
 
 
-   
+   
 
   



 
-
+
 

 


Index: load_article.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/article/load_article.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- load_article.xml17 Apr 2008 10:08:08 -  1.8
+++ load_article.xml28 Apr 2008 07:44:01 -  1.9
@@ -24,11 +24,7 @@



-   
-  
- 
- 
-
+   



___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

69 matches

Mail list logo