[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/test/com/finalist/newsletter/services/mock FakeNewsletterService.java

[mguo]

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

Modified Files:
FakeNewsletterService.java 
Log Message:
CMSC-811 update domain test and publisher


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


Index: FakeNewsletterService.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/test/com/finalist/newsletter/services/mock/FakeNewsletterService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- FakeNewsletterService.java  10 Apr 2008 09:43:05 -  1.1
+++ FakeNewsletterService.java  22 Apr 2008 03:44:12 -  1.2
@@ -28,4 +28,8 @@
return letters;
}
 
+   public String getNewsletterName(int newsletterId) {
+  return null;
+   }
+
 }
___
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

[mguo]

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

Modified Files:
NewsletterCAOTest.java 
Log Message:
CMSC-811 update domain test and publisher


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


___
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 Subscription.java

[mguo]

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

Modified Files:
Subscription.java 
Log Message:
CMSC-811 update domain test and publisher


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


Index: Subscription.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/domain/Subscription.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- Subscription.java   18 Apr 2008 08:06:22 -  1.4
+++ Subscription.java   22 Apr 2008 03:44:12 -  1.5
@@ -46,8 +46,7 @@
}
 
public Newsletter getNewsletter() {
-   return null; // To change body of created methods use File | 
Settings
-   // | File Templates.
+   return this.newsletter;
}
 
 
___
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 NewsletterPublicationListener.java

[mguo]

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

Modified Files:
NewsletterPublicationListener.java 
Log Message:
CMSC-811 update domain test and publisher


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


Index: NewsletterPublicationListener.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/NewsletterPublicationListener.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- NewsletterPublicationListener.java  17 Jan 2008 21:47:15 -  1.9
+++ NewsletterPublicationListener.java  22 Apr 2008 03:44:12 -  1.10
@@ -11,8 +11,8 @@
public void notify(NodeEvent event) {
   if (event.getType() == Event.TYPE_NEW) {
  int publicationNumber = event.getNodeNumber();
- Thread publisher = new NewsletterPublisher(publicationNumber);
- publisher.start();
+// Thread publisher = new NewsletterPublisher(publicationNumber);
+// publisher.start();
   }
}
 }
\ 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/test/com/finalist/newsletter/cao/impl NewsletterPublicationCAOImplTest.java

[mguo]

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

Modified Files:
NewsletterPublicationCAOImplTest.java 
Log Message:
CMSC-811 update domain test and publisher


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


Index: NewsletterPublicationCAOImplTest.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/test/com/finalist/newsletter/cao/impl/NewsletterPublicationCAOImplTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- NewsletterPublicationCAOImplTest.java   17 Apr 2008 02:54:42 -  
1.1
+++ NewsletterPublicationCAOImplTest.java   22 Apr 2008 03:44:12 -  
1.2
@@ -2,6 +2,7 @@
 
 import com.finalist.newsletter.BaseNewsletterTest;
 import com.finalist.newsletter.domain.Publication;
+import static com.finalist.newsletter.domain.Publication.STATUS;
 import org.mmbase.bridge.NodeManager;
 import org.mmbase.bridge.Node;
 import org.mmbase.bridge.RelationManager;
@@ -16,6 +17,17 @@
}
 
public void testGetPublication() {
+
+  cao = new NewsletterPublicationCAOImpl(cloud){
+ protected String getNewsletterPath(Node newsletterPublicationNode) {
+return "/publication/pub";
+ }
+
+ protected String getHostUrl() {
+return "www.iamhosting.com";
+ }
+  };
+
   NodeManager letterManager = cloud.getNodeManager("newsletter");
   Node newsletter = letterManager.createNode();
   newsletter.setStringValue("from_mail", "[EMAIL PROTECTED]");
@@ -24,16 +36,29 @@
   newsletter.setStringValue("replyto_name", "replayto_name");
   newsletter.commit();
 
-  NodeManager subscriptionmanager = 
cloud.getNodeManager("newsletterpublication");
-  Node relatedNode = subscriptionmanager.createNode();
+  NodeManager publicationManager = 
cloud.getNodeManager("newsletterpublication");
+  Node relatedNode = publicationManager.createNode();
+  relatedNode.setStringValue("status", STATUS.INITIAL.toString());
   relatedNode.commit();
 
-  Node unrelatedNode = subscriptionmanager.createNode();
+  Node unrelatedNode = publicationManager.createNode();
   unrelatedNode.commit();
 
-  RelationManager relManager = 
cloud.getRelationManager("newsletter","subscriptionrecord","newslettered");
+  RelationManager relManager = 
cloud.getRelationManager("newsletter","newsletterpublication","related");
   relManager.createRelation(newsletter,relatedNode).commit();
 
   Publication publication = cao.getPublication(relatedNode.getNumber());
+  assertEquals("www.iamhosting.com/publication/pub",publication.getUrl());
+  assertEquals(STATUS.INITIAL,publication.getStatus());
+  assertEquals(relatedNode.getNumber(),publication.getId());
+
+  assertEquals("[EMAIL 
PROTECTED]",publication.getNewsletter().getFromAddress());
+  assertEquals("from_name",publication.getNewsletter().getFromName());
+  assertEquals("[EMAIL 
PROTECTED]",publication.getNewsletter().getReplyAddress());
+  assertEquals("replayto_name",publication.getNewsletter().getReplyName());
+
+  assertEquals(newsletter.getNumber(),publication.getNewsletter().getId());
+
}
+
 }
___
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 NewsletterSubscriptionUtil.java

[mguo]

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

Modified Files:
NewsletterSubscriptionUtil.java 
Log Message:
CMSC-811 update domain test and publisher


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


Index: NewsletterSubscriptionUtil.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterSubscriptionUtil.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- NewsletterSubscriptionUtil.java 28 Mar 2008 05:13:33 -  1.25
+++ NewsletterSubscriptionUtil.java 22 Apr 2008 03:44:12 -  1.26
@@ -5,7 +5,6 @@
 import java.util.ResourceBundle;
 
 import com.finalist.cmsc.services.community.NewsletterCommunication;
-import com.finalist.newsletter.generator.NewsletterGeneratorFactory;
 
 public abstract class NewsletterSubscriptionUtil {
 
@@ -168,7 +167,6 @@
public static void setPreferredMimeType(String userName, String mimeType) {
   if (userName != null) {
  if (mimeType == null) {
-mimeType = NewsletterGeneratorFactory.MIMETYPE_DEFAULT;
  }
  NewsletterCommunication.removeUserPreference(userName, 
PREFERRED_MIMETYPE);
  NewsletterCommunication.setUserPreference(userName, 
PREFERRED_MIMETYPE, mimeType);
___
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/forms NewsletterPublicationCreate.java NewsletterPublicationPublish.java

[mguo]

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

Modified Files:
NewsletterPublicationCreate.java 
NewsletterPublicationPublish.java 
Log Message:
CMSC-811 update domain test and publisher


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


Index: NewsletterPublicationCreate.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationCreate.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- NewsletterPublicationCreate.java8 Jan 2008 10:45:00 -   1.12
+++ NewsletterPublicationCreate.java22 Apr 2008 03:44:12 -  1.13
@@ -17,6 +17,7 @@
 import org.apache.struts.action.ActionMapping;
 import org.mmbase.bridge.Cloud;
 import org.mmbase.bridge.Node;
+import org.mmbase.bridge.RelationManager;
 
 import com.finalist.cmsc.struts.MMBaseFormlessAction;
 import com.finalist.newsletter.util.NewsletterPublicationUtil;
@@ -32,6 +33,11 @@
  int parent = Integer.parseInt(getParameter(request, "parent", true));
  boolean copyContent = Boolean.valueOf(getParameter(request, 
"copycontent", true));
  Node publicationNode = 
NewsletterPublicationUtil.createPublication(parent, copyContent);
+ Node parentNode = cloud.getNode(parent);
+ Node pubNode = cloud.getNode(publicationNode.getNumber());
+ RelationManager relManager = cloud.getRelationManager("newsletter", 
"newsletterpublication", "related");
+ relManager.createRelation(parentNode,pubNode).commit();
+
  String objectnumber = String.valueOf(publicationNode.getNumber());
  request.getSession().removeAttribute("parent");
  ActionForward ret = new 
ActionForward(mapping.findForward("openwizard").getPath() + "?objectnumber=" + 
objectnumber + "&returnurl="


Index: NewsletterPublicationPublish.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationPublish.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- NewsletterPublicationPublish.java   8 Mar 2008 15:57:55 -   1.6
+++ NewsletterPublicationPublish.java   22 Apr 2008 03:44:12 -  1.7
@@ -44,8 +44,8 @@
  if (NavigationUtil.getChildCount(publicationNode) > 0 && 
!isWebMaster) {
 return mapping.findForward("confirmationpage");
  }
- Thread publisher = new NewsletterPublisher(number);
- publisher.start();
+// Thread publisher = new NewsletterPublisher(number);
+// publisher.start();
 
  return mapping.findForward(SUCCESS);
   }
___
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 POConvertUtils.java

[mguo]

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

Modified Files:
POConvertUtils.java 
Log Message:
CMSC-811 update domain test and publisher


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


Index: POConvertUtils.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/POConvertUtils.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- POConvertUtils.java 17 Apr 2008 02:44:01 -  1.3
+++ POConvertUtils.java 22 Apr 2008 03:35:53 -  1.4
@@ -2,18 +2,17 @@
 
 import com.finalist.cmsc.services.community.person.Person;
 import com.finalist.newsletter.domain.Subscription;
-import org.mmbase.bridge.Node;
-import org.apache.commons.lang.StringUtils;
 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.util.List;
-import java.util.ArrayList;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
 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) {
@@ -30,31 +29,70 @@
}
 
 
-   public void convert(T target, Node node) throws IllegalAccessException, 
InvocationTargetException, InstantiationException {
-
+   public void convert(T target, Node node) {
 
+  try {
   Method[] targetFields = target.getClass().getDeclaredMethods();
 
   for (Method method : targetFields) {
  String name = method.getName();
+if("setId".equals(name)){
+   BeanUtils.setProperty(target, "id", node.getNumber());  
 
+}
  if (null != getNodeValue(node, name)) {
-BeanUtils.setProperty(target, getPropertieName(name), 
getNodeValue(node, name));
+   String propertyName = 
name.substring(3,4).toLowerCase()+name.substring(4, name.length());
+   BeanUtils.setProperty(target, propertyName, getNodeValue(node, 
name));
+}
  }
+  } catch (Exception e) {
+log.error("Error when convert node to pojo",e);
   }
+
+
}
 
private Object getNodeValue(Node node, String name) {
   String value = null;
 
-  if (name.startsWith("set") && 
node.getNodeManager().hasField(getPropertieName(name))) {
- value = node.getStringValue(getPropertieName(name));
+  if (!name.startsWith("set")) {
+ return null;
+  }
+
+  for (String propertyName : getPropertieNames(name)) {
+ if (node.getNodeManager().hasField(propertyName)) {
+value = node.getStringValue(propertyName);
+break;
+ }
   }
 
   return value;
}
 
-   private String getPropertieName(String name) {
-  return name.substring(3, name.length()).toLowerCase();
+   private String[] getPropertieNames(String methodName) {
+  methodName = methodName.substring(3, methodName.length());
+
+  String[] names = new String[]{methodName.toLowerCase(),""};
+
+  StringBuffer buffer = new StringBuffer();
+
+  char[] chars = methodName.toCharArray();
+  for (int i = 0; i < chars.length; i++) {
+ char aChar = chars[i];
+
+ if (0 == i) {
+buffer.append(String.valueOf(aChar).toLowerCase());
+continue;
+ }
+
+ if (Character.isUpperCase(aChar)) {
+buffer.append("_");
+ }
+ buffer.append(String.valueOf(aChar).toLowerCase());
+  }
+
+  names[1] = buffer.toString();
+
+  return names;
}
 
 }
___
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/services NewsletterPublicationServiceTest.java

[mguo]

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

Modified Files:
NewsletterPublicationServiceTest.java 
Log Message:
CMSC-811 update domain test and publisher


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


Index: NewsletterPublicationServiceTest.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/test/com/finalist/newsletter/services/NewsletterPublicationServiceTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- NewsletterPublicationServiceTest.java   17 Apr 2008 02:54:43 -  
1.4
+++ NewsletterPublicationServiceTest.java   22 Apr 2008 03:35:53 -  
1.5
@@ -26,94 +26,36 @@
   mockController = new MockController();
}
 
-   public void testDeliverAllPublication() {
+   public void testDeliverTest() {
   NewsletterPublicationServiceImpl service = new 
NewsletterPublicationServiceImpl();
+  FakeNewsletterPublisher fakepuFakeNewsletterPublisher = new 
FakeNewsletterPublisher();
 
   NewsletterPublicationCAO publicationCAO = (NewsletterPublicationCAO) 
mockController.getMock(NewsletterPublicationCAOImpl.class);
-  NewsletterSubscriptionCAO subscriptionCAO = (NewsletterSubscriptionCAO) 
mockController.getMock(NewsletterSubscriptionCAOImpl.class);
-  NewsLetterStatisticCAO statisticCAO = (NewsLetterStatisticCAO) 
mockController.getMock(NewsLetterStatisticCAOImpl.class);
-  FakeNewsletterPublisher publisher = new FakeNewsletterPublisher();
-
-  mockController.expect(new NewsletterPublicationCAOImpl() {
- public List getIntimePublication() {
-List pubs = new ArrayList();
-addPublication(pubs, 1);
-addPublication(pubs, 3);
-return pubs;
- }
-  });
-
-  mockController.expect(new NewsletterSubscriptionCAOImpl() {
- public List getSubscribers(int newsletterId) {
-assertEquals(1, newsletterId);
-Subscription subscriptioin = new Subscription();
-return Collections.singletonList(subscriptioin);
- }
-  });
-
-  mockController.expect(new NewsLetterStatisticCAOImpl() {
- public void logPubliction(int id, int i) {
-assertEquals(1, id);
-assertEquals(1, i);
- }
+  service.setPublicationCAO(publicationCAO);
+  service.setMailSender(fakepuFakeNewsletterPublisher);
 
-  });
   mockController.expect(new NewsletterPublicationCAOImpl() {
- public void setStatus(Publication publication, Publication.STATUS 
status) {
-assertNotNull(publication);
-assertEquals(1, publication.getId());
-assertNotNull(status);
-assertEquals(status, Publication.STATUS.DELIVERED);
- }
-  });
+ public Publication getPublication(int number) {
+assertEquals(1, number);
+Publication publication = new Publication();
 
-  mockController.expect(new NewsletterSubscriptionCAOImpl() {
- public List getSubscribers(int newsletterId) {
-assertEquals(3, newsletterId);
-Subscription subscriptioin = new Subscription();
-return Collections.singletonList(subscriptioin);
- }
-  });
+Newsletter letter = new Newsletter();
+letter.setId();
 
-  mockController.expect(new NewsLetterStatisticCAOImpl() {
- public void logPubliction(int id, int i) {
-assertEquals(3, id);
-assertEquals(1, i);
- }
-  });
+publication.setNewsletter(letter);
 
-  mockController.expect(new NewsletterPublicationCAOImpl() {
- public void setStatus(Publication publication, Publication.STATUS 
status) {
-assertNotNull(publication);
-assertEquals(3, publication.getId());
-assertNotNull(status);
-assertEquals(status, Publication.STATUS.DELIVERED);
+return publication;
  }
   });
 
-  service.setPublicationCAO(publicationCAO);
-  service.setSubscriptionCAO(subscriptionCAO);
-  service.setStatisticCAO(statisticCAO);
-  service.setMailSender(publisher);
+  service.deliver(1, "[EMAIL PROTECTED]", "html");
 
-  service.deliverAllPublication();
+  assertEquals("[EMAIL PROTECTED]", 
fakepuFakeNewsletterPublisher.subscription.getSubscriber().getEmail());
+  assertEquals("html", 
fakepuFakeNewsletterPublisher.subscription.getMimeType());
+  assertEquals(, 
fakepuFakeNewsletterPublisher.publication.getNewsletter().getId());
 
   mockController.ve

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl NewsletterPublicationServiceImpl.java

[mguo]

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

Modified Files:
NewsletterPublicationServiceImpl.java 
Log Message:
CMSC-811 update domain test and publisher


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


Index: NewsletterPublicationServiceImpl.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl/NewsletterPublicationServiceImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- NewsletterPublicationServiceImpl.java   17 Apr 2008 02:36:36 -  
1.7
+++ NewsletterPublicationServiceImpl.java   22 Apr 2008 03:35:53 -  
1.8
@@ -1,20 +1,17 @@
 package com.finalist.newsletter.services.impl;
 
-import java.util.List;
-
-import net.sf.mmapps.commons.util.StringUtil;
-
-import com.finalist.cmsc.mmbase.PropertiesUtil;
 import com.finalist.cmsc.services.community.person.Person;
 import com.finalist.newsletter.cao.NewsLetterStatisticCAO;
 import com.finalist.newsletter.cao.NewsletterPublicationCAO;
 import com.finalist.newsletter.cao.NewsletterSubscriptionCAO;
 import com.finalist.newsletter.domain.Publication;
-import com.finalist.newsletter.domain.Subscription;
 import com.finalist.newsletter.domain.Publication.STATUS;
+import com.finalist.newsletter.domain.Subscription;
 import com.finalist.newsletter.publisher.NewsletterPublisher;
 import com.finalist.newsletter.services.NewsletterPublicationService;
 
+import java.util.List;
+
 public class NewsletterPublicationServiceImpl implements 
NewsletterPublicationService {
 
private NewsletterPublisher publisher;
@@ -43,8 +40,6 @@
   for(Publication publication:publications){
  deliver(publication);
   }
-
-
}
 
private void deliver(Publication publication) {
@@ -55,42 +50,20 @@
}
 
public void deliver(int number,String email,String mimeType) {
+
   Publication publication = publicationCAO.getPublication(number);
   Subscription subscription = new Subscription();  
+
   subscription.setMimeType(mimeType);
+  
System.out.println(""+publication.getNewsletter());
+  subscription.setNewsletter(publication.getNewsletter());
+
   Person person = new Person();
   person.setEmail(email);
-
-  
if(StringUtil.isEmptyOrWhitespace(PropertiesUtil.getProperty("mail.system.email")))
 {
- subscription.setFromAddress("[EMAIL PROTECTED]");
-  }
-  else { 
- 
subscription.setFromAddress(PropertiesUtil.getProperty("mail.system.email"));
-  }
-  
if(StringUtil.isEmptyOrWhitespace(PropertiesUtil.getProperty("mail.system.name")))
 {
- subscription.setFromName("test to send publication");
-  }
-  else { 
- 
subscription.setFromName(PropertiesUtil.getProperty("mail.system.name"));
-  }
-  
-  
if(StringUtil.isEmptyOrWhitespace(PropertiesUtil.getProperty("mail.system.email")))
 {
- subscription.setReplyAddress("[EMAIL PROTECTED]");
-  }
-  else { 
- 
subscription.setReplyAddress(PropertiesUtil.getProperty("mail.system.email"));
-  }
-  
if(StringUtil.isEmptyOrWhitespace(PropertiesUtil.getProperty("mail.system.name")))
 {
- subscription.setReplyname("test sending publication");
-  }
-  else { 
- 
subscription.setReplyname(PropertiesUtil.getProperty("mail.system.name"));
-  }
   subscription.setSubscriber(person);
-  subscription.setTitle("test to send publication");
+
   publisher.deliver(publication, subscription);
}
-
public void deliverPublication(int number) {
   Publication publication = publicationCAO.getPublication(number);
   deliver(publication);
___
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 NewsletterPublicationCAOImpl.java

[mguo]

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

Modified Files:
NewsletterPublicationCAOImpl.java 
Log Message:
CMSC-811 update domain test and publisher


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


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.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- NewsletterPublicationCAOImpl.java   16 Apr 2008 10:47:39 -  1.4
+++ NewsletterPublicationCAOImpl.java   22 Apr 2008 03:35:53 -  1.5
@@ -11,13 +11,24 @@
 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;
 
 
 public class NewsletterPublicationCAOImpl implements NewsletterPublicationCAO {
 
+   private static Logger log = 
Logging.getLoggerInstance(NewsletterPublicationCAOImpl.class.getName());
 
Cloud cloud;
 
@@ -47,14 +58,14 @@
   publicationNode.commit();
}
 
-   private Publication convert(Node node){
+   private Publication convert(Node node) {
   Publication pub = new Publication();
   pub.setId(node.getNumber());
   pub.setStatus(Publication.STATUS.valueOf(node.getStringValue("status")));
   return pub;
}
 
-   private List convert(List nodeList){
+   private List convert(List nodeList) {
   List pubs = new ArrayList();
 
   for (Node node : nodeList) {
@@ -66,6 +77,44 @@
 
public Publication getPublication(int number) {
   Node newsletterPublicationNode = cloud.getNode(number);
-  return convert(newsletterPublicationNode);
+
+  String hostUrl = getHostUrl();
+  String newsletterPath = getNewsletterPath(newsletterPublicationNode);
+  String newsletterUrl = "".concat(hostUrl).concat(newsletterPath);
+  
+  List relatedNewsletters = 
newsletterPublicationNode.getRelatedNodes("newsletter");
+
+  log.debug("Get "+relatedNewsletters.size() +" related newsletter");
+  
+  Publication pub = new Publication();
+  pub.setId(newsletterPublicationNode.getNumber());
+  
pub.setStatus(Publication.STATUS.valueOf(newsletterPublicationNode.getStringValue("status")));
+  pub.setUrl(newsletterUrl);
+
+  Newsletter newsletter = new Newsletter();
+  new 
POConvertUtils().convert(newsletter,relatedNewsletters.get(0));
+  pub.setNewsletter(newsletter);
+
+  return pub;
+   }
+
+   protected String getNewsletterPath(Node newsletterPublicationNode) {
+  String newsletterPath = 
NavigationUtil.getPathToRootString(newsletterPublicationNode, true);
+  return newsletterPath;
+   }
+
+   protected String getHostUrl() {
+  String hostUrl = PropertiesUtil.getProperty("host");
+
+  if(StringUtils.isEmpty(hostUrl)){
+ throw new NewsletterSendFailException("get property  from 
system property and get nothing");
+  }
+
+  log.debug("get property  from system property and get:"+hostUrl);
+
+  if (!hostUrl.endsWith("/")) {
+ hostUrl += "/";
+  }
+  return hostUrl;
}
 }
___
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 NewsletterSendFailException.java

[mguo]

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

Added Files:
NewsletterSendFailException.java 
Log Message:
CMSC-811 update domain test and publisher


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


NewsletterSendFailException.java is new

___
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/publisher NewsletterPublisherTest.java FakeNewsletterPublisher.java NewsletterGeneratorS.java

[mguo]

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

Modified Files:
FakeNewsletterPublisher.java 
Added Files:
NewsletterPublisherTest.java 
Removed Files:
NewsletterGeneratorS.java 
Log Message:
CMSC-811 update domain test and publisher


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


NewsletterPublisherTest.java is new



Index: FakeNewsletterPublisher.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/test/com/finalist/newsletter/publisher/FakeNewsletterPublisher.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- FakeNewsletterPublisher.java17 Apr 2008 02:54:42 -  1.3
+++ FakeNewsletterPublisher.java22 Apr 2008 03:35:53 -  1.4
@@ -1,6 +1,8 @@
 package com.finalist.newsletter.publisher;
 
 import com.finalist.cmsc.services.community.person.Person;
+import com.finalist.newsletter.domain.Publication;
+import com.finalist.newsletter.domain.Subscription;
 
 import java.util.List;
 import java.util.Map;
@@ -8,17 +10,24 @@
 
 public class FakeNewsletterPublisher extends NewsletterPublisher{
 
-   private Map> map = new HashMap>();
+   private Map> massDelivers = new 
HashMap>();
+   public Publication publication;
+   public Subscription subscription;
 
public FakeNewsletterPublisher(){
   
}
 
public void deliver(int publicationId, List persons) {
-  map.put(publicationId,persons);
+  massDelivers.put(publicationId,persons);
}
 
-   public  Map> getMap() {
-  return map;
+   public  Map> getMassDelivers() {
+  return massDelivers;
+   }
+
+   public void deliver(Publication publication, Subscription subscription) {
+   this.publication = publication;
+   this.subscription = subscription;
}
 }


___
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/publisher NewsletterPublisher.java NewsletterGenerator.java

[mguo]

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

Modified Files:
NewsletterPublisher.java NewsletterGenerator.java 
Log Message:
CMSC-811 update domain test and publisher


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


Index: NewsletterPublisher.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher/NewsletterPublisher.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- NewsletterPublisher.java17 Apr 2008 02:50:45 -  1.16
+++ NewsletterPublisher.java22 Apr 2008 03:35:53 -  1.17
@@ -2,10 +2,13 @@
 
 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.cmsc.mmbase.PropertiesUtil;
 import org.mmbase.module.Module;
 import org.mmbase.util.logging.Logger;
 import org.mmbase.util.logging.Logging;
+import org.apache.commons.lang.StringUtils;
 
 import javax.mail.Message;
 import javax.mail.MessagingException;
@@ -23,7 +26,7 @@
 
private static Logger log = 
Logging.getLoggerInstance(NewsletterPublisher.class.getName());
 
-   public void deliver(Publication publication,List 
subscriptions) {
+   public void deliver(Publication publication, List 
subscriptions) {
   for (Subscription subscription : subscriptions) {
  deliver(publication, subscription);
   }
@@ -32,9 +35,11 @@
public void deliver(Publication publication, Subscription subscription) {
   try {
  Message message = new MimeMessage(getMailSession());
- setBody(message, publication,subscription);
+ setBody(message, publication, subscription);
  setHeader(message, subscription);
- Transport.send(message);
+ send(message);
+
+ log.debug("mail send!");
   } catch (MessagingException e) {
  log.error(e);
   } catch (UnsupportedEncodingException e) {
@@ -42,16 +47,25 @@
   }
}
 
-   private void setBody(Message message, Publication publication,Subscription 
subscription) throws MessagingException {
-  NewsletterGenerator.generate(message,publication,subscription);
+   protected void send(Message message) throws MessagingException {
+  Transport.send(message);
+   }
+
+   protected void setBody(Message message, Publication publication, 
Subscription subscription) throws MessagingException {
+  NewsletterGenerator.generate(message, publication, subscription);
}
 
private void setHeader(Message message, Subscription subscription) throws 
MessagingException, UnsupportedEncodingException {
 
-  String emailFrom = subscription.getFromAddress();
-  String nameFrom = subscription.getFromName();
-  String emailReplyTo = subscription.getReplyAddress();
-  String nameReplyTo = subscription.getReplyname();
+  System.out.println("--"+subscription.getNewsletter());
+
+  Newsletter newsletter = subscription.getNewsletter();
+  String emailFrom = getHeaderProperties(newsletter.getFromAddress(), 
"newsletter.default.fromaddress");
+  String nameFrom = getHeaderProperties(newsletter.getFromName(), 
"newsletter.default.fromname");
+  String emailReplyTo = getHeaderProperties(newsletter.getReplyAddress(), 
"newsletter.default.replytoadress");
+  String nameReplyTo = getHeaderProperties(newsletter.getReplyName(), 
"newsletter.default.replyto");
+
+  log.debug("set header property:<" + nameFrom + ">" + emailFrom + "<" + 
nameReplyTo + ">" + emailReplyTo);
 
   InternetAddress fromAddress = new InternetAddress(emailFrom);
   fromAddress.setPersonal(nameFrom);
@@ -64,11 +78,22 @@
   InternetAddress toAddress = new 
InternetAddress(subscription.getSubscriber().getEmail());
   message.setRecipient(MimeMessage.RecipientType.TO, toAddress);
 
-  message.setSubject(subscription.getTitle());
-  message.setHeader("Content-type",subscription.getMimeType());
+  message.setSubject(subscription.getNewsletter().getTitle());
+  message.setHeader("Content-type", subscription.getMimeType());
+   }
+
+   private String getHeaderProperties(String property, String defaultKey) {
+
+
+  if (StringUtils.isEmpty(property)) {
+ property = PropertiesUtil.getProperty(defaultKey);
+ log.debug("get header property:" + property + " from system property 
got:" + property);
+  }
+  log.debug("get header property:" + property +" got:"+property);
+  return property;
}

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/test/com/finalist/newsletter/util Model.java POConvertUtilsTest.java

[mguo]

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

Modified Files:
Model.java POConvertUtilsTest.java 
Log Message:
CMSC-811 update domain test and publisher


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


Index: Model.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/test/com/finalist/newsletter/util/Model.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Model.java  17 Apr 2008 02:54:42 -  1.1
+++ Model.java  22 Apr 2008 03:35:53 -  1.2
@@ -2,22 +2,22 @@
 
 
 public class Model {
-   private String description;
-   private String emailFrom;
+   private String intro;
+   private String replytoMail;
 
-   public String getDescription() {
-  return description;
+   public String getIntro() {
+  return intro;
}
 
-   public void setDescription(String description) {
-  this.description = description;
+   public void setIntro(String intro) {
+  this.intro = intro;
}
 
-   public String getEmailFrom() {
-  return emailFrom;
+   public String getReplytoMail() {
+  return replytoMail;
}
 
-   public void setEmailFrom(String emailFrom) {
-  this.emailFrom = emailFrom;
+   public void setReplytoMail(String replytoMail) {
+  this.replytoMail = replytoMail;
}
 }
\ No newline at end of file


Index: POConvertUtilsTest.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/test/com/finalist/newsletter/util/POConvertUtilsTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- POConvertUtilsTest.java 17 Apr 2008 02:44:01 -  1.1
+++ POConvertUtilsTest.java 22 Apr 2008 03:35:53 -  1.2
@@ -13,12 +13,16 @@
}
 
public void testConvert() throws IllegalAccessException, 
InvocationTargetException, InstantiationException {
-  NodeManager manager = cloud.getNodeManager("contentelement");
+  NodeManager manager = cloud.getNodeManager("newsletter");
   Node node = manager.createNode();
-  node.setStringValue("description", "adescription");
+
+  node.setStringValue("intro", "aintro");
+  node.setStringValue("replyto_mail", "areplyto_mail");
+
   Model model = new Model();
   new POConvertUtils().convert(model, node);
-  assertEquals("adescription", model.getDescription());
+  assertEquals("aintro", model.getIntro());
+  assertEquals("areplyto_mail", model.getReplytoMail());
}
 
 
___
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 NewsletterSubscriptionPortlet.java

[whitebai]

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

Modified Files:
NewsletterSubscriptionPortlet.java 
Log Message:
CMSC-818 modify portlet.


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


Index: NewsletterSubscriptionPortlet.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter/NewsletterSubscriptionPortlet.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- NewsletterSubscriptionPortlet.java  18 Apr 2008 08:30:52 -  1.20
+++ NewsletterSubscriptionPortlet.java  22 Apr 2008 03:00:05 -  1.21
@@ -4,6 +4,7 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
@@ -17,6 +18,7 @@
 import com.finalist.cmsc.portalImpl.PortalConstants;
 import com.finalist.cmsc.portlets.JspPortlet;
 import com.finalist.newsletter.domain.Newsletter;
+import com.finalist.newsletter.domain.Subscription;
 import com.finalist.newsletter.domain.Tag;
 import com.finalist.newsletter.services.NewsletterSubscriptionServices;
 import 
com.finalist.newsletter.services.impl.NewsletterSubscriptionServicesImpl;
@@ -56,7 +58,7 @@
  String userName = "username";
  int userId = 12345; 
 
-
+/*
  List availableStatusOptions = 
NewsletterSubscriptionUtil.getStatusOptions();
  request.setAttribute(NewsletterSubscriptionUtil.STATUS_OPTIONS, 
availableStatusOptions);
 
@@ -77,7 +79,7 @@
 
request.setAttribute(NewsletterSubscriptionUtil.SUBSCRIPTION_STATUS_KEY, 
status);
 String preferredMimeType = 
NewsletterSubscriptionUtil.getPreferredMimeType(userName);
 
request.setAttribute(NewsletterSubscriptionUtil.PREFERRED_MIMETYPE, 
preferredMimeType);
- }
+ }*/
  if(null==newsletters)
  {
doInclude("view", "/fragment/null.jsp", request, response);
@@ -85,14 +87,23 @@
  else 
 {
 if(services.hasSubscription(userId)){
-List newsletterList = 
services.getNewsletterList(newsletters, userId);
-request.setAttribute("newsletterList", newsletterList);
-request.setAttribute("aaa","bbb");
+List subscriptionList = 
services.getSubscriptionList(newsletters, userId);
+request.setAttribute("subscriptionList", 
subscriptionList);
 doInclude("view", "/fragment/list.jsp", request, response);
 } 
 else {
-List newsletterList = 
services.getAllowedNewsletterList(newsletters);
-request.setAttribute("newsletterList", newsletterList);
+List subscriptionList = 
services.getNewSubscription(newsletters);
+Iterator it = subscriptionList.iterator();
+for(int i=0;i tags = subscription.getTags();
+int newsletterId = 
subscription.getNewsletter().getId();
+
System.out.println("title="+title+";newsletterId="+newsletterId);
+}
+request.setAttribute("subscriptionList", 
subscriptionList);
 doInclude("view", "/fragment/welcome.jsp", request, 
response);
 }
 }
___
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

[whitebai]

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

Modified Files:
NewsletterSubscriptionServicesImpl.java 
Log Message:
CMSC-818 modify services.


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


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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- NewsletterSubscriptionServicesImpl.java 18 Apr 2008 08:30:52 -  
1.5
+++ NewsletterSubscriptionServicesImpl.java 22 Apr 2008 02:59:20 -  
1.6
@@ -8,13 +8,17 @@
 import java.util.Set;
 import java.util.StringTokenizer;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.mmbase.bridge.Cloud;
 import org.mmbase.bridge.Node;
 
 import com.finalist.newsletter.cao.NewsletterCAO;
 import com.finalist.newsletter.cao.NewsletterSubscriptionCAO;
+import com.finalist.newsletter.cao.impl.NewsletterCAOImpl;
 import com.finalist.newsletter.cao.impl.NewsletterSubscriptionCAOImpl;
 import com.finalist.newsletter.domain.Newsletter;
+import com.finalist.newsletter.domain.Subscription;
 import com.finalist.newsletter.domain.Tag;
 import com.finalist.newsletter.services.NewsletterSubscriptionServices;
 
@@ -23,99 +27,98 @@
NewsletterSubscriptionCAO cao;
NewsletterCAO newsletterCAO;

+   private static Log log = LogFactory
+   .getLog(NewsletterSubscriptionServicesImpl.class);
+
+   
public void setCao(NewsletterSubscriptionCAO cao) {
-   this.cao = new NewsletterSubscriptionCAOImpl();
+   this.cao = cao;
+   
}
+   public void setNewsletterCao(NewsletterCAO newsletterCAO){
+   this.newsletterCAO = newsletterCAO;
+   }
+   
+   public List getSubscriptionList(String[] 
allowedLetters,int userId){

-   public List getNewsletterList(String[] allowedLetters,int 
userId){
-   List allowedLetterList = 
getAllowedNewsletterList(allowedLetters);
-   List recordList = 
cao.getUserSubscriptionList(userId);
-   List list = new ArrayList();
-   Newsletter allowedNewsletter = new Newsletter();
-   Iterator it = allowedLetterList.iterator();
-   for(int i=0;i subscriptionList = new ArrayList();
+   int newsletterId;
+   for(int i=0;i recordList) {
+   public Subscription addRecordInfo(int newsletterId, int userId) {
 
-//
-// Iterator it = recordList.iterator();
-// for(int i=0;i getAllowedNewsletterList(String[] 
allowedLetters)
+   
+   public List getNewSubscription(String[] allowedLetters)
{
-   List list = new ArrayList();
-   cao = new NewsletterSubscriptionCAOImpl();
+   newsletterCAO = new NewsletterCAOImpl();
+   List list = new ArrayList();
int nodenumber;
for(int i=0;i getAllNewsletterListUsed()
+/* public List getAllNewsletterListUsed()
{
List list = new ArrayList();
list = cao.getAllNewsletter();
return list;
}
-
+*/
public boolean hasSubscription(int userId) {

NewsletterSubscriptionCAO cao = new 
NewsletterSubscriptionCAOImpl();
System.out.println("userId="+userId);
List list = cao.querySubcriptionByUser(userId);
-   System.out.println("list="+list.size());
if(0==list.size()){
return false;
}
else
{
-   System.out.println("");
return true;
}
}
 
public void selectTagInLetter(int userId, int newsletterId, int tagId) {
-   Newsletter newsletter = cao.getNewsletterById(newsletterId);
-   Set tagList = newsletter.getTags();
+   Subscription subscription = cao.getSubscription(newsletterId, 
userId);
+   Set tagList = subscription.getTags();
Iterator it = tagList.iterator();
for(int i=0;i tagList = newsletter.getTags();
+   Subscription subscription = cao.getSubscription(newsletterId, 
userId);
+   

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl NewsletterSubscriptionCAOImpl.java NewsletterCAOImpl.java

[whitebai]

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

Modified Files:
NewsletterSubscriptionCAOImpl.java NewsletterCAOImpl.java 
Log Message:
CMSC-818 modify cao.


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


Index: NewsletterSubscriptionCAOImpl.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- NewsletterSubscriptionCAOImpl.java  21 Apr 2008 09:51:03 -  1.10
+++ NewsletterSubscriptionCAOImpl.java  22 Apr 2008 02:58:21 -  1.11
@@ -47,7 +47,7 @@
this.cloud = cloud;
}
 
-   public List getAllNewsletter() {
+   /*public List getAllNewsletter() {
CloudProvider provider = 
CloudProviderFactory.getCloudProvider();
cloud = provider.getCloud();
List list = new ArrayList();
@@ -72,8 +72,8 @@
}
return list;
}
-
-   public Newsletter getNewsletterById(int id) {
+*/
+   /*public Newsletter getNewsletterById(int id) {
CloudProvider provider = 
CloudProviderFactory.getCloudProvider();
cloud = provider.getCloud();
System.out.println("Newsletterid=" + id);
@@ -87,10 +87,11 @@
newsletter = 
NewsletterSubscriptionUtil.convertNodeListtoTagList(
taglist, newsletter);
return newsletter;
-   }
+   }*/
 
-   public List getUserSubscriptionList(int userId) {
-   List list = new ArrayList();
+   /*public List getUserSubscriptionList(int userId) {
+   List list = new ArrayList();
+   Subscription subscription = new Subscription();
Newsletter newsletter = new Newsletter();
 
List resluts = new ArrayList();
@@ -100,11 +101,9 @@
for (int i = 0; i < resluts.size(); i++) {
Node node = nodes.next();
String status = node.getStringValue("status");
-   newsletter.setStatus(status);
-   Date interval = node.getDateValue("interval");
-   newsletter.setInterval(interval);
+   
subscription.setStatus(Subscription.STATUS.valueOf(status));
String format = node.getStringValue("format");
-   newsletter.setFormat(format);
+   subscription.setMimeType(format);
 
NodeList newsletters = 
node.getRelatedNodes("newsletter");
Iterator newsletterIterator = 
newsletters.iterator();
@@ -112,6 +111,7 @@
String title = newsletterIterator.next()
.getStringValue("title");
newsletter.setTitle(title);
+   subscription.setNewsletter(newsletter);
}
 
NodeManager tagManager = cloud.getNodeManager("tag");
@@ -126,17 +126,16 @@
selectTag.setId(selectTagNode.getNumber());
selectTag.setSubscription(true);
tagList.add(selectTag);
-   newsletter.setTags(tagList);
+   subscription.setTags(new HashSet(tagList));
}
-   list.add(newsletter);
+   list.add(subscription);
}
return list;
-   }
+   }*/
 
public List querySubcriptionByUser(int userId) {
CloudProvider provider = 
CloudProviderFactory.getCloudProvider();
cloud = provider.getCloud();
-   List results = null;
NodeManager recordManager = 
cloud.getNodeManager("subscriptionrecord");
NodeQuery query = cloud.createNodeQuery();
String subscriber = "subscriber";
@@ -144,7 +143,6 @@
theStep = query.addStep(recordManager);
query.setNodeStep(theStep);
Field field = recordManager.getField(subscriber);
-   String userIdString = String.valueOf(userId);
Constraint titleConstraint = 
SearchUtil.createEqualConstraint(query,
field, userId);
 
@@ -152,56 +150,51 @@
return query.getList();
}
 
-   public void addSub

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

[whitebai]

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

Modified Files:
NewsletterSubscriptionCAO.java 
Log Message:
CMSC-818 modify cao.


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


Index: NewsletterSubscriptionCAO.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/NewsletterSubscriptionCAO.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- NewsletterSubscriptionCAO.java  18 Apr 2008 08:30:52 -  1.6
+++ NewsletterSubscriptionCAO.java  22 Apr 2008 02:57:04 -  1.7
@@ -10,28 +10,18 @@
 import com.finalist.newsletter.domain.Subscription;
 
 public interface NewsletterSubscriptionCAO {
-   public Newsletter getNewsletterById(int id);
-
-   public List getUserSubscriptionList(int userId);
 
public List querySubcriptionByUser(int userId);
 
-   public List getAllNewsletter();
-
-   public void addSubscriptionRecord(Newsletter newsletter, int userId);
-
-   public void modifySubscriptionStauts(Newsletter newsletter, int userId);
-
-   public void modifySubscriptionFormat(Newsletter newsletter, int userId);
+   public void addSubscriptionRecord(Subscription subscription, int 
userId);
 
-   public void modifySubscriptionInterval(Newsletter newsletter, int 
userId);
+   public void modifySubscriptionStauts(Subscription subscription);
 
-   public void addSubscriptionTag(Newsletter newsletter, int userId, int 
tagId);
+   public void modifySubscriptionFormat(Subscription subscription);
 
-   public void removeSubscriptionTag(Newsletter newsletter, int userId,
-   int tagId);
+   public void addSubscriptionTag(Subscription subscription,int tagId);
 
-   public List getSubscriptionrecord(int newsletterId, int userId);
+   public void removeSubscriptionTag(Subscription subscription,int tagId); 
 
public List getSubscription(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/cao/util NewsletterSubscriptionUtil.java

[whitebai]

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

Modified Files:
NewsletterSubscriptionUtil.java 
Log Message:
CMSC-818 modify cao.


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


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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- NewsletterSubscriptionUtil.java 7 Apr 2008 08:37:06 -   1.2
+++ NewsletterSubscriptionUtil.java 22 Apr 2008 02:53:56 -  1.3
@@ -1,8 +1,10 @@
 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;
@@ -18,7 +20,7 @@

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

for (int j = 0; j < list.size(); j++) {
Tag tag = new Tag();
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] applications/searchrelate/META-INF/tags/mm/searchrelate relate.tagx

[Michiel Meeuwissen]

Update of /var/cvs/applications/searchrelate/META-INF/tags/mm/searchrelate
In directory james.mmbase.org:/tmp/cvs-serv18550

Modified Files:
relate.tagx 
Log Message:
various details


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


Index: relate.tagx
===
RCS file: 
/var/cvs/applications/searchrelate/META-INF/tags/mm/searchrelate/relate.tagx,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- relate.tagx 21 Apr 2008 09:22:18 -  1.20
+++ relate.tagx 21 Apr 2008 17:40:57 -  1.21
@@ -6,7 +6,7 @@
 >
   
   
 
 
+  
+
+
   
 
@@ -62,19 +66,23 @@
 <!-- Help 
Freakin' IE -->
 <!-- Help 
Freakin' IE -->
   
-  
-
 
   $(document).ready(function() {
+
+  
+
  $("${submit}").click(function(el) {
 return $("#mm_related_${seq}")[0].relater.commit(el);
  });
-   
$("#mm_related_${seq}").find(".searchable").each(function() { 
this.searcher.pagesize = ${pagesize}; }); 
-   
$("#mm_related_${seq}").find(".searchable").each(function() { 
this.searcher.maxpages = ${maxpages}; }); 
+
+$("#mm_related_${seq}").each(function() {
+ this.relater.setPageSize(${pagesize}); 

+ this.relater.setMaxPages(${maxpages}); 

+  this.relater.setContext('${context}'); 

+});
   });
 
 
-  
 
   http://java.sun.com/jsp/jstl/fmt";
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] applications/searchrelate/templates Searcher.js.jsp create.jspx node.tr.jspx page.jspx

[Michiel Meeuwissen]

Update of /var/cvs/applications/searchrelate/templates
In directory james.mmbase.org:/tmp/cvs-serv18482

Modified Files:
Searcher.js.jsp create.jspx node.tr.jspx page.jspx 
Log Message:
various details


See also: http://cvs.mmbase.org/viewcvs/applications/searchrelate/templates


Index: Searcher.js.jsp
===
RCS file: /var/cvs/applications/searchrelate/templates/Searcher.js.jsp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- Searcher.js.jsp 21 Apr 2008 12:21:44 -  1.14
+++ Searcher.js.jsp 21 Apr 2008 17:40:32 -  1.15
@@ -11,7 +11,7 @@
 
  *
  * @author Michiel Meeuwissen
- * @version $Id: Searcher.js.jsp,v 1.14 2008/04/21 12:21:44 michiel Exp $
+ * @version $Id: Searcher.js.jsp,v 1.15 2008/04/21 17:40:32 michiel Exp $
  */
 
 $(document).ready(function(){
@@ -156,7 +156,7 @@
params.transaction = this.transaction;
}
var self = this;
-   $.ajax({async: false, url: url, type: "GET", dataType: "xml", data: 
params,
+   $.ajax({url: url, type: "GET", dataType: "xml", data: params,
complete: function(res, status){
$(a).removeClass("submitting");
if (status == "success") {
@@ -233,7 +233,6 @@
 MMBaseRelater.prototype.relate = function(tr) {
 var number = this.getNumber(tr);
 
-
 // Set up data
 if (typeof(this.unrelated[number]) == "undefined") {
this.related[number] = tr;
@@ -247,6 +246,9 @@
this.logger.debug(currentList[0]);
currentList.append(tr);
 
+   this.current.searcher.inc();
+   this.repository.searcher.dec();
+
// Classes
if ($(tr).hasClass("removed")) {
$(tr).removeClass("removed");
@@ -286,6 +288,9 @@
 var repository =  $(this.div).find("div.mm_relate_repository 
div.searchresult table tbody");
 repository.append(tr);
 
+this.current.searcher.dec();
+this.repository.searcher.inc();
+
 // Classes
 if ($(tr).hasClass("new")) {
$(tr).removeClass("new");
@@ -302,6 +307,36 @@
 });
 }
 
+/**
+ * Set mmbase context for new objects
+ */
+MMBaseRelater.prototype.setContext = function(context) {
+if (this.current != null) {
+   this.current.searcher.context = context;
+}
+if (this.repository != null) {
+   this.repository.searcher.context = context;
+}
+}
+
+MMBaseRelater.prototype.setPageSize = function(pagesize) {
+if (this.current != null) {
+   this.current.searcher.pagesize = pagesize;
+}
+if (this.repository != null) {
+   this.repository.searcher.pagesize = pagesize;
+}
+}
+
+MMBaseRelater.prototype.setMaxPages = function(maxpages) {
+if (this.current != null) {
+   this.current.searcher.maxpages = maxpages;
+}
+if (this.repository != null) {
+   this.repository.searcher.maxpages = maxpages;
+}
+}
+
 /*
  * 
***
  */
@@ -326,6 +361,9 @@
 this.bindEvents();
 this.validator = this.relater.validator;
 this.searchUrl = $(this.div).find("form.searchform").attr("action");
+this.context   = "";
+this.totalsize = -1;
+this.foundsize = -1;
 this.logger.debug("found " + this.searchUrl);
 
 }
@@ -347,7 +385,7 @@
  * The actual query is supposed to be on the user's session, and will be 
picked up in page.jspx.
  */
 MMBaseSearcher.prototype.search = function(val, offset) {
-if (val.tagName.toUpperCase() == "FORM") {
+if (val != null && val.tagName != null && val.tagName.toUpperCase() == 
"FORM") {
val = $(val).find("input").val();
 } else {
$(this.div).find("form.searchform input").val(val);
@@ -356,13 +394,15 @@
 if (newSearch != this.value) {
this.searchResults = {};
this.value = newSearch;
+   this.totalsize = -1;
 }
 this.offset = offset;
 
-var rep = this.getResultDiv();
-var params = {id: this.getQueryId(), offset: offset, search: this.value, 
pagesize: this.pagesize, maxpages: this.maxpages};
+var rep = this.getResultDiv();var params = {id: this.getQueryId(), 
offset: offset, search: "" + this.value, pagesize: this.pagesize, maxpages: 
this.maxpages};
 
 var result = this.searchResults["" + offset];
+
+
 $(rep).empty();
 if (result == null) {
var self = this;
@@ -370,10 +410,10 @@
complete: function(res, status){
if ( status == "success" || status == "notmodified" ) {
result = res.responseText;
-   self.logger.debug(result);
$(rep).empty();
+   //console.log($(result).find("*").length);
$(rep).append($(result).find("> *"));
-   self.searchResults["" + offset] = result;
+   //self.searchResults[""

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

[jruijter]

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

Added Files:
migrate.20080421.sql 
Log Message:
NMCMS-486 new migrate script


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


migrate.20080421.sql is new

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

[MMBASE CVS] src/org/mmbase/module/core MMBaseContext.java

[Michiel Meeuwissen]

Update of /var/cvs/src/org/mmbase/module/core
In directory james.mmbase.org:/tmp/cvs-serv9954

Modified Files:
MMBaseContext.java 
Log Message:
conforming to international recommentations for units of information


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/core


Index: MMBaseContext.java
===
RCS file: /var/cvs/src/org/mmbase/module/core/MMBaseContext.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- MMBaseContext.java  21 Mar 2008 13:42:59 -  1.58
+++ MMBaseContext.java  21 Apr 2008 13:19:59 -  1.59
@@ -27,7 +27,7 @@
  * @author Daniel Ockeloen
  * @author David van Zeventer
  * @author Jaco de Groot
- * @version $Id: MMBaseContext.java,v 1.58 2008/03/21 13:42:59 michiel Exp $
+ * @version $Id: MMBaseContext.java,v 1.59 2008/04/21 13:19:59 michiel Exp $
  */
 public class MMBaseContext {
 private static final Logger log = 
Logging.getLoggerInstance(MMBaseContext.class);
@@ -207,8 +207,8 @@
 String version = org.mmbase.Version.get();
 log.info("version   : " + version);
 Runtime rt = Runtime.getRuntime();
-log.info("total memory  : " + rt.totalMemory() / (1024 * 1024) + " 
Mbyte");
-log.info("free memory   : " + rt.freeMemory() / (1024 * 1024) + " 
Mbyte");
+log.info("total memory  : " + rt.totalMemory() / (1024 * 1024) + " 
MiB");
+log.info("free memory   : " + rt.freeMemory() / (1024 * 1024) + " 
MiB");
 log.info("system locale : " + Locale.getDefault());
 log.info("start time: " + 
DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.FULL).format(new 
Date(1000 * (long) MMBase.startTime)));
 }
@@ -337,7 +337,7 @@
  */
 public synchronized static String getHtmlRootUrlPath() {
 if (! htmlRootUrlPathInitialized) {
-log.info("Finding root url");
+log.debug("Finding root url");
 if (! initialized) {
 throw new RuntimeException("The init method should be called 
first.");
 }
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/natmm/templates/mmbase/edit/wizard/data/config/items items_shop_natmm.xml

[jruijter]

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

Modified Files:
items_shop_natmm.xml 
Log Message:
NMCMS-437 corrected lables of price fields


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


Index: items_shop_natmm.xml
===
RCS file: 
/var/cvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/items/items_shop_natmm.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- items_shop_natmm.xml30 Jan 2007 22:43:22 -  1.2
+++ items_shop_natmm.xml21 Apr 2008 13:12:35 -  1.3
@@ -20,8 +20,8 @@
 type
 productnummer
 prijs (in centen, zonder punt of 
komma)
-leden prijs (in centen, zonder punt of 
komma)
-oude prijs (in centen, zonder punt of 
komma)
+oude prijs (in centen, zonder punt of 
komma)
+ledenprijs (in centen, zonder punt of 
komma)
 oude ledenprijs (in centen, zonder punt of 
komma)
 
 introductie
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/natmm/templates/natmm/includes/items items.jsp

[jruijter]

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

Modified Files:
items.jsp 
Log Message:
NMCMS-437 changed ordering of items


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


Index: items.jsp
===
RCS file: 
/var/cvs/contributions/natmm/templates/natmm/includes/items/items.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- items.jsp   21 Dec 2006 10:08:02 -  1.5
+++ items.jsp   21 Apr 2008 13:02:20 -  1.6
@@ -5,7 +5,7 @@
 <%
 LinkedList shop_items = new LinkedList();
 %><% 
 shop_items.add(shop_items_number);
%>http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance remove-duplicate-creationrels.jsp

[Nico Klasens]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance
In directory 
james.mmbase.org:/tmp/cvs-serv9036/cmsc/maintenance/src/webapp/editors/maintenance

Added Files:
remove-duplicate-creationrels.jsp 
Log Message:
CMSC-864 utility to fix creationrels which are created in cmsc 1.1 wizard save


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance
See also: http://www.mmbase.org/jira/browse/CMSC-864


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

[MMBASE CVS] contributions/CMSContainer/cmsc/maintenance/src/java/com/finalist/cmsc/maintenance/sql CreationChannelDuplication.java

[Nico Klasens]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/maintenance/src/java/com/finalist/cmsc/maintenance/sql
In directory 
james.mmbase.org:/tmp/cvs-serv9036/cmsc/maintenance/src/java/com/finalist/cmsc/maintenance/sql

Added Files:
CreationChannelDuplication.java 
Log Message:
CMSC-864 utility to fix creationrels which are created in cmsc 1.1 wizard save


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/maintenance/src/java/com/finalist/cmsc/maintenance/sql
See also: http://www.mmbase.org/jira/browse/CMSC-864


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

[MMBASE CVS] contributions/CMSContainer/cmsc/maintenance/src/java/com/finalist/cmsc/maintenance/sql CreationChannelDuplication.java

[Nico Klasens]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/maintenance/src/java/com/finalist/cmsc/maintenance/sql
In directory 
james.mmbase.org:/tmp/cvs-serv9001/cmsc/maintenance/src/java/com/finalist/cmsc/maintenance/sql

Added Files:
  Tag: b1_4
CreationChannelDuplication.java 
Log Message:
CMSC-864 utility to fix creationrels which are created in cmsc 1.1 wizard save


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/maintenance/src/java/com/finalist/cmsc/maintenance/sql
See also: http://www.mmbase.org/jira/browse/CMSC-864


CreationChannelDuplication.java is new

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

[MMBASE CVS] contributions/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance remove-duplicate-creationrels.jsp

[Nico Klasens]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance
In directory 
james.mmbase.org:/tmp/cvs-serv9001/cmsc/maintenance/src/webapp/editors/maintenance

Added Files:
  Tag: b1_4
remove-duplicate-creationrels.jsp 
Log Message:
CMSC-864 utility to fix creationrels which are created in cmsc 1.1 wizard save


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance
See also: http://www.mmbase.org/jira/browse/CMSC-864


remove-duplicate-creationrels.jsp is new

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

[MMBASE CVS] applications/searchrelate/templates page.jspx page.css.jsp

[Michiel Meeuwissen]

Update of /var/cvs/applications/searchrelate/templates
In directory james.mmbase.org:/tmp/cvs-serv8472

Modified Files:
page.jspx page.css.jsp 
Log Message:
always show caption, you can switch it off with css


See also: http://cvs.mmbase.org/viewcvs/applications/searchrelate/templates


Index: page.jspx
===
RCS file: /var/cvs/applications/searchrelate/templates/page.jspx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- page.jspx   21 Apr 2008 10:53:24 -  1.7
+++ page.jspx   21 Apr 2008 12:32:03 -  1.8
@@ -9,7 +9,7 @@
   Presents a table with one page of query results. Plus paging to other 
pages (in tfoot).
   Used in ajax-calls, but can also be directly included with mm:include 
(for initial results).
   @todo Searching only happens in actual mmbase queries now. How about 
lucene queries?
-  @version $Id: page.jspx,v 1.7 2008/04/21 10:53:24 michiel Exp $
+  @version $Id: page.jspx,v 1.8 2008/04/21 12:32:03 michiel Exp $
   -->
   
   
@@ -50,7 +50,7 @@
 
   
   
-  
+ 
 
   
   
@@ -60,7 +60,7 @@
   
 
 
-  ${summary}
+  ${summary}
   
 
   #


Index: page.css.jsp
===
RCS file: /var/cvs/applications/searchrelate/templates/page.css.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- page.css.jsp14 Apr 2008 15:45:15 -  1.2
+++ page.css.jsp21 Apr 2008 12:32:03 -  1.3
@@ -17,6 +17,11 @@
 .searchresult table {
   border: solid 1px #000;
 }
+.searchresult table caption  {
+  border-left: solid 1px #000;
+  border-right: solid 1px #000;
+}
+.searchresult caption,
 .searchresult thead tr,
 .searchresult tfoot tr {
   background-color: #ffb;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] applications/searchrelate/templates Searcher.js.jsp

[Michiel Meeuwissen]

Update of /var/cvs/applications/searchrelate/templates
In directory james.mmbase.org:/tmp/cvs-serv8204

Modified Files:
Searcher.js.jsp 
Log Message:
made xhtml compliant


See also: http://cvs.mmbase.org/viewcvs/applications/searchrelate/templates


Index: Searcher.js.jsp
===
RCS file: /var/cvs/applications/searchrelate/templates/Searcher.js.jsp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- Searcher.js.jsp 21 Apr 2008 12:17:11 -  1.13
+++ Searcher.js.jsp 21 Apr 2008 12:21:44 -  1.14
@@ -11,7 +11,7 @@
 
  *
  * @author Michiel Meeuwissen
- * @version $Id: Searcher.js.jsp,v 1.13 2008/04/21 12:17:11 michiel Exp $
+ * @version $Id: Searcher.js.jsp,v 1.14 2008/04/21 12:21:44 michiel Exp $
  */
 
 $(document).ready(function(){
@@ -26,7 +26,7 @@
  *
  */
 function MMBaseLogger(area) {
-this.logEnabled   = true;
+this.logEnabled   = false;
 /*this.traceEnabled = false;*/
 this.logarea  = area;
 }
@@ -347,7 +347,7 @@
  * The actual query is supposed to be on the user's session, and will be 
picked up in page.jspx.
  */
 MMBaseSearcher.prototype.search = function(val, offset) {
-if (val.tagName == "FORM") {
+if (val.tagName.toUpperCase() == "FORM") {
val = $(val).find("input").val();
 } else {
$(this.div).find("form.searchform input").val(val);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] applications/searchrelate/templates Searcher.js.jsp node.tr.jspx

[Michiel Meeuwissen]

Update of /var/cvs/applications/searchrelate/templates
In directory james.mmbase.org:/tmp/cvs-serv8011

Modified Files:
Searcher.js.jsp node.tr.jspx 
Log Message:
details


See also: http://cvs.mmbase.org/viewcvs/applications/searchrelate/templates


Index: Searcher.js.jsp
===
RCS file: /var/cvs/applications/searchrelate/templates/Searcher.js.jsp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- Searcher.js.jsp 21 Apr 2008 11:11:10 -  1.12
+++ Searcher.js.jsp 21 Apr 2008 12:17:11 -  1.13
@@ -11,7 +11,7 @@
 
  *
  * @author Michiel Meeuwissen
- * @version $Id: Searcher.js.jsp,v 1.12 2008/04/21 11:11:10 michiel Exp $
+ * @version $Id: Searcher.js.jsp,v 1.13 2008/04/21 12:17:11 michiel Exp $
  */
 
 $(document).ready(function(){
@@ -26,7 +26,7 @@
  *
  */
 function MMBaseLogger(area) {
-this.logEnabled   = false;
+this.logEnabled   = true;
 /*this.traceEnabled = false;*/
 this.logarea  = area;
 }
@@ -349,8 +349,9 @@
 MMBaseSearcher.prototype.search = function(val, offset) {
 if (val.tagName == "FORM") {
val = $(val).find("input").val();
+} else {
+   $(this.div).find("form.searchform input").val(val);
 }
-
 var newSearch = val;
 if (newSearch != this.value) {
this.searchResults = {};
@@ -369,7 +370,7 @@
complete: function(res, status){
if ( status == "success" || status == "notmodified" ) {
result = res.responseText;
-   self.logger.debug(rep);
+   self.logger.debug(result);
$(rep).empty();
$(rep).append($(result).find("> *"));
self.searchResults["" + offset] = result;


Index: node.tr.jspx
===
RCS file: /var/cvs/applications/searchrelate/templates/node.tr.jspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- node.tr.jspx14 Apr 2008 15:45:15 -  1.1
+++ node.tr.jspx21 Apr 2008 12:17:11 -  1.2
@@ -2,6 +2,7 @@
 xmlns:jsp="http://java.sun.com/JSP/Page";
 xmlns:c="http://java.sun.com/jsp/jstl/core";
 xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";>
+  
   
 
 
@@ -21,4 +22,5 @@
   
 
   
+  
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/natmm/templates/mmbase/edit/wizard/data/xsl list.xsl

[jkoster]

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

Modified Files:
list.xsl 
Log Message:
NMCMS-56 - Use the localized prompts file instead.


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


Index: list.xsl
===
RCS file: 
/var/cvs/contributions/natmm/templates/mmbase/edit/wizard/data/xsl/list.xsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- list.xsl18 Apr 2008 14:52:00 -  1.4
+++ list.xsl21 Apr 2008 11:53:52 -  1.5
@@ -7,7 +7,7 @@
 @author Kars Veling
 @author Michiel Meeuwissen
 @author Nico Klasens
-@version $Id: list.xsl,v 1.4 2008/04/18 14:52:00 jkoster Exp $
+@version $Id: list.xsl,v 1.5 2008/04/21 11:53:52 jkoster Exp $
 @version added newfromlist functionality
   -->
 
@@ -23,6 +23,9 @@
   
 
   
+  
+
+  
 
   
   
@@ -318,7 +321,7 @@
 
   
+title="{$removedescription}">
 
   
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/natmm/src/nl/leocms/util/tools SearchUtil.java

[jruijter]

Update of /var/cvs/contributions/natmm/src/nl/leocms/util/tools
In directory james.mmbase.org:/tmp/cvs-serv7293/src/nl/leocms/util/tools

Modified Files:
SearchUtil.java 
Log Message:
NMCMS-328


See also: 
http://cvs.mmbase.org/viewcvs/contributions/natmm/src/nl/leocms/util/tools
See also: http://www.mmbase.org/jira/browse/NMCMS-328


Index: SearchUtil.java
===
RCS file: 
/var/cvs/contributions/natmm/src/nl/leocms/util/tools/SearchUtil.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- SearchUtil.java 2 Jul 2007 14:05:42 -   1.17
+++ SearchUtil.java 21 Apr 2008 11:52:28 -  1.18
@@ -25,7 +25,7 @@
  * Utilities functions for the search pages
  *
  * @author H. Hangyi
- * @version $Revision: 1.17 $
+ * @version $Revision: 1.18 $
  */
 public class SearchUtil {
 
@@ -355,8 +355,9 @@
PaginaHelper ph = new PaginaHelper(cloud);
String sConstraints = (new 
nl.leocms.util.tools.SearchUtil()).articleConstraint(nowSec, quarterOfAnHour);
Node foundNode = cloud.getNode(docNumber);
-   boolean test = 
articleMatchesConstraint(foundNode.getLongValue("embargo"), 
foundNode.getStringValue("use_verloopdatum"), 
foundNode.getLongValue("verloopdatum"), nowSec, quarterOfAnHour);
-   if (test) {
+   //boolean test = 
articleMatchesConstraint(foundNode.getLongValue("embargo"), 
foundNode.getStringValue("use_verloopdatum"), 
foundNode.getLongValue("verloopdatum"), nowSec, quarterOfAnHour);
+   
+   if (true) {
   hsetPagesNodes.add(paginaNumber);
   hsetNodes.add(docNumber);
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/natmm/templates/natmm/includes top4_head.jsp

[jruijter]

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

Modified Files:
top4_head.jsp 
Log Message:
NMCMS-506


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


Index: top4_head.jsp
===
RCS file: /var/cvs/contributions/natmm/templates/natmm/includes/top4_head.jsp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- top4_head.jsp   8 Feb 2008 17:08:43 -   1.12
+++ top4_head.jsp   21 Apr 2008 11:45:42 -  1.13
@@ -3,7 +3,7 @@
   <%-- link rel="alternate stylesheet" type="text/css" 
href="hoofdsite/themas/fontsize1.2.css" title="groot" / --%>
   <%-- link rel="alternate stylesheet" type="text/css" 
href="hoofdsite/themas/fontsize1.4.css" title="groter" / --%>
   scripts/launchcenter.js">
-  scripts/skyscraper_cookie.js">
+  
   <%= styleSheet %>" />
: 
 
->
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/natmm/templates/natnh/includes header.jsp

[jruijter]

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

Modified Files:
header.jsp 
Log Message:
NMCMS-506


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


Index: header.jsp
===
RCS file: /var/cvs/contributions/natmm/templates/natnh/includes/header.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- header.jsp  8 Feb 2008 17:08:43 -   1.6
+++ header.jsp  21 Apr 2008 11:45:42 -  1.7
@@ -13,9 +13,9 @@
 >
 
 
-
+
 
-
+
 


@@ -24,6 +24,7 @@
 
  
  
+ 
   


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

[MMBASE CVS] contributions/natmm/templates/natmm index.jsp home.jsp

[jruijter]

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

Modified Files:
index.jsp home.jsp 
Log Message:
NMCMS-506


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


Index: index.jsp
===
RCS file: /var/cvs/contributions/natmm/templates/natmm/index.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- index.jsp   8 Feb 2008 17:08:43 -   1.4
+++ index.jsp   21 Apr 2008 11:45:42 -  1.5
@@ -12,6 +12,7 @@
 
 
 
+
 
 
 


Index: home.jsp
===
RCS file: /var/cvs/contributions/natmm/templates/natmm/home.jsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- home.jsp8 Feb 2008 17:08:43 -   1.9
+++ home.jsp21 Apr 2008 11:45:42 -  1.10
@@ -24,6 +24,7 @@
   
 
 
+
   
 
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/natmm/templates/mmbase/edit/wizard/data/config/artikel artikel_shop.xml artikel_natnh.xml edit_artikel.xml

[jkoster]

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

Modified Files:
artikel_shop.xml artikel_natnh.xml edit_artikel.xml 
Log Message:
NMCMS-426 - Changed text of intro-field in the editor.


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


Index: artikel_shop.xml
===
RCS file: 
/var/cvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/artikel/artikel_shop.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- artikel_shop.xml28 Jan 2007 17:06:31 -  1.1
+++ artikel_shop.xml21 Apr 2008 11:24:08 -  1.2
@@ -77,7 +77,7 @@



-   intro (vette 
tekst)
+   intro (vet, 
gebruikt bij Nieuws)
tekst 
(alleen voor kleine berichten)




Index: artikel_natnh.xml
===
RCS file: 
/var/cvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/artikel/artikel_natnh.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- artikel_natnh.xml   13 Jun 2006 17:04:50 -  1.1
+++ artikel_natnh.xml   21 Apr 2008 11:24:08 -  1.2
@@ -54,7 +54,7 @@
verwijderd van website 
op
verwijderdatum gebruiken

-   intro (vette 
tekst)
+   intro (vet, 
gebruikt bij Nieuws)
tekst 
(alleen voor kleine berichten)




Index: edit_artikel.xml
===
RCS file: 
/var/cvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/artikel/edit_artikel.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- edit_artikel.xml13 Jun 2006 12:24:45 -  1.4
+++ edit_artikel.xml21 Apr 2008 11:24:08 -  1.5
@@ -15,7 +15,7 @@
verwijderdatum 
gebruiken


-   intro (vette 
tekst)
+   intro (vet, gebruikt bij 
Nieuws)
tekst (alleen voor 
kleine berichten)


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

[MMBASE CVS] contributions/natmm/templates/mmbase/edit/wizard/data/config/vraagbaak edit_vraagbaak.xml

[jkoster]

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

Modified Files:
edit_vraagbaak.xml 
Log Message:
NMCMS-426 - Changed text of intro-field in the editor.


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


Index: edit_vraagbaak.xml
===
RCS file: 
/var/cvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/vraagbaak/edit_vraagbaak.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- edit_vraagbaak.xml  1 Jun 2007 10:59:40 -   1.2
+++ edit_vraagbaak.xml  21 Apr 2008 11:24:08 -  1.3
@@ -10,7 +10,7 @@
verschijnt op website vanaf
verwijderd van website 
op
verwijderdatum 
gebruiken
-   intro (vette 
tekst)
+   intro (vet, gebruikt bij 
Nieuws)
tekst (alleen voor 
kleine berichten)
  
stippellijn tussen 
paragrafen
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] applications/searchrelate/templates Searcher.js.jsp

[Michiel Meeuwissen]

Update of /var/cvs/applications/searchrelate/templates
In directory james.mmbase.org:/tmp/cvs-serv6190

Modified Files:
Searcher.js.jsp 
Log Message:
made the search function accept both a form, and simply a search value


See also: http://cvs.mmbase.org/viewcvs/applications/searchrelate/templates


Index: Searcher.js.jsp
===
RCS file: /var/cvs/applications/searchrelate/templates/Searcher.js.jsp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- Searcher.js.jsp 21 Apr 2008 10:54:14 -  1.11
+++ Searcher.js.jsp 21 Apr 2008 11:11:10 -  1.12
@@ -11,7 +11,7 @@
 
  *
  * @author Michiel Meeuwissen
- * @version $Id: Searcher.js.jsp,v 1.11 2008/04/21 10:54:14 michiel Exp $
+ * @version $Id: Searcher.js.jsp,v 1.12 2008/04/21 11:11:10 michiel Exp $
  */
 
 $(document).ready(function(){
@@ -26,7 +26,7 @@
  *
  */
 function MMBaseLogger(area) {
-this.logEnabled   = true;
+this.logEnabled   = false;
 /*this.traceEnabled = false;*/
 this.logarea  = area;
 }
@@ -346,8 +346,12 @@
  * Feeded are 'id' 'offset' and 'search'.
  * The actual query is supposed to be on the user's session, and will be 
picked up in page.jspx.
  */
-MMBaseSearcher.prototype.search = function(form, offset) {
-var newSearch = $(form).find("input").val();
+MMBaseSearcher.prototype.search = function(val, offset) {
+if (val.tagName == "FORM") {
+   val = $(val).find("input").val();
+}
+
+var newSearch = val;
 if (newSearch != this.value) {
this.searchResults = {};
this.value = newSearch;
@@ -413,7 +417,7 @@
self.logger.debug(newNode);
var tr = self.getTr(newNode);
self.relater.relate(tr);
-   self.search(null, self.offset);
+   self.search(newNode, self.offset);
}
};
$(rep).find("form.mm_form").ajaxForm(options);
@@ -490,7 +494,6 @@
self.logger.debug("navigating " + anchor);
 
var id = anchor.href.substring(anchor.href.indexOf("#") + 1, 
anchor.href.lastIndexOf("_"));
-   self.logger.debug("Found id " + id);
return self.search(document.getElementById(id), anchor.name);
 });
 }
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] applications/searchrelate/templates Searcher.js.jsp

[Michiel Meeuwissen]

Update of /var/cvs/applications/searchrelate/templates
In directory james.mmbase.org:/tmp/cvs-serv5787

Modified Files:
Searcher.js.jsp 
Log Message:
searching after create was broken


See also: http://cvs.mmbase.org/viewcvs/applications/searchrelate/templates


Index: Searcher.js.jsp
===
RCS file: /var/cvs/applications/searchrelate/templates/Searcher.js.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- Searcher.js.jsp 17 Apr 2008 20:57:58 -  1.10
+++ Searcher.js.jsp 21 Apr 2008 10:54:14 -  1.11
@@ -11,7 +11,7 @@
 
  *
  * @author Michiel Meeuwissen
- * @version $Id: Searcher.js.jsp,v 1.10 2008/04/17 20:57:58 andre Exp $
+ * @version $Id: Searcher.js.jsp,v 1.11 2008/04/21 10:54:14 michiel Exp $
  */
 
 $(document).ready(function(){
@@ -26,7 +26,7 @@
  *
  */
 function MMBaseLogger(area) {
-this.logEnabled   = false;
+this.logEnabled   = true;
 /*this.traceEnabled = false;*/
 this.logarea  = area;
 }
@@ -325,6 +325,8 @@
 this.searchResults = {};
 this.bindEvents();
 this.validator = this.relater.validator;
+this.searchUrl = $(this.div).find("form.searchform").attr("action");
+this.logger.debug("found " + this.searchUrl);
 
 }
 
@@ -344,8 +346,8 @@
  * Feeded are 'id' 'offset' and 'search'.
  * The actual query is supposed to be on the user's session, and will be 
picked up in page.jspx.
  */
-MMBaseSearcher.prototype.search = function(el, offset) {
-var newSearch = $(el).find("input").val();
+MMBaseSearcher.prototype.search = function(form, offset) {
+var newSearch = $(form).find("input").val();
 if (newSearch != this.value) {
this.searchResults = {};
this.value = newSearch;
@@ -353,15 +355,13 @@
 this.offset = offset;
 
 var rep = this.getResultDiv();
-var url = $(el).attr("action");
-
-var params = {id: el.id, offset: offset, search: this.value, pagesize: 
this.pagesize, maxpages: this.maxpages};
+var params = {id: this.getQueryId(), offset: offset, search: this.value, 
pagesize: this.pagesize, maxpages: this.maxpages};
 
 var result = this.searchResults["" + offset];
 $(rep).empty();
 if (result == null) {
var self = this;
-   $.ajax({url: url, type: "GET", dataType: "xml", data: params,
+   $.ajax({url: this.searchUrl, type: "GET", dataType: "xml", data: params,
complete: function(res, status){
if ( status == "success" || status == "notmodified" ) {
result = res.responseText;
@@ -486,9 +486,11 @@
 this.logger.debug("binding to "+ $(this.div).find("a.navigate"));
 
 $(this.div).find("a.navigate").click(function(ev) {
-   self.logger.debug("navigating " );
var anchor = ev.target;
+   self.logger.debug("navigating " + anchor);
+
 var id = anchor.href.substring(anchor.href.indexOf("#") + 1, 
anchor.href.lastIndexOf("_"));
+   self.logger.debug("Found id " + id);
return self.search(document.getElementById(id), anchor.name); 
 });
 }
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] applications/searchrelate/templates page.jspx

[Michiel Meeuwissen]

Update of /var/cvs/applications/searchrelate/templates
In directory james.mmbase.org:/tmp/cvs-serv5695

Modified Files:
page.jspx 
Log Message:
made it possible to search on number too


See also: http://cvs.mmbase.org/viewcvs/applications/searchrelate/templates


Index: page.jspx
===
RCS file: /var/cvs/applications/searchrelate/templates/page.jspx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- page.jspx   17 Apr 2008 20:00:00 -  1.6
+++ page.jspx   21 Apr 2008 10:53:24 -  1.7
@@ -9,7 +9,7 @@
   Presents a table with one page of query results. Plus paging to other 
pages (in tfoot).
   Used in ajax-calls, but can also be directly included with mm:include 
(for initial results).
   @todo Searching only happens in actual mmbase queries now. How about 
lucene queries?
-  @version $Id: page.jspx,v 1.6 2008/04/17 20:00:00 andre Exp $
+  @version $Id: page.jspx,v 1.7 2008/04/21 10:53:24 michiel Exp $
   -->
   
   
@@ -29,6 +29,10 @@
 
   
 
+
+  
+
+
   
 
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/registry PortalRegistry.java

[Nico Klasens]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/registry
In directory 
james.mmbase.org:/tmp/cvs-serv790/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/registry

Removed Files:
PortalRegistry.java 
Log Message:
CMSC-863 HttpSessions are used when not necessary and created for useragents 
which do not maintain a session


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/registry
See also: http://www.mmbase.org/jira/browse/CMSC-863


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

[MMBASE CVS] contributions/CMSContainer/cmsc/portal/src/java/com/finalist/pluto/portalImpl/core PortalURL.java

[Nico Klasens]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/pluto/portalImpl/core
In directory 
james.mmbase.org:/tmp/cvs-serv790/cmsc/portal/src/java/com/finalist/pluto/portalImpl/core

Modified Files:
PortalURL.java 
Log Message:
CMSC-863 HttpSessions are used when not necessary and created for useragents 
which do not maintain a session


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/pluto/portalImpl/core
See also: http://www.mmbase.org/jira/browse/CMSC-863


Index: PortalURL.java
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/pluto/portalImpl/core/PortalURL.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- PortalURL.java  1 Feb 2008 16:22:30 -   1.13
+++ PortalURL.java  21 Apr 2008 10:11:52 -  1.14
@@ -15,12 +15,7 @@
  */
 package com.finalist.pluto.portalImpl.core;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
+import java.util.*;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -256,7 +251,11 @@
   }
 
   StringBuffer result = new StringBuffer(100);
-  Iterator iterator = encodedStateFullParams.keySet().iterator();
+  // sort encodedNames in the natural order.
+  // Search spiders usually use the url as key for a html document.
+  // This makes portal urls more the same instead of the random order of 
the hashmap
+  Set encodedNames = new 
TreeSet(encodedStateFullParams.keySet());
+  Iterator iterator = encodedNames.iterator();
   while (iterator.hasNext()) {
  result.append("/");
  String encodedName = iterator.next();
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets RelatedContentPortlet.java

[Nico Klasens]

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

Modified Files:
RelatedContentPortlet.java 
Log Message:
CMSC-863 HttpSessions are used when not necessary and created for useragents 
which do not maintain a session


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


Index: RelatedContentPortlet.java
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/RelatedContentPortlet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- RelatedContentPortlet.java  26 Nov 2007 11:43:40 -  1.4
+++ RelatedContentPortlet.java  21 Apr 2008 10:11:52 -  1.5
@@ -12,11 +12,9 @@
 
 import org.apache.pluto.core.impl.PortletRequestImpl;
 
-import com.finalist.cmsc.beans.om.Portlet;
-import com.finalist.cmsc.portalImpl.registry.PortalRegistry;
+import com.finalist.cmsc.beans.om.*;
+import com.finalist.cmsc.portalImpl.PortalConstants;
 import com.finalist.cmsc.services.sitemanagement.SiteManagement;
-import com.finalist.pluto.portalImpl.aggregation.Fragment;
-import com.finalist.pluto.portalImpl.aggregation.PortletFragment;
 
 import net.sf.mmapps.commons.util.StringUtil;
 
@@ -39,21 +37,23 @@
 
 
private String getElementIdFromScreen(RenderRequest req, String window) {
-  HttpServletRequest servletRequest = getServletRequest(req);
-  PortalRegistry pr = PortalRegistry.getPortalRegistry(servletRequest);
-  Fragment fragment = pr.getScreen().getFragment(window);
-  if (fragment == null) {
- return null;
+  Integer pageId = getCurrentPageId(req);
+  NavigationItem item = SiteManagement.getNavigationItem(pageId);
+  if (item instanceof Page) {
+  Page page = (Page) item;
+  int portletId = page.getPortlet(window);
+  Portlet portlet = SiteManagement.getPortlet(portletId);
+  if (portlet != null) {
+  return portlet.getParameterValue(CONTENTELEMENT);
+  }
   }
-  Portlet portlet = ((PortletFragment) fragment).getPortlet();
-  if (portlet == null) {
  return null;
   }
-  return portlet.getParameterValue("contentelement");
 
-  // Fragment fragment = pr.getScreen().getFragment(window);
-  // return
-  // 
((PortletFragment)fragment).getPortlet().getParameterValue("contentelement");
+
+private Integer getCurrentPageId(RenderRequest req) {
+String pageId = (String) 
req.getAttribute(PortalConstants.CMSC_OM_PAGE_ID);
+return Integer.valueOf(pageId);
}
 
 
@@ -81,10 +81,7 @@
 
@Override
protected void doEditDefaults(RenderRequest req, RenderResponse res) throws 
IOException, PortletException {
-  HttpServletRequest servletRequest = getServletRequest(req);
-  PortalRegistry pr = PortalRegistry.getPortalRegistry(servletRequest);
-
-  Integer pageid = pr.getScreen().getPage().getId();
+  Integer pageid = getCurrentPageId(req);
   String pagepath = SiteManagement.getPath(pageid, true);
 
   if (pagepath != null) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/filters DisableUrlSessionFilter.java

[Nico Klasens]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/filters
In directory 
james.mmbase.org:/tmp/cvs-serv790/cmsc/utilities/src/java/com/finalist/cmsc/filters

Modified Files:
DisableUrlSessionFilter.java 
Log Message:
CMSC-863 HttpSessions are used when not necessary and created for useragents 
which do not maintain a session


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/filters
See also: http://www.mmbase.org/jira/browse/CMSC-863


Index: DisableUrlSessionFilter.java
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/filters/DisableUrlSessionFilter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- DisableUrlSessionFilter.java26 Nov 2007 11:43:44 -  1.3
+++ DisableUrlSessionFilter.java21 Apr 2008 10:11:52 -  1.4
@@ -10,14 +10,23 @@
 package com.finalist.cmsc.filters;
 
 import java.io.IOException;
+import java.util.regex.Pattern;
+
 import javax.servlet.*;
 import javax.servlet.http.*;
 
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 /**
- * This Filter disables Url Rewriting and adds Url encoding for all urls. URL
- * Encoding is a process of transforming user input to a CGI form so it is fit
+ * This Filter disables Url Rewriting and cleans Sessions for user agents which
+ * do not support cookies. Example of these user agents are search engines.
+ * 
+ * URL Encoding is a process of transforming user input to a CGI form so it is 
fit
  * for travel across the network -- basically, stripping spaces and punctuation
  * and replacing with escape characters. URL Decoding is the reverse process.
+ * 
  * URL Rewriting is a technique for saving state information on the user's
  * browser between page hits. It's sort of like cookies, only the information
  * gets stored inside the URL, as an additional parameter. The HttpSession API,
@@ -26,6 +35,10 @@
  */
 public class DisableUrlSessionFilter implements Filter {
 
+   private static final Log log = 
LogFactory.getLog(DisableUrlSessionFilter.class);
+
+   private Pattern userAgentPattern;
+
/**
 * Filters requests to disable URL-based session identifiers.
 */
@@ -42,10 +55,11 @@
 
   // clear session if session id in URL
   if (httpRequest.isRequestedSessionIdFromURL()) {
- HttpSession session = httpRequest.getSession();
- if (session != null)
+ HttpSession session = httpRequest.getSession(false);
+ if (session != null) {
 session.invalidate();
   }
+  }
 
   // wrap response to remove URL encoding
   HttpServletResponseWrapper wrappedResponse = new 
HttpServletResponseWrapper(httpResponse) {
@@ -82,25 +96,97 @@
   * @return
   */
  private String getEncodedUrl(String url) {
-// try {
-// return URLEncoder.encode(url,"UTF-8");
-// }
-// catch (UnsupportedEncodingException e) {
-// // should not happen UTF-8 is mandatory
 return url;
-// }
  }
   };
 
   chain.doFilter(request, wrappedResponse);
+  
+  cleanSessions(httpRequest);
}
 
+private void cleanSessions(HttpServletRequest httpRequest) {
+try {
+String userAgent = httpRequest.getHeader("User-Agent");
+if (userAgentPattern != null && 
userAgentPattern.matcher(userAgent).find()) {
+HttpSession session = httpRequest.getSession(false);
+if (session != null && session.isNew()) {
+session.invalidate();
+}
+}
+}
+catch (Exception ex) {
+log.fatal("can't process useragent pattern", ex);
+}
+}
 
public void init(FilterConfig config) {
-  // nothing
+   String useragents = config.getInitParameter("useragents");
+   if (StringUtils.isBlank(useragents)) {
+   String searchEngines = config.getInitParameter("searchEngines");
+   if (StringUtils.isBlank(searchEngines)) {
+   searchEngines = getSearchEngines();
+   }
+   String feedReaders = config.getInitParameter("feedReaders");
+   if (StringUtils.isBlank(feedReaders)) {
+   feedReaders = getFeedReaders();
+   }
+
+   useragents = searchEngines + "|" + feedReaders;
+   }
+   userAgentPattern = Pattern.compile(useragents);
+   }
+
+private String getSearchEngines() {
+// Search engines / Crawlers
+// Mozilla/5.0 (compatible; Googlebot/2.1; 
+http://www.google.com/bot.html)
+// Googlebot/2.1 (+http://www.google.com/bot.html)
+// Mozilla/5.0 (compatible; Yahoo! Slurp/3.0; 
http://help.yahoo.com/help/u

[MMBASE CVS] contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation NavigationItemRenderer.java

[Nico Klasens]

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

Modified Files:
NavigationItemRenderer.java 
Log Message:
CMSC-863 HttpSessions are used when not necessary and created for useragents 
which do not maintain a session


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


Index: NavigationItemRenderer.java
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/NavigationItemRenderer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- NavigationItemRenderer.java 30 Nov 2007 10:58:31 -  1.1
+++ NavigationItemRenderer.java 21 Apr 2008 10:11:51 -  1.2
@@ -1,5 +1,7 @@
 package com.finalist.cmsc.navigation;
 
+import java.io.IOException;
+
 import javax.servlet.ServletConfig;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -9,5 +11,6 @@
 public interface NavigationItemRenderer {
 
void render(NavigationItem item, HttpServletRequest request, 
-   HttpServletResponse response, ServletConfig servletConfigc);
+   HttpServletResponse response, ServletConfig servletConfigc)
+   throws IOException;
 }
___
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/navigation NavigationItemRenderer.java

[Nico Klasens]

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

Modified Files:
  Tag: b1_4
NavigationItemRenderer.java 
Log Message:
CMSC-863 HttpSessions are used when not necessary and created for useragents 
which do not maintain a session


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


Index: NavigationItemRenderer.java
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/NavigationItemRenderer.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- NavigationItemRenderer.java 30 Nov 2007 10:58:31 -  1.1
+++ NavigationItemRenderer.java 21 Apr 2008 10:11:29 -  1.1.2.1
@@ -1,5 +1,7 @@
 package com.finalist.cmsc.navigation;
 
+import java.io.IOException;
+
 import javax.servlet.ServletConfig;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -9,5 +11,6 @@
 public interface NavigationItemRenderer {
 
void render(NavigationItem item, HttpServletRequest request, 
-   HttpServletResponse response, ServletConfig servletConfigc);
+   HttpServletResponse response, ServletConfig servletConfigc)
+   throws IOException;
 }
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl PageNavigationRenderer.java PortalServlet.java PortalErrorServlet.java

[Nico Klasens]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl
In directory 
james.mmbase.org:/tmp/cvs-serv790/cmsc/portal/src/java/com/finalist/cmsc/portalImpl

Modified Files:
PageNavigationRenderer.java PortalServlet.java 
PortalErrorServlet.java 
Log Message:
CMSC-863 HttpSessions are used when not necessary and created for useragents 
which do not maintain a session


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl
See also: http://www.mmbase.org/jira/browse/CMSC-863


Index: PageNavigationRenderer.java
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/PageNavigationRenderer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- PageNavigationRenderer.java 12 Apr 2008 14:26:09 -  1.6
+++ PageNavigationRenderer.java 21 Apr 2008 10:11:51 -  1.7
@@ -18,26 +18,42 @@
 import com.finalist.cmsc.beans.om.PortletDefinition;
 import com.finalist.cmsc.beans.om.View;
 import com.finalist.cmsc.navigation.NavigationItemRenderer;
-import com.finalist.cmsc.portalImpl.registry.PortalRegistry;
 import com.finalist.cmsc.services.sitemanagement.SiteManagement;
 import com.finalist.pluto.portalImpl.aggregation.EmptyFragment;
 import com.finalist.pluto.portalImpl.aggregation.PortletFragment;
 import com.finalist.pluto.portalImpl.aggregation.ScreenFragment;
+import com.finalist.pluto.portalImpl.core.*;
 
 public class PageNavigationRenderer implements NavigationItemRenderer {
 
private static Log log = LogFactory.getLog(PageNavigationRenderer.class);
 
public void render(NavigationItem item, HttpServletRequest request, 
HttpServletResponse response,
- ServletConfig sc) {
+ ServletConfig sc) throws IOException {
   if (item instanceof Page) {
- ScreenFragment screen = getScreen((Page) item, sc);
 
- PortalRegistry registry = PortalRegistry.getPortalRegistry(request);
+  PortalEnvironment env = 
PortalEnvironment.getPortalEnvironment(request);
+  PortalURL currentURL = env.getRequestedPortalURL();
+
+  PortalControlParameter control = new 
PortalControlParameter(currentURL);
+  if (isActionUrl(control)) {
+  // portlet action phase
+ String id = control.getPortletWindowOfAction();
+
+ log.debug("===>CONTROL='" + control.toString() + "'");
+ log.debug("===>WINDOW='" + id + "'");
+ ScreenFragment screen = getActionScreen((Page) item, sc, id);
+ if (screen == null) {
+ screen = getScreen((Page) item, sc);
+ }
  
- registry.setScreen(screen);
- log.debug("===>SERVICE");
+ screen.processAction(request, response, id);
+ return; // we issued an redirect, so return directly
+  }
+  else {
+ // portlet render phase
  try {
+ ScreenFragment screen = getScreen((Page) item, sc);
 screen.service(request, response);
  }
  catch (ServletException e) {
@@ -47,7 +63,7 @@
 // TODO Auto-generated catch block
 throw new RenderException("IOException while rendering", e);
  }
- log.debug("===>SERVICE DONE");
+  }
   }
   else {
  throw new IllegalArgumentException(
@@ -56,6 +72,10 @@
   }
}
 
+   protected boolean isActionUrl(PortalControlParameter control) {
+  String id = control.getPortletWindowOfAction();
+  return id != null;
+   }
 
protected ScreenFragment getScreen(Page page, ServletConfig sc) {
   try {
@@ -65,18 +85,30 @@
 
  Set names = layout.getNames();
  for (String layoutId : names) {
-Integer portletId = page.getPortlet(layoutId);
-Portlet portlet = SiteManagement.getPortlet(portletId);
-if (portlet != null) {
-   PortletDefinition definition = 
SiteManagement.getPortletDefinition(portlet.getDefinition());
-   View view = SiteManagement.getView(portlet.getView());
-   PortletFragment pf = new PortletFragment(sc, sf, layoutId, 
portlet, definition, view);
+PortletFragment pf = getPortlet(page, sc, sf, layoutId);
if (pf != null) {
   sf.addChild(pf);
}
 }
-else {
-   PortletFragment pf = createDefaultPortlet(sf, page, layoutId, 
sc);
+
+ return sf;
+  }
+  catch (Exception e) {
+ log.error("Error while constructing screen for page: '" + 
page.getId() + "'", e);
+  }
+  return null;
+   }
+
+   private ScreenFragment getActionScreen(Page page, ServletConfig sc, String 
id) {
+   try {
+   Layout layout = SiteManagement.getLayout(page.getLayout());
+ 

[MMBASE CVS] contributions/CMSContainer/cmsc/portal/src/java/com/finalist/pluto/portalImpl/core PortalURL.java

[Nico Klasens]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/pluto/portalImpl/core
In directory 
james.mmbase.org:/tmp/cvs-serv657/cmsc/portal/src/java/com/finalist/pluto/portalImpl/core

Modified Files:
  Tag: b1_4
PortalURL.java 
Log Message:
CMSC-863 HttpSessions are used when not necessary and created for useragents 
which do not maintain a session


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/pluto/portalImpl/core
See also: http://www.mmbase.org/jira/browse/CMSC-863


Index: PortalURL.java
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/pluto/portalImpl/core/PortalURL.java,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -b -r1.13 -r1.13.2.1
--- PortalURL.java  1 Feb 2008 16:22:30 -   1.13
+++ PortalURL.java  21 Apr 2008 10:11:29 -  1.13.2.1
@@ -15,12 +15,7 @@
  */
 package com.finalist.pluto.portalImpl.core;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
+import java.util.*;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -256,7 +251,11 @@
   }
 
   StringBuffer result = new StringBuffer(100);
-  Iterator iterator = encodedStateFullParams.keySet().iterator();
+  // sort encodedNames in the natural order.
+  // Search spiders usually use the url as key for a html document.
+  // This makes portal urls more the same instead of the random order of 
the hashmap
+  Set encodedNames = new 
TreeSet(encodedStateFullParams.keySet());
+  Iterator iterator = encodedNames.iterator();
   while (iterator.hasNext()) {
  result.append("/");
  String encodedName = iterator.next();
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/portal/src/java/com/finalist/pluto/portalImpl/aggregation PortletFragment.java ScreenFragment.java

[Nico Klasens]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/pluto/portalImpl/aggregation
In directory 
james.mmbase.org:/tmp/cvs-serv790/cmsc/portal/src/java/com/finalist/pluto/portalImpl/aggregation

Modified Files:
PortletFragment.java ScreenFragment.java 
Log Message:
CMSC-863 HttpSessions are used when not necessary and created for useragents 
which do not maintain a session


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/pluto/portalImpl/aggregation
See also: http://www.mmbase.org/jira/browse/CMSC-863


Index: PortletFragment.java
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/pluto/portalImpl/aggregation/PortletFragment.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- PortletFragment.java26 Nov 2007 11:43:39 -  1.10
+++ PortletFragment.java21 Apr 2008 10:11:51 -  1.11
@@ -144,6 +144,7 @@
   catch (PortletContainerException e) {
  log.fatal("portlet container raised an exception", e);
   }
+  cleanRequest(request);
}
 
 
@@ -204,7 +205,6 @@
   ServletDefinition servletDefinition = getServletDefinition();
 
   if (servletDefinition != null && !servletDefinition.isUnavailable()) {
- request.setAttribute(PortalConstants.FRAGMENT, this);
  PrintWriter writer2 = new PrintWriter(storedWriter);
 
  // create a wrapped response which the Portlet will be rendered to
@@ -236,17 +236,23 @@
 writer2.println(getErrorMsg(e));
  }
 
- request.removeAttribute(PortalConstants.FRAGMENT);
   }
   else {
  log.error("Error no servletDefinition!!!");
   }
+  cleanRequest(request);
   log.debug("PortletFragment service exits");
}
 
 
private void setupRequest(HttpServletRequest request) {
   request.setAttribute(PortalConstants.CMSC_OM_PORTLET_LAYOUTID, getKey());
+  request.setAttribute(PortalConstants.FRAGMENT, this);
+   }
+
+   private void cleanRequest(HttpServletRequest request) {
+   request.removeAttribute(PortalConstants.FRAGMENT);
+   request.removeAttribute(PortalConstants.CMSC_OM_PORTLET_LAYOUTID);
}
 
 


Index: ScreenFragment.java
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/pluto/portalImpl/aggregation/ScreenFragment.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- ScreenFragment.java 31 Mar 2008 09:01:49 -  1.10
+++ ScreenFragment.java 21 Apr 2008 10:11:51 -  1.11
@@ -40,6 +40,7 @@
   PortletFragment pf = getFragment(actionFragment);
   setupRequest(request);
   pf.processAction(request, response);
+  cleanRequest(request);
}
 
 
@@ -69,6 +70,7 @@
   else {
  log.error("No page for ScreenFragment");
   }
+  cleanRequest(request);
}
 
 
@@ -76,6 +78,10 @@
   request.setAttribute(PortalConstants.CMSC_OM_PAGE_ID, 
String.valueOf(getPage().getId()));
}
 
+   private void cleanRequest(HttpServletRequest request) {
+   request.removeAttribute(PortalConstants.CMSC_OM_PAGE_ID);
+   }
+
 
public Page getPage() {
   return page;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/portal/src/java/com/finalist/pluto PortletContainerImpl.java

[Nico Klasens]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/pluto
In directory 
james.mmbase.org:/tmp/cvs-serv790/cmsc/portal/src/java/com/finalist/pluto

Modified Files:
PortletContainerImpl.java 
Log Message:
CMSC-863 HttpSessions are used when not necessary and created for useragents 
which do not maintain a session


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/pluto
See also: http://www.mmbase.org/jira/browse/CMSC-863


Index: PortletContainerImpl.java
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/pluto/PortletContainerImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- PortletContainerImpl.java   26 Nov 2007 11:43:41 -  1.5
+++ PortletContainerImpl.java   21 Apr 2008 10:11:51 -  1.6
@@ -37,9 +37,10 @@
 import org.apache.pluto.om.window.PortletWindow;
 import org.apache.pluto.services.PortletContainerEnvironment;
 
-import com.finalist.cmsc.beans.om.Page;
+import com.finalist.cmsc.beans.om.*;
 import com.finalist.cmsc.beans.om.Portlet;
-import com.finalist.cmsc.portalImpl.registry.PortalRegistry;
+import com.finalist.cmsc.portalImpl.PortalConstants;
+import com.finalist.cmsc.services.sitemanagement.SiteManagement;
 import com.finalist.cmsc.services.sitemanagement.SiteManagementAdmin;
 import com.finalist.pluto.portalImpl.aggregation.*;
 import com.finalist.pluto.portalImpl.core.CmscPortletMode;
@@ -106,27 +107,22 @@
  if (m != null && m.equals(CmscPortletMode.DELETE)) {
 log.debug("CMSC Portlet DELETE action");
 
-ObjectID id = portletWindow.getId();
-PortalRegistry registry = 
PortalRegistry.getPortalRegistry(servletRequest);
-
-ScreenFragment screenFragment = registry.getScreen();
-Fragment fragment = screenFragment.getFragment(id.toString());
-
-if (fragment instanceof EmptyFragment) {
+PortletFragment portletFragment = (PortletFragment) 
servletRequest.getAttribute(PortalConstants.FRAGMENT);
+if (portletFragment instanceof EmptyFragment) {
log.debug("Can't delete empty portlets of this type.");
 }
-else if (fragment instanceof PortletFragment) {
-   PortletFragment portletFragment = (PortletFragment) fragment;
-   Page page = screenFragment.getPage();
+else {
+   String pageId = (String) 
servletRequest.getAttribute(PortalConstants.CMSC_OM_PAGE_ID);
+   NavigationItem item = 
SiteManagement.getNavigationItem(Integer.valueOf(pageId));
+   if (item instanceof Page) {
+   Page page = (Page) item;
Portlet portlet = portletFragment.getPortlet();
String layoutId = portletFragment.getKey();
SiteManagementAdmin.deleteScreenPortlet(page, portlet, 
layoutId);
 }
-else {
-   log.debug("Can't delete portlets of this type " + 
fragment.getClass().getName());
-}
 actionResponse.setPortletMode(PortletMode.VIEW);
  }
+ }
  else {
 // call action() at the portlet
 invoker.action(actionRequest, actionResponse);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/portal/src/java/com/finalist/pluto/portalImpl/aggregation PortletFragment.java ScreenFragment.java

[Nico Klasens]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/pluto/portalImpl/aggregation
In directory 
james.mmbase.org:/tmp/cvs-serv657/cmsc/portal/src/java/com/finalist/pluto/portalImpl/aggregation

Modified Files:
  Tag: b1_4
PortletFragment.java ScreenFragment.java 
Log Message:
CMSC-863 HttpSessions are used when not necessary and created for useragents 
which do not maintain a session


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/pluto/portalImpl/aggregation
See also: http://www.mmbase.org/jira/browse/CMSC-863


Index: PortletFragment.java
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/pluto/portalImpl/aggregation/PortletFragment.java,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -b -r1.10 -r1.10.2.1
--- PortletFragment.java26 Nov 2007 11:43:39 -  1.10
+++ PortletFragment.java21 Apr 2008 10:11:29 -  1.10.2.1
@@ -144,6 +144,7 @@
   catch (PortletContainerException e) {
  log.fatal("portlet container raised an exception", e);
   }
+  cleanRequest(request);
}
 
 
@@ -204,7 +205,6 @@
   ServletDefinition servletDefinition = getServletDefinition();
 
   if (servletDefinition != null && !servletDefinition.isUnavailable()) {
- request.setAttribute(PortalConstants.FRAGMENT, this);
  PrintWriter writer2 = new PrintWriter(storedWriter);
 
  // create a wrapped response which the Portlet will be rendered to
@@ -236,17 +236,23 @@
 writer2.println(getErrorMsg(e));
  }
 
- request.removeAttribute(PortalConstants.FRAGMENT);
   }
   else {
  log.error("Error no servletDefinition!!!");
   }
+  cleanRequest(request);
   log.debug("PortletFragment service exits");
}
 
 
private void setupRequest(HttpServletRequest request) {
   request.setAttribute(PortalConstants.CMSC_OM_PORTLET_LAYOUTID, getKey());
+  request.setAttribute(PortalConstants.FRAGMENT, this);
+   }
+
+   private void cleanRequest(HttpServletRequest request) {
+   request.removeAttribute(PortalConstants.FRAGMENT);
+   request.removeAttribute(PortalConstants.CMSC_OM_PORTLET_LAYOUTID);
}
 
 


Index: ScreenFragment.java
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/pluto/portalImpl/aggregation/ScreenFragment.java,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -b -r1.9.2.1 -r1.9.2.2
--- ScreenFragment.java 31 Mar 2008 09:01:55 -  1.9.2.1
+++ ScreenFragment.java 21 Apr 2008 10:11:29 -  1.9.2.2
@@ -40,6 +40,7 @@
   PortletFragment pf = getFragment(actionFragment);
   setupRequest(request);
   pf.processAction(request, response);
+  cleanRequest(request);
}
 
 
@@ -69,6 +70,7 @@
   else {
  log.error("No page for ScreenFragment");
   }
+  cleanRequest(request);
}
 
 
@@ -76,6 +78,10 @@
   request.setAttribute(PortalConstants.CMSC_OM_PAGE_ID, 
String.valueOf(getPage().getId()));
}
 
+   private void cleanRequest(HttpServletRequest request) {
+   request.removeAttribute(PortalConstants.CMSC_OM_PAGE_ID);
+   }
+
 
public Page getPage() {
   return page;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/registry PortalRegistry.java

[Nico Klasens]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/registry
In directory 
james.mmbase.org:/tmp/cvs-serv657/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/registry

Removed Files:
  Tag: b1_4
PortalRegistry.java 
Log Message:
CMSC-863 HttpSessions are used when not necessary and created for useragents 
which do not maintain a session


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/registry
See also: http://www.mmbase.org/jira/browse/CMSC-863


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

[MMBASE CVS] contributions/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets RelatedContentPortlet.java

[Nico Klasens]

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

Modified Files:
  Tag: b1_4
RelatedContentPortlet.java 
Log Message:
CMSC-863 HttpSessions are used when not necessary and created for useragents 
which do not maintain a session


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


Index: RelatedContentPortlet.java
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/RelatedContentPortlet.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -b -r1.4 -r1.4.2.1
--- RelatedContentPortlet.java  26 Nov 2007 11:43:40 -  1.4
+++ RelatedContentPortlet.java  21 Apr 2008 10:11:28 -  1.4.2.1
@@ -12,11 +12,9 @@
 
 import org.apache.pluto.core.impl.PortletRequestImpl;
 
-import com.finalist.cmsc.beans.om.Portlet;
-import com.finalist.cmsc.portalImpl.registry.PortalRegistry;
+import com.finalist.cmsc.beans.om.*;
+import com.finalist.cmsc.portalImpl.PortalConstants;
 import com.finalist.cmsc.services.sitemanagement.SiteManagement;
-import com.finalist.pluto.portalImpl.aggregation.Fragment;
-import com.finalist.pluto.portalImpl.aggregation.PortletFragment;
 
 import net.sf.mmapps.commons.util.StringUtil;
 
@@ -39,21 +37,23 @@
 
 
private String getElementIdFromScreen(RenderRequest req, String window) {
-  HttpServletRequest servletRequest = getServletRequest(req);
-  PortalRegistry pr = PortalRegistry.getPortalRegistry(servletRequest);
-  Fragment fragment = pr.getScreen().getFragment(window);
-  if (fragment == null) {
- return null;
+  Integer pageId = getCurrentPageId(req);
+  NavigationItem item = SiteManagement.getNavigationItem(pageId);
+  if (item instanceof Page) {
+  Page page = (Page) item;
+  int portletId = page.getPortlet(window);
+  Portlet portlet = SiteManagement.getPortlet(portletId);
+  if (portlet != null) {
+  return portlet.getParameterValue(CONTENTELEMENT);
+  }
   }
-  Portlet portlet = ((PortletFragment) fragment).getPortlet();
-  if (portlet == null) {
  return null;
   }
-  return portlet.getParameterValue("contentelement");
 
-  // Fragment fragment = pr.getScreen().getFragment(window);
-  // return
-  // 
((PortletFragment)fragment).getPortlet().getParameterValue("contentelement");
+
+private Integer getCurrentPageId(RenderRequest req) {
+String pageId = (String) 
req.getAttribute(PortalConstants.CMSC_OM_PAGE_ID);
+return Integer.valueOf(pageId);
}
 
 
@@ -81,10 +81,7 @@
 
@Override
protected void doEditDefaults(RenderRequest req, RenderResponse res) throws 
IOException, PortletException {
-  HttpServletRequest servletRequest = getServletRequest(req);
-  PortalRegistry pr = PortalRegistry.getPortalRegistry(servletRequest);
-
-  Integer pageid = pr.getScreen().getPage().getId();
+  Integer pageid = getCurrentPageId(req);
   String pagepath = SiteManagement.getPath(pageid, true);
 
   if (pagepath != null) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/filters DisableUrlSessionFilter.java

[Nico Klasens]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/filters
In directory 
james.mmbase.org:/tmp/cvs-serv657/cmsc/utilities/src/java/com/finalist/cmsc/filters

Modified Files:
  Tag: b1_4
DisableUrlSessionFilter.java 
Log Message:
CMSC-863 HttpSessions are used when not necessary and created for useragents 
which do not maintain a session


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/filters
See also: http://www.mmbase.org/jira/browse/CMSC-863


Index: DisableUrlSessionFilter.java
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/filters/DisableUrlSessionFilter.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -b -r1.3 -r1.3.2.1
--- DisableUrlSessionFilter.java26 Nov 2007 11:43:44 -  1.3
+++ DisableUrlSessionFilter.java21 Apr 2008 10:11:28 -  1.3.2.1
@@ -10,14 +10,23 @@
 package com.finalist.cmsc.filters;
 
 import java.io.IOException;
+import java.util.regex.Pattern;
+
 import javax.servlet.*;
 import javax.servlet.http.*;
 
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 /**
- * This Filter disables Url Rewriting and adds Url encoding for all urls. URL
- * Encoding is a process of transforming user input to a CGI form so it is fit
+ * This Filter disables Url Rewriting and cleans Sessions for user agents which
+ * do not support cookies. Example of these user agents are search engines.
+ * 
+ * URL Encoding is a process of transforming user input to a CGI form so it is 
fit
  * for travel across the network -- basically, stripping spaces and punctuation
  * and replacing with escape characters. URL Decoding is the reverse process.
+ * 
  * URL Rewriting is a technique for saving state information on the user's
  * browser between page hits. It's sort of like cookies, only the information
  * gets stored inside the URL, as an additional parameter. The HttpSession API,
@@ -26,6 +35,10 @@
  */
 public class DisableUrlSessionFilter implements Filter {
 
+   private static final Log log = 
LogFactory.getLog(DisableUrlSessionFilter.class);
+
+   private Pattern userAgentPattern;
+
/**
 * Filters requests to disable URL-based session identifiers.
 */
@@ -42,10 +55,11 @@
 
   // clear session if session id in URL
   if (httpRequest.isRequestedSessionIdFromURL()) {
- HttpSession session = httpRequest.getSession();
- if (session != null)
+ HttpSession session = httpRequest.getSession(false);
+ if (session != null) {
 session.invalidate();
   }
+  }
 
   // wrap response to remove URL encoding
   HttpServletResponseWrapper wrappedResponse = new 
HttpServletResponseWrapper(httpResponse) {
@@ -82,25 +96,97 @@
   * @return
   */
  private String getEncodedUrl(String url) {
-// try {
-// return URLEncoder.encode(url,"UTF-8");
-// }
-// catch (UnsupportedEncodingException e) {
-// // should not happen UTF-8 is mandatory
 return url;
-// }
  }
   };
 
   chain.doFilter(request, wrappedResponse);
+  
+  cleanSessions(httpRequest);
}
 
+private void cleanSessions(HttpServletRequest httpRequest) {
+try {
+String userAgent = httpRequest.getHeader("User-Agent");
+if (userAgentPattern != null && 
userAgentPattern.matcher(userAgent).find()) {
+HttpSession session = httpRequest.getSession(false);
+if (session != null && session.isNew()) {
+session.invalidate();
+}
+}
+}
+catch (Exception ex) {
+log.fatal("can't process useragent pattern", ex);
+}
+}
 
public void init(FilterConfig config) {
-  // nothing
+   String useragents = config.getInitParameter("useragents");
+   if (StringUtils.isBlank(useragents)) {
+   String searchEngines = config.getInitParameter("searchEngines");
+   if (StringUtils.isBlank(searchEngines)) {
+   searchEngines = getSearchEngines();
+   }
+   String feedReaders = config.getInitParameter("feedReaders");
+   if (StringUtils.isBlank(feedReaders)) {
+   feedReaders = getFeedReaders();
+   }
+
+   useragents = searchEngines + "|" + feedReaders;
+   }
+   userAgentPattern = Pattern.compile(useragents);
+   }
+
+private String getSearchEngines() {
+// Search engines / Crawlers
+// Mozilla/5.0 (compatible; Googlebot/2.1; 
+http://www.google.com/bot.html)
+// Googlebot/2.1 (+http://www.google.com/bot.html)
+// Mozilla/5.0 (compatible; Yahoo! Slurp/3.0; 

[MMBASE CVS] contributions/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl PortalServlet.java PageNavigationRenderer.java PortalErrorServlet.java

[Nico Klasens]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl
In directory 
james.mmbase.org:/tmp/cvs-serv657/cmsc/portal/src/java/com/finalist/cmsc/portalImpl

Modified Files:
  Tag: b1_4
PortalServlet.java PageNavigationRenderer.java 
PortalErrorServlet.java 
Log Message:
CMSC-863 HttpSessions are used when not necessary and created for useragents 
which do not maintain a session


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl
See also: http://www.mmbase.org/jira/browse/CMSC-863


Index: PortalServlet.java
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/PortalServlet.java,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -u -b -r1.13.2.1 -r1.13.2.2
--- PortalServlet.java  10 Mar 2008 09:38:38 -  1.13.2.1
+++ PortalServlet.java  21 Apr 2008 10:11:28 -  1.13.2.2
@@ -29,11 +29,8 @@
 import com.finalist.cmsc.beans.om.NavigationItem;
 import com.finalist.cmsc.beans.om.Site;
 import com.finalist.cmsc.navigation.*;
-import com.finalist.cmsc.portalImpl.registry.PortalRegistry;
 import com.finalist.cmsc.services.ServiceManager;
 import com.finalist.cmsc.services.sitemanagement.SiteManagement;
-import com.finalist.pluto.portalImpl.aggregation.ScreenFragment;
-import com.finalist.pluto.portalImpl.core.PortalControlParameter;
 import com.finalist.pluto.portalImpl.core.PortalEnvironment;
 import com.finalist.pluto.portalImpl.core.PortalURL;
 import com.finalist.pluto.portalImpl.core.PortletContainerEnvironment;
@@ -158,19 +155,6 @@
  }
   }
 
-  PortalControlParameter control = new PortalControlParameter(currentURL);
-  if (isActionUrl(control)) {
- String id = control.getPortletWindowOfAction();
-
- log.debug("===>CONTROL='" + control.toString() + "'");
- log.debug("===>WINDOW='" + id + "'");
-
- PortalRegistry registry = PortalRegistry.getPortalRegistry(request);
- ScreenFragment screen = registry.getScreen();
- screen.processAction(request, response, id);
- return; // we issued an redirect, so return directly
-  }
-
   processRenderPhase(request, response, currentURL);
   log.debug("===>PortalServlet.doGet EXIT!");
}
@@ -191,11 +175,6 @@
   }
}
 
-   private boolean isActionUrl(PortalControlParameter control) {
-  String id = control.getPortletWindowOfAction();
-  return id != null;
-   }
-
private void processRenderPhase(HttpServletRequest request, 
HttpServletResponse response,
  PortalURL currentURL) {
   try {
@@ -214,7 +193,8 @@
   }
}
 
-   protected boolean doRender(HttpServletRequest request, HttpServletResponse 
response, String path) {
+   protected boolean doRender(HttpServletRequest request, HttpServletResponse 
response, String path)
+   throws IOException {
  NavigationItem item = SiteManagement.getNavigationItemFromPath(path);
  if (item != null) {
 NavigationItemRenderer manager = NavigationManager.getRenderer(item);


Index: PageNavigationRenderer.java
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/PageNavigationRenderer.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -b -r1.4 -r1.4.2.1
--- PageNavigationRenderer.java 3 Dec 2007 13:10:26 -   1.4
+++ PageNavigationRenderer.java 21 Apr 2008 10:11:28 -  1.4.2.1
@@ -1,7 +1,6 @@
 package com.finalist.cmsc.portalImpl;
 
 import java.io.IOException;
-import java.util.Iterator;
 import java.util.Set;
 
 import javax.servlet.ServletConfig;
@@ -19,26 +18,42 @@
 import com.finalist.cmsc.beans.om.PortletDefinition;
 import com.finalist.cmsc.beans.om.View;
 import com.finalist.cmsc.navigation.NavigationItemRenderer;
-import com.finalist.cmsc.portalImpl.registry.PortalRegistry;
 import com.finalist.cmsc.services.sitemanagement.SiteManagement;
 import com.finalist.pluto.portalImpl.aggregation.EmptyFragment;
 import com.finalist.pluto.portalImpl.aggregation.PortletFragment;
 import com.finalist.pluto.portalImpl.aggregation.ScreenFragment;
+import com.finalist.pluto.portalImpl.core.*;
 
 public class PageNavigationRenderer implements NavigationItemRenderer {
 
private static Log log = LogFactory.getLog(PageNavigationRenderer.class);
 
public void render(NavigationItem item, HttpServletRequest request, 
HttpServletResponse response,
- ServletConfig sc) {
+ ServletConfig sc) throws IOException {
   if (item instanceof Page) {
- ScreenFragment screen = getScreen((Page) item, sc);
 
- PortalRegistry registry = PortalRegistry.getPortalRegistry(request);
+  PortalEnvironment env = 
PortalEnvironment.getPortalEnvironment(request);
+  PortalURL

[MMBASE CVS] contributions/CMSContainer/cmsc/portal/src/java/com/finalist/pluto PortletContainerImpl.java

[Nico Klasens]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/pluto
In directory 
james.mmbase.org:/tmp/cvs-serv657/cmsc/portal/src/java/com/finalist/pluto

Modified Files:
  Tag: b1_4
PortletContainerImpl.java 
Log Message:
CMSC-863 HttpSessions are used when not necessary and created for useragents 
which do not maintain a session


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/pluto
See also: http://www.mmbase.org/jira/browse/CMSC-863


Index: PortletContainerImpl.java
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/pluto/PortletContainerImpl.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -b -r1.5 -r1.5.2.1
--- PortletContainerImpl.java   26 Nov 2007 11:43:41 -  1.5
+++ PortletContainerImpl.java   21 Apr 2008 10:11:29 -  1.5.2.1
@@ -37,9 +37,10 @@
 import org.apache.pluto.om.window.PortletWindow;
 import org.apache.pluto.services.PortletContainerEnvironment;
 
-import com.finalist.cmsc.beans.om.Page;
+import com.finalist.cmsc.beans.om.*;
 import com.finalist.cmsc.beans.om.Portlet;
-import com.finalist.cmsc.portalImpl.registry.PortalRegistry;
+import com.finalist.cmsc.portalImpl.PortalConstants;
+import com.finalist.cmsc.services.sitemanagement.SiteManagement;
 import com.finalist.cmsc.services.sitemanagement.SiteManagementAdmin;
 import com.finalist.pluto.portalImpl.aggregation.*;
 import com.finalist.pluto.portalImpl.core.CmscPortletMode;
@@ -106,27 +107,22 @@
  if (m != null && m.equals(CmscPortletMode.DELETE)) {
 log.debug("CMSC Portlet DELETE action");
 
-ObjectID id = portletWindow.getId();
-PortalRegistry registry = 
PortalRegistry.getPortalRegistry(servletRequest);
-
-ScreenFragment screenFragment = registry.getScreen();
-Fragment fragment = screenFragment.getFragment(id.toString());
-
-if (fragment instanceof EmptyFragment) {
+PortletFragment portletFragment = (PortletFragment) 
servletRequest.getAttribute(PortalConstants.FRAGMENT);
+if (portletFragment instanceof EmptyFragment) {
log.debug("Can't delete empty portlets of this type.");
 }
-else if (fragment instanceof PortletFragment) {
-   PortletFragment portletFragment = (PortletFragment) fragment;
-   Page page = screenFragment.getPage();
+else {
+   String pageId = (String) 
servletRequest.getAttribute(PortalConstants.CMSC_OM_PAGE_ID);
+   NavigationItem item = 
SiteManagement.getNavigationItem(Integer.valueOf(pageId));
+   if (item instanceof Page) {
+   Page page = (Page) item;
Portlet portlet = portletFragment.getPortlet();
String layoutId = portletFragment.getKey();
SiteManagementAdmin.deleteScreenPortlet(page, portlet, 
layoutId);
 }
-else {
-   log.debug("Can't delete portlets of this type " + 
fragment.getClass().getName());
-}
 actionResponse.setPortletMode(PortletMode.VIEW);
  }
+ }
  else {
 // call action() at the portlet
 invoker.action(actionRequest, actionResponse);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Modules/alias/src/java/com/finalist/cmsc/alias AliasNavigationRenderer.java

[Nico Klasens]

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

Modified Files:
  Tag: b1_4
AliasNavigationRenderer.java 
Log Message:
CMSC-863 HttpSessions are used when not necessary and created for useragents 
which do not maintain a session


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


Index: AliasNavigationRenderer.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/alias/src/java/com/finalist/cmsc/alias/AliasNavigationRenderer.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -b -r1.6 -r1.6.2.1
--- AliasNavigationRenderer.java1 Feb 2008 16:25:35 -   1.6
+++ AliasNavigationRenderer.java21 Apr 2008 10:11:20 -  1.6.2.1
@@ -12,9 +12,7 @@
 import com.finalist.cmsc.alias.beans.om.Alias;
 import com.finalist.cmsc.beans.om.NavigationItem;
 import com.finalist.cmsc.navigation.*;
-import com.finalist.cmsc.portalImpl.registry.PortalRegistry;
 import com.finalist.cmsc.services.sitemanagement.SiteManagement;
-import com.finalist.pluto.portalImpl.aggregation.ScreenFragment;
 import com.finalist.pluto.portalImpl.core.PortalEnvironment;
 
 public class AliasNavigationRenderer implements NavigationItemRenderer {
@@ -25,7 +23,7 @@
protected static String CONTENT_TYPE = "text/html";
 
public void render(NavigationItem item, HttpServletRequest request, 
HttpServletResponse response,
-   ServletConfig servletConfig) {
+   ServletConfig servletConfig) throws IOException {

   if (item instanceof Alias) {
   Alias alias = (Alias) item;
@@ -35,9 +33,7 @@
 
  HttpServletRequest aliasRequest = new 
AliasHttpServletRequest(request, path); 
  PortalEnvironment aliasEnv = new PortalEnvironment(aliasRequest, 
response, servletConfig);
- PortalRegistry registry = 
PortalRegistry.getPortalRegistry(request);
  response.setContentType(CONTENT_TYPE); 
- ScreenFragment oldScreen = registry.getScreen();
  
  if (pageItem != null) {
 NavigationItemRenderer manager = 
NavigationManager.getRenderer(pageItem);
@@ -45,8 +41,6 @@
 manager.render(pageItem, aliasRequest, response, 
servletConfig);
 }
  }
- 
- registry.setScreen(oldScreen);
  }
  else {
  String url = alias.getUrl();
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite PersonalPageNavigationRenderer.java

[Nico Klasens]

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

Modified Files:
  Tag: b1_4
PersonalPageNavigationRenderer.java 
Log Message:
CMSC-863 HttpSessions are used when not necessary and created for useragents 
which do not maintain a session


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


Index: PersonalPageNavigationRenderer.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/PersonalPageNavigationRenderer.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- PersonalPageNavigationRenderer.java 25 Feb 2008 16:26:15 -  1.1.2.1
+++ PersonalPageNavigationRenderer.java 21 Apr 2008 10:11:20 -  1.1.2.2
@@ -9,6 +9,8 @@
 */
 package com.finalist.cmsc.subsite;
 
+import java.io.IOException;
+
 import javax.servlet.ServletConfig;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -26,7 +28,7 @@
 
 @Override
 public void render(NavigationItem item, HttpServletRequest request,
-HttpServletResponse response, ServletConfig sc) {
+HttpServletResponse response, ServletConfig sc) throws IOException 
{
 
 if (item instanceof PersonalPage) {
 PersonalPage pp = (PersonalPage) item;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite PersonalPageNavigationRenderer.java

[Nico Klasens]

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

Modified Files:
PersonalPageNavigationRenderer.java 
Log Message:
CMSC-863 HttpSessions are used when not necessary and created for useragents 
which do not maintain a session


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


Index: PersonalPageNavigationRenderer.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/PersonalPageNavigationRenderer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- PersonalPageNavigationRenderer.java 18 Feb 2008 13:33:42 -  1.1
+++ PersonalPageNavigationRenderer.java 21 Apr 2008 10:11:14 -  1.2
@@ -9,6 +9,8 @@
 */
 package com.finalist.cmsc.subsite;
 
+import java.io.IOException;
+
 import javax.servlet.ServletConfig;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -26,7 +28,7 @@
 
 @Override
 public void render(NavigationItem item, HttpServletRequest request,
-HttpServletResponse response, ServletConfig sc) {
+HttpServletResponse response, ServletConfig sc) throws IOException 
{
 
 if (item instanceof PersonalPage) {
 PersonalPage pp = (PersonalPage) item;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Modules/alias/src/java/com/finalist/cmsc/alias AliasNavigationRenderer.java

[Nico Klasens]

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

Modified Files:
AliasNavigationRenderer.java 
Log Message:
CMSC-863 HttpSessions are used when not necessary and created for useragents 
which do not maintain a session


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


Index: AliasNavigationRenderer.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/alias/src/java/com/finalist/cmsc/alias/AliasNavigationRenderer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- AliasNavigationRenderer.java1 Feb 2008 16:25:35 -   1.6
+++ AliasNavigationRenderer.java21 Apr 2008 10:11:14 -  1.7
@@ -12,9 +12,7 @@
 import com.finalist.cmsc.alias.beans.om.Alias;
 import com.finalist.cmsc.beans.om.NavigationItem;
 import com.finalist.cmsc.navigation.*;
-import com.finalist.cmsc.portalImpl.registry.PortalRegistry;
 import com.finalist.cmsc.services.sitemanagement.SiteManagement;
-import com.finalist.pluto.portalImpl.aggregation.ScreenFragment;
 import com.finalist.pluto.portalImpl.core.PortalEnvironment;
 
 public class AliasNavigationRenderer implements NavigationItemRenderer {
@@ -25,7 +23,7 @@
protected static String CONTENT_TYPE = "text/html";
 
public void render(NavigationItem item, HttpServletRequest request, 
HttpServletResponse response,
-   ServletConfig servletConfig) {
+   ServletConfig servletConfig) throws IOException {

   if (item instanceof Alias) {
   Alias alias = (Alias) item;
@@ -35,9 +33,7 @@
 
  HttpServletRequest aliasRequest = new 
AliasHttpServletRequest(request, path); 
  PortalEnvironment aliasEnv = new PortalEnvironment(aliasRequest, 
response, servletConfig);
- PortalRegistry registry = 
PortalRegistry.getPortalRegistry(request);
  response.setContentType(CONTENT_TYPE); 
- ScreenFragment oldScreen = registry.getScreen();
  
  if (pageItem != null) {
 NavigationItemRenderer manager = 
NavigationManager.getRenderer(pageItem);
@@ -45,8 +41,6 @@
 manager.render(pageItem, aliasRequest, response, 
servletConfig);
 }
  }
- 
- registry.setScreen(oldScreen);
  }
  else {
  String url = alias.getUrl();
___
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 showNewsletters.jsp

[evaguo]

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

Added Files:
showNewsletters.jsp 
Log Message:
CMSC-725 jsp file



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


showNewsletters.jsp is new

___
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 DateUtil.java

[evaguo]

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

Modified Files:
DateUtil.java 
Log Message:
CMSC-725 test and basic implement.


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


Index: DateUtil.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/DateUtil.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- DateUtil.java   10 Apr 2008 10:12:48 -  1.1
+++ DateUtil.java   21 Apr 2008 09:51:03 -  1.2
@@ -1,12 +1,21 @@
 package com.finalist.newsletter.util;
 
+import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
 public class DateUtil {
-   public static Date parser(String date) throws ParseException {
+
+   public static Date parser (String date) throws ParseException{
+
   SimpleDateFormat format = new SimpleDateFormat("-MM-dd");
   return format.parse(date);
}
+
+   public static String parser (Date date){
+
+   SimpleDateFormat format = new SimpleDateFormat("-MM-dd");
+   return DateFormat.getDateInstance().format(date);
+   }
 }
___
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 StatisticServiceImpl.java NewsletterServiceImpl.java

[evaguo]

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

Modified Files:
NewsletterServiceImpl.java 
Added Files:
StatisticServiceImpl.java 
Log Message:
CMSC-725 test and basic implement.


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


StatisticServiceImpl.java is new



Index: NewsletterServiceImpl.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl/NewsletterServiceImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- NewsletterServiceImpl.java  10 Apr 2008 09:47:04 -  1.1
+++ NewsletterServiceImpl.java  21 Apr 2008 09:51:03 -  1.2
@@ -1,31 +1,37 @@
 package com.finalist.newsletter.services.impl;
 
+import java.util.List;
+
 import com.finalist.newsletter.cao.NewsletterCAO;
 import com.finalist.newsletter.domain.Newsletter;
 import com.finalist.newsletter.services.NewsletterService;
 
-import java.util.List;
-
 public class NewsletterServiceImpl implements NewsletterService {
 
NewsletterCAO newsletterCAO;
 
-
public NewsletterServiceImpl() {
 
}
 
public NewsletterServiceImpl(NewsletterCAO newsletterCAO) {
+
   this.newsletterCAO = newsletterCAO;
}
 
-   public void setNewsletterCAO(NewsletterCAO newsletterCAO) {
+   public void setNewsletterCAO (NewsletterCAO newsletterCAO){
+
   this.newsletterCAO = newsletterCAO;
}
 
-   public List getAllNewsletter() {
+   public List getAllNewsletter (){
+
   return newsletterCAO.getAllNewsletters();
}
 
+   public String getNewsletterName (int newsletterId){
+
+   return newsletterCAO.getNewsletterById(newsletterId).getTitle();
+   }
 
 }
___
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 NewsLetterStatisticCAOImpl.java NewsletterCAOImpl.java NewsletterSubscriptionCAOImpl.jav

[evaguo]

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

Modified Files:
NewsLetterStatisticCAOImpl.java NewsletterCAOImpl.java 
NewsletterSubscriptionCAOImpl.java 
Log Message:
CMSC-725 test and basic implement.


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


Index: NewsLetterStatisticCAOImpl.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsLetterStatisticCAOImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- NewsLetterStatisticCAOImpl.java 16 Apr 2008 10:47:39 -  1.4
+++ NewsLetterStatisticCAOImpl.java 21 Apr 2008 09:51:03 -  1.5
@@ -1,26 +1,31 @@
 package com.finalist.newsletter.cao.impl;
 
 import java.util.Date;
+import java.util.List;
 
 import org.mmbase.bridge.Cloud;
+import org.mmbase.bridge.Field;
 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.storage.search.Step;
 import org.mmbase.storage.search.StepField;
 import org.mmbase.storage.search.implementation.BasicCompositeConstraint;
 import 
org.mmbase.storage.search.implementation.BasicFieldValueBetweenConstraint;
 import org.mmbase.storage.search.implementation.BasicFieldValueConstraint;
+import org.mmbase.storage.search.implementation.BasicFieldValueDateConstraint;
+import org.mmbase.storage.search.implementation.BasicStep;
 
 import com.finalist.newsletter.cao.NewsLetterStatisticCAO;
-
+import com.finalist.newsletter.cao.util.StatisticUtil;
+import com.finalist.newsletter.domain.StatisticResult;
 
 public class NewsLetterStatisticCAOImpl implements NewsLetterStatisticCAO {
 
private Cloud cloud;
 
-
public NewsLetterStatisticCAOImpl() {
}

@@ -28,44 +33,48 @@
   this.cloud = cloud;
}
 
+   public List getAllRecords (){
 
-
-   public NodeList getAllRecords() {
-   Query query = cloud.createQuery();
-   query.addStep(cloud.getNodeManager("newsletterdailylog"));
+   NodeQuery query = cloud.createNodeQuery();
+   Step step = 
query.addStep(cloud.getNodeManager("newsletterdailylog"));
+   query.setNodeStep(step);
NodeList list = query.getList();
 
-   return list;
+   StatisticUtil util = new StatisticUtil();
+   return util.convertFromNodeList(list);
}
 
-   public NodeList getRecordsByNewsletter(int newsletter) {
-   Query query = cloud.createQuery();
+   public List getRecordsByNewsletter (int newsletter){
+
+   NodeQuery query = cloud.createNodeQuery();
NodeManager manager = 
cloud.getNodeManager("newsletterdailylog");
 
Step step1 = query.addStep(manager);
StepField field1 = query.addField(step1, 
manager.getField("newsletter"));
query.addField(step1, manager.getField("subscribe"));
query.addField(step1, manager.getField("bounches"));
+   query.addField(step1, manager.getField("post"));
query.addField(step1, manager.getField("unsubscribe"));
query.addField(step1, manager.getField("removed"));
query.addField(step1, manager.getField("logdate"));
BasicFieldValueConstraint constraint = new 
BasicFieldValueConstraint(
field1, newsletter);
query.setConstraint(constraint);
+   query.setNodeStep(step1);
NodeList list = query.getList();
-   return list;
+
+   StatisticUtil util = new StatisticUtil();
+   return util.convertFromNodeList(list);
}
 
-   public NodeList getAllRecordsByPeriod(Date start, Date end) {
-   Query query = cloud.createQuery();
+   public List getAllRecordsByPeriod (Date start, Date 
end){
+
+   NodeQuery query = cloud.createNodeQuery();
NodeManager manager = 
cloud.getNodeManager("newsletterdailylog");
 
-   /*
-* 
¶Ônewsletterdailylog±íµÄÈÕÆÚ×ֶνøÐÐÔ¼Êø£¬²¢È¡³öËùÓÐÐÅÏ¢
 ÏëÒª´ïµ½µÄЧ¹û£º select * from
-* newsletterdailylog where logdate between date1 and date2;
-*/
Step step1 = query.addStep(manager);
query.addField(step1, manager.getField("subscribe"));
+   query.addField(step1, manager.getField

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/util NlUtil.java StatisticUtil.java

[evaguo]

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

Added Files:
NlUtil.java StatisticUtil.java 
Log Message:
CMSC-725 test and basic implement.


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


NlUtil.java is new



StatisticUtil.java is new

___
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 StatisticResult.java

[evaguo]

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

Modified Files:
StatisticResult.java 
Log Message:
CMSC-725 test and basic implement.


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


Index: StatisticResult.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/domain/StatisticResult.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- StatisticResult.java10 Apr 2008 10:07:47 -  1.1
+++ StatisticResult.java21 Apr 2008 09:51:03 -  1.2
@@ -1,33 +1,115 @@
 package com.finalist.newsletter.domain;
 
+import java.util.Date;
+
 public class StatisticResult {
+
private int newsletterId = 0;
+
private String name;
+
private int post = 0;
 
-   public int getNewsletterId() {
+   private int bounches = 0;
+
+   private int subscribe = 0;
+
+   private int unsubscribe = 0;
+
+   private int removed = 0;
+
+   private Date logdate;
+
+   private String showingdate;
+
+   public String getShowingdate (){
+
+   return showingdate;
+   }
+
+   public void setShowingdate (String showingdate){
+
+   this.showingdate = showingdate;
+   }
+
+   public int getNewsletterId (){
+
   return newsletterId;
}
 
-   public void setNewsletterId(int newsletterId) {
+   public void setNewsletterId (int newsletterId){
+
   this.newsletterId = newsletterId;
}
 
-   public String getName() {
+   public String getName (){
+
   return name;
}
 
-   public void setName(String name) {
+   public void setName (String name){
+
   this.name = name;
}
 
-   public int getPost() {
+   public int getPost (){
+
   return post;
}
 
-   public void setPost(int post) {
+   public void setPost (int post){
+
   this.post = post;
}
 
+   public int getBounches (){
+
+   return bounches;
+   }
+
+   public void setBounches (int bounches){
+
+   this.bounches = bounches;
+   }
+
+   public int getSubscribe (){
+
+   return subscribe;
+   }
+
+   public void setSubscribe (int subscribe){
+
+   this.subscribe = subscribe;
+   }
+
+   public int getUnsubscribe (){
+
+   return unsubscribe;
+   }
+
+   public void setUnsubscribe (int unsubscribe){
+
+   this.unsubscribe = unsubscribe;
+   }
+
+   public int getRemoved (){
+
+   return removed;
+   }
+
+   public void setRemoved (int removed){
+
+   this.removed = removed;
+   }
+
+   public Date getLogdate (){
+
+   return logdate;
+   }
+
+   public void setLogdate (Date logdate){
+
+   this.logdate = logdate;
+   }
 
 }
___
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 NewsLetterStatisticCAO.java

[evaguo]

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

Modified Files:
NewsLetterStatisticCAO.java 
Log Message:
CMSC-725 test and basic implement.


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


Index: NewsLetterStatisticCAO.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/NewsLetterStatisticCAO.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- NewsLetterStatisticCAO.java 16 Apr 2008 10:47:39 -  1.4
+++ NewsLetterStatisticCAO.java 21 Apr 2008 09:51:03 -  1.5
@@ -3,6 +3,9 @@
 import java.util.Date;
 import java.util.List;
 
+import org.mmbase.bridge.Node;
+import org.mmbase.bridge.NodeList;
+
 import com.finalist.newsletter.domain.StatisticResult;
 
 public interface NewsLetterStatisticCAO {
@@ -14,6 +17,5 @@
 
public List getRecordsByNewsletterAndPeriod(Date start,
Date end, int newsletter);
-
public void logPubliction(int id, int i);
 }
___
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/forms NewsLetterLogSearchForm.java NewsLetterShowForm.java NewsletterStatisticAction.java

[evaguo]

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

Modified Files:
NewsLetterLogSearchForm.java NewsLetterShowForm.java 
NewsletterStatisticAction.java 
Log Message:
CMSC-725 test and basic implement.


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


Index: NewsLetterLogSearchForm.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsLetterLogSearchForm.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- NewsLetterLogSearchForm.java10 Apr 2008 10:07:47 -  1.1
+++ NewsLetterLogSearchForm.java21 Apr 2008 09:51:03 -  1.2
@@ -1,5 +1,6 @@
 package com.finalist.newsletter.forms;
 
+import java.text.DateFormat;
 import java.text.ParseException;
 import java.util.Date;
 import java.util.regex.Matcher;
@@ -16,104 +17,74 @@
 
 import com.finalist.newsletter.util.DateUtil;
 
-
-public class NewsLetterLogSearchForm extends 
org.apache.struts.action.ActionForm {
-
+public class NewsLetterLogSearchForm extends
+   org.apache.struts.action.ActionForm {
 
private String newsletters;
-   /*private String startDate_year;
-private String startDate_month;
-private String startDate_day;
-private String endDate_year;
-private String endDate_month;
-private String endDate_day;*/
+
private String startDate;
+
private String endDate;
-   private boolean flag = false;
 
-   /*public void joinDateStart(){
+   private String detailOrSum;
 
-   startDate=startDate_year+"-"+startDate_month+"-"+startDate_day;
-}
-public void joinDateEnd(){
+   public String getDetailOrSum (){
 
-   endDate= endDate_year+"-"+endDate_month+"-"+endDate_day;
-}*/
-   public boolean isFlag() {
-  return flag;
+   return detailOrSum;
}
 
-   public void setFlag(boolean flag) {
-  this.flag = flag;
+   public void setDetailOrSum (String detailorsum){
+
+   this.detailOrSum = detailorsum;
}
 
+   public String getNewsletters (){
 
-   public String getNewsletters() {
   return newsletters;
}
 
-   public void setNewsletters(String newsletters) {
+   public void setNewsletters (String newsletters){
+
   this.newsletters = newsletters;
}
 
-// @Override
-// public ActionErrors validate(ActionMapping mapping,
-// HttpServletRequest request) {
-// ActionErrors errors = new ActionErrors();
-// MessageResourcesFactory factory = 
org.apache.struts.util.MessageResourcesFactory.createFactory();
-// MessageResources res = 
factory.createResources("cmsc-newsletter");
-// 
-// 
-// if(startDate!=null&&endDate!=null){
-// try {
-// Date dateStart = DateUtil.parser(startDate);
-// Date dateEnd = DateUtil.parser(endDate);
-// if(dateStart.after(dateEnd)){
-// errors.add("error1", new 
ActionMessage("error1"));
-// 
-//
-// 
-// System.out.println("res=="+res);
-// String value = res.getMessage("error1");
-// 
System.out.println("i-->"+value);
-// 
System.out.println("i-->"+new 
ActionMessage(res.getMessage("error1")));
-// 
System.out.println("i"+new ActionMessage("error1"));
-// }
-// } catch (ParseException e) {
-// // TODO Auto-generated catch block
-// e.printStackTrace();
-// }
-// 
-// }
-// else if(startDate==null&&endDate==null&&newsletters==null){
-// errors.add("error2", new ActionMessage("error2"));
-// }
-// 
-// 
System.out.println("i==="+errors.size());
-// 
System.out.println("i==="+errors.get("error1").toString());
-// ActionErrors e = new ActionErrors();
-//  e.add("myProperty",new ActionMessage("edit_defaults.title"));
-//
-//  
-// return e;
-// }
+   @Override
+   public ActionErrors validate (ActionMappin

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

[evaguo]

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

Modified Files:
NewsLetterStatisticCAOImplTest.java 
Log Message:
CMSC-725 test and basic implement.


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


Index: NewsLetterStatisticCAOImplTest.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/test/com/finalist/newsletter/cao/impl/NewsLetterStatisticCAOImplTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- NewsLetterStatisticCAOImplTest.java 15 Apr 2008 06:18:33 -  1.1
+++ NewsLetterStatisticCAOImplTest.java 21 Apr 2008 09:51:03 -  1.2
@@ -2,7 +2,11 @@
 
 import com.finalist.newsletter.BaseNewsletterTest;
 import com.finalist.newsletter.cao.NewsLetterStatisticCAO;
+import com.finalist.newsletter.domain.StatisticResult;
 
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.util.Date;
 import java.util.List;
 
 public class NewsLetterStatisticCAOImplTest extends BaseNewsletterTest {
@@ -23,4 +27,52 @@
 
   assertEquals(2,list.size());
}
+   public void testGetAllRecords() {
+   List records = cao.getAllRecords();
+   assertEquals(8, records.size());
+   }
+
+   public void testGetRecordsByNewsletter() {
+   List records = cao.getRecordsByNewsletter(1);
+   assertEquals(6,records.get(0).getPost());
+   assertEquals(2, records.size());
+   }
+
+   public void testGetAllRecordsByPeriod() {
+   /*
+* Long dateS1 = Date.parse("2008-3-31"); Date date1 = new 
Date(dateS1);
+* Date date2 = new Date(Date.parse("2008-3-31"));
+*/
+
+   try {
+   DateFormat df = DateFormat.getDateInstance();
+   List records = 
cao.getAllRecordsByPeriod(df
+   .parse("2008-01-01"), 
df.parse("2008-01-03"));
+   assertEquals(5, records.size());
+   } catch (ParseException e) {
+   fail("parser error");
+   e.printStackTrace();
+   }
+   }
+
+   public void testGetRecordsByNewsletterAndPeriod() {
+   DateFormat df = DateFormat.getDateInstance();
+
+   try {
+   Date start = df.parse("2003-01-01");
+   Date end = df.parse("2009-01-31");
+   List records = 
cao.getRecordsByNewsletterAndPeriod(
+   start, end, 2);
+   assertEquals(2,records.get(0).getPost());
+   assertEquals(2, records.size());
+
+   Date end2 = df.parse("2007-01-08");
+   List zeroRecords = cao
+   .getRecordsByNewsletterAndPeriod(start, 
end2, 1);
+   assertEquals(0, zeroRecords.size());
+   } catch (ParseException e) {
+   // TODO Auto-generated catch block
+   e.printStackTrace();
+   }
+   }
 }
___
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 StatisticService.java NewsletterServiceFactory.java NewsletterService.java

[evaguo]

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

Modified Files:
NewsletterServiceFactory.java NewsletterService.java 
Added Files:
StatisticService.java 
Log Message:
CMSC-725 test and basic implement.


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


StatisticService.java is new



Index: NewsletterServiceFactory.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/NewsletterServiceFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- NewsletterServiceFactory.java   18 Apr 2008 08:30:52 -  1.3
+++ NewsletterServiceFactory.java   21 Apr 2008 09:51:03 -  1.4
@@ -13,11 +13,14 @@
 import com.finalist.newsletter.cao.NewsletterPublicationCAO;
 import com.finalist.newsletter.cao.NewsletterSubscriptionCAO;
 import com.finalist.newsletter.cao.impl.NewsLetterStatisticCAOImpl;
+import com.finalist.newsletter.cao.impl.NewsletterCAOImpl;
 import com.finalist.newsletter.cao.impl.NewsletterPublicationCAOImpl;
 import com.finalist.newsletter.cao.impl.NewsletterSubscriptionCAOImpl;
 import com.finalist.newsletter.publisher.NewsletterPublisher;
 import com.finalist.newsletter.services.impl.NewsletterPublicationServiceImpl;
+import com.finalist.newsletter.services.impl.NewsletterServiceImpl;
 import 
com.finalist.newsletter.services.impl.NewsletterSubscriptionServicesImpl;
+import com.finalist.newsletter.services.impl.StatisticServiceImpl;
 
 public class NewsletterServiceFactory {

@@ -45,4 +48,18 @@
  return newsletterPublicationService;
  
   }
+
+   public static NewsletterService getNewsletterService (){
+
+   NewsletterServiceImpl service = new NewsletterServiceImpl();
+   service.setNewsletterCAO(new 
NewsletterCAOImpl(cloudProvider.getCloud()));
+   return service;
+   }
+
+   public static StatisticService getStatisticService (){
+   StatisticServiceImpl service = new StatisticServiceImpl();
+   service.setNewLettercao(new 
NewsletterCAOImpl(cloudProvider.getCloud()));
+   service.setStatisticcao(new 
NewsLetterStatisticCAOImpl(cloudProvider.getCloud()));
+   return service;
+   }
 }


Index: NewsletterService.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/NewsletterService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- NewsletterService.java  10 Apr 2008 09:47:04 -  1.1
+++ NewsletterService.java  21 Apr 2008 09:51:03 -  1.2
@@ -6,5 +6,7 @@
 
 public interface NewsletterService {

-   public List getAllNewsletter();
+   public List getAllNewsletter ();
+
+   public String getNewsletterName (int newsletterId);
 }
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] applications/searchrelate/examples example5.jspx

[Michiel Meeuwissen]

Update of /var/cvs/applications/searchrelate/examples
In directory james.mmbase.org:/tmp/cvs-serv32336

Modified Files:
example5.jspx 
Log Message:
should bind only to the current example


See also: http://cvs.mmbase.org/viewcvs/applications/searchrelate/examples


Index: example5.jspx
===
RCS file: /var/cvs/applications/searchrelate/examples/example5.jspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- example5.jspx   21 Apr 2008 09:44:58 -  1.1
+++ example5.jspx   21 Apr 2008 09:49:47 -  1.2
@@ -8,13 +8,15 @@
   The 'current' repository, is actually optional. You'd probably bind some 
other functionality to the 'relate' function then.
   That can be done by setting the 'relateCallBack' function
   
-  
+  
 
   MMBaseRelater.ready(function(relater) {
+if ($(relater.div).parents("#example5").length > 0) {
relater.relateCallBack = function(tr) {
var nodeNumber = relater.getNumber(tr);
alert("clicked on " + nodeNumber);
}
+   }
 });
 
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] applications/searchrelate/examples example5.jspx index.jspx

[Michiel Meeuwissen]

Update of /var/cvs/applications/searchrelate/examples
In directory james.mmbase.org:/tmp/cvs-serv32033

Modified Files:
index.jspx 
Added Files:
example5.jspx 
Log Message:
added an example without a 'current' repository


See also: http://cvs.mmbase.org/viewcvs/applications/searchrelate/examples


example5.jspx is new



Index: index.jspx
===
RCS file: /var/cvs/applications/searchrelate/examples/index.jspx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- index.jspx  14 Apr 2008 16:57:09 -  1.11
+++ index.jspx  21 Apr 2008 09:44:58 -  1.12
@@ -49,6 +49,7 @@
 
 
 
+
 
 
   
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/natmm/templates/mmbase/edit/wizard/data/config/deelnemers_categorie zoek_evenement_type_posrel_deelnemers_categorie.xml

[jruijter]

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

Modified Files:
zoek_evenement_type_posrel_deelnemers_categorie.xml 
Log Message:
NMCMS-480


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


Index: zoek_evenement_type_posrel_deelnemers_categorie.xml
===
RCS file: 
/var/cvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/deelnemers_categorie/zoek_evenement_type_posrel_deelnemers_categorie.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- zoek_evenement_type_posrel_deelnemers_categorie.xml 31 May 2007 13:45:30 
-  1.2
+++ zoek_evenement_type_posrel_deelnemers_categorie.xml 21 Apr 2008 09:38:18 
-  1.3
@@ -2,7 +2,7 @@
 http://www.mmbase.org/dtd/wizard-schema_1_0.dtd";>
 
 
-   activiteitstype en standaard kosten (in centen, zonder punt of 
komma)
+   deelnemers categorie en standaard kosten (in centen, zonder punt of 
komma)

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

[MMBASE CVS] applications/searchrelate/META-INF/tags/mm/searchrelate relate.tagx

[Michiel Meeuwissen]

Update of /var/cvs/applications/searchrelate/META-INF/tags/mm/searchrelate
In directory james.mmbase.org:/tmp/cvs-serv31319

Modified Files:
relate.tagx 
Log Message:
removed debug 'dots'


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


Index: relate.tagx
===
RCS file: 
/var/cvs/applications/searchrelate/META-INF/tags/mm/searchrelate/relate.tagx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- relate.tagx 17 Apr 2008 20:58:01 -  1.19
+++ relate.tagx 21 Apr 2008 09:22:18 -  1.20
@@ -6,7 +6,7 @@
 >
   
   
   
 
-..
+
   
   
   
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources imagesearch.jsp attachmentsearch.jsp

[Nico Klasens]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources
In directory 
james.mmbase.org:/tmp/cvs-serv29347/cmsc/contentrepository/src/webapp/editors/resources

Modified Files:
  Tag: v1_3
imagesearch.jsp attachmentsearch.jsp 
Log Message:
CMSC-853 DeleteSecondaryContentAction allows SITEADMIN only


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources
See also: http://www.mmbase.org/jira/browse/CMSC-853


Index: imagesearch.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/imagesearch.jsp,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -b -r1.5 -r1.5.2.1
--- imagesearch.jsp 21 May 2007 18:06:16 -  1.5
+++ imagesearch.jsp 21 Apr 2008 08:20:14 -  1.5.2.1
@@ -92,7 +92,7 @@
  " />
   ">
  " title="" />
- 
+ 

 
 " />


Index: attachmentsearch.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/attachmentsearch.jsp,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -b -r1.6 -r1.6.2.1
--- attachmentsearch.jsp21 May 2007 18:06:16 -  1.6
+++ attachmentsearch.jsp21 Apr 2008 08:20:14 -  1.6.2.1
@@ -84,7 +84,7 @@
  " />
   ">
   " title="" />
- 
+ 

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

[MMBASE CVS] contributions/CMSContainer_Templates/single/war/src/webapp/WEB-INF/config services.properties

[jkoster]

Update of 
/var/cvs/contributions/CMSContainer_Templates/single/war/src/webapp/WEB-INF/config
In directory 
james.mmbase.org:/tmp/cvs-serv28861/single/war/src/webapp/WEB-INF/config

Modified Files:
services.properties 
Log Message:
Make layout clear.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Templates/single/war/src/webapp/WEB-INF/config


Index: services.properties
===
RCS file: 
/var/cvs/contributions/CMSContainer_Templates/single/war/src/webapp/WEB-INF/config/services.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- services.properties 9 Apr 2008 08:33:59 -   1.2
+++ services.properties 21 Apr 2008 08:09:59 -  1.3
@@ -34,5 +34,6 @@
 com.finalist.cmsc.services.publish.PublishService = 
com.finalist.cmsc.services.publish.DummyPublishService
 com.finalist.cmsc.services.workflow.WorkflowService = 
com.finalist.cmsc.services.workflow.DummyWorkflowService
 com.finalist.cmsc.services.versioning.VersioningService = 
com.finalist.cmsc.services.versioning.DummyVersioningService
+
 com.finalist.cmsc.services.community.CommunityService = 
com.finalist.cmsc.services.community.DummyCommunityService
 #com.finalist.cmsc.services.community.CommunityService = 
com.finalist.cmsc.services.community.CommunityServiceMysqlImpl
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs