[MMBASE CVS] applications/taglib/src/org/mmbase/bridge/jsp/taglib/editor BasicEditor.java
Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/editor
In directory
james.mmbase.org:/tmp/cvs-serv28130/src/org/mmbase/bridge/jsp/taglib/editor
Modified Files:
Tag: MMBase-1_8
BasicEditor.java
Log Message:
makeRelative() gives a 404
See also:
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/editor
Index: BasicEditor.java
===
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/editor/BasicEditor.java,v
retrieving revision 1.9.2.3
retrieving revision 1.9.2.4
diff -u -b -r1.9.2.3 -r1.9.2.4
--- BasicEditor.java14 Apr 2008 10:15:35 - 1.9.2.3
+++ BasicEditor.java7 May 2008 06:37:22 - 1.9.2.4
@@ -27,7 +27,7 @@
* of the very first field the edittag encounters, with an icon to click on.
*
* @author André van Toly
- * @version $Id: BasicEditor.java,v 1.9.2.3 2008/04/14 10:15:35 sdeboer Exp $
+ * @version $Id: BasicEditor.java,v 1.9.2.4 2008/05/07 06:37:22 bert Exp $
* @see EditTag
* @see YAMMEditor
* @since MMBase-1.8
@@ -100,7 +100,8 @@
String url = getValue("url", cloud, nodenr, context);
String icon = getValue("icon", cloud, nodenr, context);
-url = makeRelative(url, context);
+// 404
+// url = makeRelative(url, context);
Writer html = context.getOut();
Locale locale = (Locale) context.getAttribute(LocaleTag.KEY,
LocaleTag.SCOPE);
if (locale == null) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF spring-newsletter.xml
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF In directory james.mmbase.org:/tmp/cvs-serv27209/portlets-newsletter/src/webapp/WEB-INF Modified Files: spring-newsletter.xml Log Message: CMSC-818 move service initial to spring. See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF See also: http://www.mmbase.org/jira/browse/CMSC-818 Index: spring-newsletter.xml === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/spring-newsletter.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- spring-newsletter.xml 7 May 2008 02:54:40 - 1.3 +++ spring-newsletter.xml 7 May 2008 05:58:37 - 1.4 @@ -22,10 +22,19 @@ + + + + + - + + + + @@ -42,6 +51,18 @@ + + + + + + + + + + ___ 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 NewsletterServiceFactory.java
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services In directory james.mmbase.org:/tmp/cvs-serv27209/portlets-newsletter/src/java/com/finalist/newsletter/services Removed Files: NewsletterServiceFactory.java Log Message: CMSC-818 move service initial to spring. 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-818 ___ 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 NewsletterPublicationServiceImpl.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl
In directory
james.mmbase.org:/tmp/cvs-serv27209/portlets-newsletter/src/java/com/finalist/newsletter/services/impl
Modified Files:
NewsletterPublicationServiceImpl.java
Log Message:
CMSC-818 move service initial to spring.
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: NewsletterPublicationServiceImpl.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl/NewsletterPublicationServiceImpl.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- NewsletterPublicationServiceImpl.java 5 May 2008 10:26:59 -
1.13
+++ NewsletterPublicationServiceImpl.java 7 May 2008 05:58:37 -
1.14
@@ -28,7 +28,8 @@
private NewsLetterStatisticCAO statisticCAO;
//CAO setters
- public void setMailSender(NewsletterPublisher publisher) {
+
+ public void setPublisher(NewsletterPublisher publisher) {
this.publisher = publisher;
}
___
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
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter
In directory
james.mmbase.org:/tmp/cvs-serv27209/portlets-newsletter/src/java/com/finalist/portlets/newsletter
Modified Files:
NewsletterSubscriptionPortlet.java
Log Message:
CMSC-818 move service initial to spring.
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.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- NewsletterSubscriptionPortlet.java 3 May 2008 14:38:57 - 1.25
+++ NewsletterSubscriptionPortlet.java 7 May 2008 05:58:37 - 1.26
@@ -2,10 +2,10 @@
import com.finalist.cmsc.portalImpl.PortalConstants;
import com.finalist.cmsc.portlets.JspPortlet;
+import com.finalist.cmsc.services.community.person.PersonService;
import com.finalist.newsletter.domain.Subscription;
-import com.finalist.newsletter.services.CommunityModuleAdapter;
-import com.finalist.newsletter.services.NewsletterServiceFactory;
-import com.finalist.newsletter.services.NewsletterSubscriptionServices;
+import com.finalist.newsletter.services.*;
+import com.finalist.newsletter.ApplicationContextFactory;
import org.apache.commons.lang.StringUtils;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
@@ -17,12 +17,6 @@
public class NewsletterSubscriptionPortlet extends JspPortlet {
private static Logger log =
Logging.getLoggerInstance(NewsletterSubscriptionPortlet.class.getName());
- private static final String HAS_SUBSCRIPTIONS = "hassubscriptions";
- private static final String NEWSLETTERSUBSCRIPTIONS =
"newslettersubscriptions";
- private static final String ACTION_SUBSCRIBE = "subscribe";
- private static final String ACTION_CHANGE = "change";
- private static final String ACTION_TERMINATE = "terminate";
-
private static final String ALLOWED_NEWSLETTERS = "allowednewsletters";
@Override
@@ -39,7 +33,7 @@
@Override
protected void doView(RenderRequest request, RenderResponse response)
throws PortletException, IOException {
PortletPreferences preferences = request.getPreferences();
- NewsletterSubscriptionServices services =
NewsletterServiceFactory.getNewsletterSubscriptionServices();
+ NewsletterSubscriptionServices services =
(NewsletterSubscriptionServices)
ApplicationContextFactory.getBean("subscriptionServices");
int userId = CommunityModuleAdapter.getCurrentUserId();
String[] newsletters = preferences.getValues(ALLOWED_NEWSLETTERS, null);
@@ -86,7 +80,7 @@
}
private List getSubscriptionsFromParameter(RenderRequest
request, Subscription.STATUS status) {
- NewsletterSubscriptionServices services =
NewsletterServiceFactory.getNewsletterSubscriptionServices();
+ NewsletterSubscriptionServices services =
(NewsletterSubscriptionServices)
ApplicationContextFactory.getBean("subscriptionServices");
List subscriptions = new ArrayList();
if (null != request.getParameterValues("subscriptions")) {
@@ -133,7 +127,7 @@
}
private void processTermination(ActionRequest request, ActionResponse
response) {
- NewsletterSubscriptionServices services =
NewsletterServiceFactory.getNewsletterSubscriptionServices();
+ NewsletterSubscriptionServices services =
(NewsletterSubscriptionServices)
ApplicationContextFactory.getBean("subscriptionServices");
String confirmation = request.getParameter("confirm_unsubscribe");
String[] subscriptionIds = request.getParameterValues("subscriptions");
@@ -150,7 +144,7 @@
}
private void processResume(ActionRequest request, ActionResponse response) {
- NewsletterSubscriptionServices services =
NewsletterServiceFactory.getNewsletterSubscriptionServices();
+ NewsletterSubscriptionServices services =
(NewsletterSubscriptionServices)
ApplicationContextFactory.getBean("subscriptionServices");
String confirmation = request.getParameter("confirm_resume");
String[] subscriptionIds = request.getParameterValues("subscriptions");
@@ -168,7 +162,7 @@
private void processPause(ActionRequest request, ActionResponse response) {
- NewsletterSubscriptionServices services =
NewsletterServiceFactory.getNewsletterSubscriptionServices();
+ NewsletterSubscriptionServices services =
(NewsletterSubscriptionServices)
ApplicationContextFactory.getBean("subscriptionServices");
String duration = request.getParameter("timeduration");
String durationunit = request.getParameter("durationunit");
String resumeDat
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl NewsLetterStatisticCAOImpl.java NewsletterPublicationCAOImpl.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
In directory
james.mmbase.org:/tmp/cvs-serv27209/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
Modified Files:
NewsLetterStatisticCAOImpl.java
NewsletterPublicationCAOImpl.java
Log Message:
CMSC-818 move service initial to spring.
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: NewsLetterStatisticCAOImpl.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsLetterStatisticCAOImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- NewsLetterStatisticCAOImpl.java 21 Apr 2008 09:51:03 - 1.5
+++ NewsLetterStatisticCAOImpl.java 7 May 2008 05:58:37 - 1.6
@@ -26,10 +26,7 @@
private Cloud cloud;
-public NewsLetterStatisticCAOImpl() {
- }
-
- public NewsLetterStatisticCAOImpl(Cloud cloud) {
+ public void setCloud(Cloud cloud) {
this.cloud = cloud;
}
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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- NewsletterPublicationCAOImpl.java 5 May 2008 10:26:59 - 1.8
+++ NewsletterPublicationCAOImpl.java 7 May 2008 05:58:37 - 1.9
@@ -49,10 +49,7 @@
Cloud cloud;
- public NewsletterPublicationCAOImpl() {
- }
-
- public NewsletterPublicationCAOImpl(Cloud cloud) {
+ public void setCloud(Cloud cloud) {
this.cloud = cloud;
}
___
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/tree NewsletterPublicationTreeItemRenderer.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree
In directory
james.mmbase.org:/tmp/cvs-serv27209/portlets-newsletter/src/java/com/finalist/newsletter/tree
Modified Files:
NewsletterPublicationTreeItemRenderer.java
Log Message:
CMSC-818 move service initial to spring.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree
See also: http://www.mmbase.org/jira/browse/CMSC-818
Index: NewsletterPublicationTreeItemRenderer.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree/NewsletterPublicationTreeItemRenderer.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- NewsletterPublicationTreeItemRenderer.java 29 Apr 2008 01:37:04 -
1.11
+++ NewsletterPublicationTreeItemRenderer.java 7 May 2008 05:58:37 -
1.12
@@ -12,7 +12,9 @@
import com.finalist.tree.TreeModel;
import com.finalist.util.module.ModuleUtil;
import com.finalist.newsletter.services.NewsletterServiceFactory;
+import com.finalist.newsletter.services.NewsletterPublicationService;
import com.finalist.newsletter.domain.Publication;
+import com.finalist.newsletter.ApplicationContextFactory;
public class NewsletterPublicationTreeItemRenderer implements
NavigationTreeItemRenderer {
@@ -44,7 +46,8 @@
boolean isPublished;
if (isSingleApplication) {
-Publication.STATUS status =
NewsletterServiceFactory.getNewsletterPublicationService().getStatus(parentNode.getNumber());
+NewsletterPublicationService publicationService =
(NewsletterPublicationService)
ApplicationContextFactory.getBean("publicationService");
+Publication.STATUS status =
publicationService.getStatus(parentNode.getNumber());
isPublished = Publication.STATUS.DELIVERED.equals(status);
}
else {
___
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 NewsletterPublicationTest.java NewsletterPublicationSendEmail.java UnsubscribeAction.java S
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory
james.mmbase.org:/tmp/cvs-serv27209/portlets-newsletter/src/java/com/finalist/newsletter/forms
Modified Files:
NewsletterPublicationTest.java
NewsletterPublicationSendEmail.java UnsubscribeAction.java
SubscribeAction.java NewsletterStatisticAction.java
NewsletterPublicationPublish.java
SubscriptioManagementAction.java
Log Message:
CMSC-818 move service initial to spring.
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-818
Index: NewsletterPublicationTest.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- NewsletterPublicationTest.java 22 Apr 2008 10:45:31 - 1.4
+++ NewsletterPublicationTest.java 7 May 2008 05:58:37 - 1.5
@@ -18,6 +18,7 @@
import com.finalist.cmsc.struts.MMBaseFormlessAction;
import com.finalist.newsletter.services.NewsletterPublicationService;
import com.finalist.newsletter.services.NewsletterServiceFactory;
+import com.finalist.newsletter.ApplicationContextFactory;
public class NewsletterPublicationTest extends MMBaseFormlessAction {
@@ -44,7 +45,7 @@
// }
// Thread publisher = new NewsletterPublisher(number);
// publisher.start();
- NewsletterPublicationService publicationService =
NewsletterServiceFactory.getNewsletterPublicationService();
+ NewsletterPublicationService publicationService =
(NewsletterPublicationService)
ApplicationContextFactory.getBean("publicationService");;
return mapping.findForward(SUCCESS);
}
Index: NewsletterPublicationSendEmail.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationSendEmail.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- NewsletterPublicationSendEmail.java 30 Apr 2008 07:30:10 - 1.4
+++ NewsletterPublicationSendEmail.java 7 May 2008 05:58:37 - 1.5
@@ -20,6 +20,7 @@
import com.finalist.newsletter.services.NewsletterServiceFactory;
import com.finalist.newsletter.util.NewsletterPublicationUtil;
import com.finalist.newsletter.util.NewsletterUtil;
+import com.finalist.newsletter.ApplicationContextFactory;
public class NewsletterPublicationSendEmail extends MMBaseFormlessAction {
@@ -43,7 +44,7 @@
if (isSendAction(request)) {
String email = getParameter(request, "email");
String mimeType = request.getParameter("mimetype");
- NewsletterPublicationService publicationService =
NewsletterServiceFactory.getNewsletterPublicationService();
+ NewsletterPublicationService publicationService =
(NewsletterPublicationService)
ApplicationContextFactory.getBean("publicationService");;
publicationService.deliver(number,email,mimeType);
return mapping.findForward(SUCCESS);
}
Index: UnsubscribeAction.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/UnsubscribeAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- UnsubscribeAction.java 6 May 2008 12:54:33 - 1.1
+++ UnsubscribeAction.java 7 May 2008 05:58:37 - 1.2
@@ -12,6 +12,7 @@
import com.finalist.newsletter.services.NewsletterServiceFactory;
import com.finalist.newsletter.services.NewsletterSubscriptionServices;
+import com.finalist.newsletter.ApplicationContextFactory;
public class UnsubscribeAction extends Action {
@@ -19,16 +20,20 @@
private static final String ACTION_REMOVE = "remove";
+ NewsletterSubscriptionServices service ;
+
+
+
@Override
public ActionForward execute(ActionMapping mapping, ActionForm form,
HttpServletRequest request,
HttpServletResponse response) throws Exception
{
-
+ service = (NewsletterSubscriptionServices)
ApplicationContextFactory.getBean("subscriptionServices");
log.debug("Excute unsubscribe");
int userId = Integer.parseInt(request.getParameter("userId"));
int newsletterId =
Integer.parseInt(request.getParameter("newsletterId"));
if (isRemoveAction(request)) {
- NewsletterSubscriptionServices service =
NewsletterServiceFactory.getNewsletterSubscriptionServices();
+
service.modifyStauts(userId, newsletterId, "INACTIVE");
[MMBASE CVS] contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community project.xml
Update of
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community
In directory
james.mmbase.org:/tmp/cvs-serv23399/demo.cmscontainer.org/war-community
Modified Files:
project.xml
Log Message:
CMSC-888 fix.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community
See also: http://www.mmbase.org/jira/browse/CMSC-888
Index: project.xml
===
RCS file:
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community/project.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- project.xml 28 Apr 2008 08:37:57 - 1.9
+++ project.xml 7 May 2008 02:55:01 - 1.10
@@ -177,14 +177,20 @@
-
+
finalist
cmsc-portlets-newsletter
${cmscportlets.version}
mmbase-module
-
+
+
+ com.thoughtworks.xstream
+ xstream
+ 1.2
+ jar
+
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/resources newsletter-module.properties
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources In directory james.mmbase.org:/tmp/cvs-serv23236/portlets-newsletter/resources Modified Files: newsletter-module.properties Log Message: CMSC-888 fix. See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources See also: http://www.mmbase.org/jira/browse/CMSC-888 Index: newsletter-module.properties === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter-module.properties,v retrieving revision 1.7 retrieving revision 1.8 diff -u -b -r1.7 -r1.8 --- newsletter-module.properties5 May 2008 02:40:11 - 1.7 +++ newsletter-module.properties7 May 2008 02:54:40 - 1.8 @@ -13,6 +13,8 @@ globalstats.total.themes = Total number of additional themes globalstats.total.publications = Total number of publications globalstats.total.subscriptions = Total number of subscriptions +globalstats.total.sentsubscriptions = Total number of sent subscriptions +globalstats.total.unsubscribeselect = Unsubscribe selected subscriptions newsletteroverview.title = Newsletter subscription overview newsletteroverview.newsletter = Newsletter @@ -35,6 +37,7 @@ subscriptiondetail.title = Subscription details for user subscriptiondetail.username = Username +subscriptiondetail.fullname = Fullname subscriptiondetail.emailaddress = Email address subscriptiondetail.status = Subscription status subscriptiondetail.mimetype = Preferred mimetype @@ -43,4 +46,5 @@ subscriptiondetail.link.pause = Pause all subscriptions for this user subscriptiondetail.link.resume = Resume all subscriptions for this user subscriptiondetail.link.unsubscribe = Unsubscribe this user from all newsletters and themes +subscriptiondetail.link.exportselect = Export selected subscription data subscriptiondetail.link.terminate = Terminate this users newsletter account \ No newline at end of file ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF spring-newsletter.xml
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF In directory james.mmbase.org:/tmp/cvs-serv23236/portlets-newsletter/src/webapp/WEB-INF Modified Files: spring-newsletter.xml Log Message: CMSC-888 fix. See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF See also: http://www.mmbase.org/jira/browse/CMSC-888 Index: spring-newsletter.xml === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/spring-newsletter.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- spring-newsletter.xml 5 May 2008 02:40:11 - 1.2 +++ spring-newsletter.xml 7 May 2008 02:54:40 - 1.3 @@ -27,16 +27,19 @@ - - + + + + ___ 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 NewsletterSubscriptionCAOImpl.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
In directory
james.mmbase.org:/tmp/cvs-serv23236/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
Modified Files:
NewsletterSubscriptionCAOImpl.java
Log Message:
CMSC-888 fix.
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-888
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.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- NewsletterSubscriptionCAOImpl.java 5 May 2008 02:40:11 - 1.17
+++ NewsletterSubscriptionCAOImpl.java 7 May 2008 02:54:40 - 1.18
@@ -8,12 +8,14 @@
import com.finalist.newsletter.domain.Term;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.commons.lang.StringUtils;
import org.mmbase.bridge.*;
import org.mmbase.bridge.util.SearchUtil;
import org.mmbase.storage.search.Constraint;
import org.mmbase.storage.search.Step;
import static com.finalist.newsletter.util.NewsletterSubscriptionUtil.*;
+
import java.util.*;
public class NewsletterSubscriptionCAOImpl extends AbstractCAO implements
NewsletterSubscriptionCAO {
@@ -187,7 +189,6 @@
}
-
public void createSubscription(int userId, int newsletterId) {
log.debug("Create subscription user:" + userId + " newsletter:" +
newsletterId);
@@ -219,24 +220,26 @@
public void updateSubscription(Subscription subscription) {
Node node = cloud.getNode(subscription.getId());
- node.setStringValue("status",subscription.getStatus().toString());
- node.setDateValue("pausetill",subscription.getPausedTill());
+ node.setStringValue("status", subscription.getStatus().toString());
+ node.setDateValue("pausetill", subscription.getPausedTill());
node.commit();
}
- public List getSubscriptionByUserIdAndStatus(int
userId,STATUS status) {
+ public List getSubscriptionByUserIdAndStatus(int userId,
STATUS status) {
NodeManager recordManager = cloud.getNodeManager("subscriptionrecord");
Query query = recordManager.createQuery();
-
SearchUtil.addEqualConstraint(query,recordManager.getField("status"),status.toString());
-
SearchUtil.addEqualConstraint(query,recordManager.getField("subscriber"),Integer.toString(userId));
+ if (null != status) {
+ SearchUtil.addEqualConstraint(query,
recordManager.getField("status"), status.toString());
+ }
+ SearchUtil.addEqualConstraint(query,
recordManager.getField("subscriber"), Integer.toString(userId));
List subscriptions = query.getList();
List subs = new ArrayList();
- for(Node node :subscriptions){
+ for (Node node : subscriptions) {
subs.add(convertFromNode(node));
}
___
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 NewsletterServiceImpl.java NewsletterSubscriptionServicesImpl.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl
In directory
james.mmbase.org:/tmp/cvs-serv23236/portlets-newsletter/src/java/com/finalist/newsletter/services/impl
Modified Files:
NewsletterServiceImpl.java
NewsletterSubscriptionServicesImpl.java
Log Message:
CMSC-888 fix.
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-888
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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- NewsletterServiceImpl.java 5 May 2008 02:40:11 - 1.3
+++ NewsletterServiceImpl.java 7 May 2008 02:54:40 - 1.4
@@ -1,28 +1,39 @@
package com.finalist.newsletter.services.impl;
import java.util.List;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.ArrayList;
import com.finalist.newsletter.cao.NewsletterCAO;
+import com.finalist.newsletter.cao.NewsletterSubscriptionCAO;
import com.finalist.newsletter.domain.Newsletter;
+import com.finalist.newsletter.domain.Subscription;
import com.finalist.newsletter.services.NewsletterService;
+import com.finalist.newsletter.services.NewsletterSubscriptionServices;
import org.mmbase.bridge.NodeManager;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
public class NewsletterServiceImpl implements NewsletterService {
- NewsletterCAO newsletterCAO;
-
- public NewsletterServiceImpl() {
-
- }
+ private static Log log = LogFactory.getLog(NewsletterServiceImpl.class);
- public NewsletterServiceImpl(NewsletterCAO newsletterCAO) {
+ NewsletterCAO newsletterCAO;
+ NewsletterSubscriptionCAO subscriptionCAO;
+ NewsletterSubscriptionServices subscriptionServices;
+ public void setNewsletterCAO(NewsletterCAO newsletterCAO) {
this.newsletterCAO = newsletterCAO;
}
- public void setNewsletterCAO(NewsletterCAO newsletterCAO) {
+ public void setSubscriptionCAO(NewsletterSubscriptionCAO subscriptionCAO) {
+ this.subscriptionCAO = subscriptionCAO;
+ }
- this.newsletterCAO = newsletterCAO;
+ public void setSubscriptionServices(NewsletterSubscriptionServices
subscriptionServices) {
+ this.subscriptionServices = subscriptionServices;
}
public List getAllNewsletter() {
@@ -30,9 +41,14 @@
return newsletterCAO.getNewsletterByConstraint(null, null, null);
}
- public String getNewsletterName(int newsletterId) {
+ public String getNewsletterName(String newsletterId) {
+ String name = "";
+
+ if (StringUtils.isNotBlank(newsletterId)) {
+ name =
newsletterCAO.getNewsletterById(Integer.parseInt(newsletterId)).getTitle();
+ }
- return newsletterCAO.getNewsletterById(newsletterId).getTitle();
+ return name;
}
public int countAllNewsletters() {
@@ -44,6 +60,9 @@
}
public List getNewslettersByTitle(String title) {
+
+ log.debug(String.format("Get newsletter by title %s", title));
+
return newsletterCAO.getNewsletterByConstraint("title", "like", title);
}
@@ -52,5 +71,33 @@
return newsletterCAO.getNewsletterById(newsletterId);
}
+ public List getNewsletters(String subscriber, String title) {
+
+ log.debug(String.format("Get Newsletters by subscriber %s and title %s",
subscriber, title));
+
+ boolean sc = StringUtils.isNotBlank(subscriber);
+ boolean tc = StringUtils.isNotBlank(title);
+
+ if (sc && tc) {
+ return getAllNewsletterBySubscriberAndTitle(subscriber, title);
+ }
+ else if (sc && !tc) {
+ return getAllNewsletterBySubscriber(subscriber);
+ }
+ else if (tc) {
+ return getNewslettersByTitle(title);
+ }
+ else {
+ return getAllNewsletter();
+ }
+ }
+
+ private List getAllNewsletterBySubscriber(String subscriber) {
+ return null;
+ }
+
+ private List getAllNewsletterBySubscriberAndTitle(String
subscriber, String title) {
+ return null;
+ }
}
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.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- NewsletterSubscriptionServicesImpl.java 5 May 2008 02:40:11 -
1.12
+++ NewsletterSubscriptionServicesImpl.java 7 May 2008 02:54:40 -
1.13
@@ -4,6 +4,7 @@
import org.apache.commo
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services NewsletterService.java NewsletterSubscriptionServices.java NewsletterServiceFactory.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services
In directory
james.mmbase.org:/tmp/cvs-serv23236/portlets-newsletter/src/java/com/finalist/newsletter/services
Modified Files:
NewsletterService.java NewsletterSubscriptionServices.java
NewsletterServiceFactory.java
Log Message:
CMSC-888 fix.
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-888
Index: NewsletterService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/NewsletterService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- NewsletterService.java 5 May 2008 02:40:11 - 1.3
+++ NewsletterService.java 7 May 2008 02:54:40 - 1.4
@@ -8,7 +8,7 @@
public List getAllNewsletter();
- public String getNewsletterName(int newsletterId);
+ public String getNewsletterName(String newsletterId);
public int countAllNewsletters();
@@ -17,4 +17,6 @@
public List getNewslettersByTitle(String title);
public Newsletter getNewsletterBySubscription(int id);
+
+ public List getNewsletters(String subscriber, String title);
}
Index: NewsletterSubscriptionServices.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/NewsletterSubscriptionServices.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- NewsletterSubscriptionServices.java 5 May 2008 02:40:11 - 1.9
+++ NewsletterSubscriptionServices.java 7 May 2008 02:54:40 - 1.10
@@ -1,21 +1,10 @@
package com.finalist.newsletter.services;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
-import org.mmbase.bridge.Cloud;
-import org.mmbase.bridge.Node;
-import org.mmbase.bridge.NodeList;
-import org.mmbase.bridge.NodeManager;
-import org.mmbase.bridge.NodeQuery;
-import org.mmbase.bridge.util.SearchUtil;
-import org.mmbase.cache.CachePolicy;
-
-import com.finalist.newsletter.cao.impl.NewsletterSubscriptionCAOImpl;
-import com.finalist.newsletter.domain.Newsletter;
import com.finalist.newsletter.domain.Subscription;
+import com.finalist.cmsc.services.community.person.Person;
+
+import java.util.List;
+import java.util.Set;
public interface NewsletterSubscriptionServices {
@@ -57,5 +46,15 @@
public List getAllSubscription();
- public List getSubscriptionsByNewsletterId(int i);
+ public List getSubscriptionsByNewsletterId(String i);
+
+ Set getSubscriptions(String newsletterId, String name, String
email);
+
+ public List getAllSubscribers();
+
+ public List getAllSubscribers(String name, String email);
+
+ public List getSubscriptionBySubscriber(String newsletterid);
+
+ public Subscription getSubscription(int sbId, int nId);
}
Index: NewsletterServiceFactory.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/NewsletterServiceFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- NewsletterServiceFactory.java 5 May 2008 02:40:11 - 1.7
+++ NewsletterServiceFactory.java 7 May 2008 02:54:40 - 1.8
@@ -30,7 +30,7 @@
public static NewsletterSubscriptionServices
getNewsletterSubscriptionServices() {
NewsletterSubscriptionCAO subscriptionCAO = new
NewsletterSubscriptionCAOImpl(cloudProvider.getCloud());
NewsletterSubscriptionServicesImpl newsletterSubscriptionServices = new
NewsletterSubscriptionServicesImpl();
- newsletterSubscriptionServices.setSubscriptinCAO(subscriptionCAO);
+ newsletterSubscriptionServices.setSubscriptionCAO(subscriptionCAO);
NewsletterCAO newsletterCAO = new
NewsletterCAOImpl(cloudProvider.getCloud());
newsletterSubscriptionServices.setNewsletterCAO(newsletterCAO);
return newsletterSubscriptionServices;
@@ -52,13 +52,6 @@
}
- 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()));
___
Cvs mailing list
Cvs@lists.mmbas
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms SubscriptionImportUploadForm.java SubscriptionImportExportAction.java NewsletterStatisticAc
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory
james.mmbase.org:/tmp/cvs-serv23236/portlets-newsletter/src/java/com/finalist/newsletter/forms
Modified Files:
SubscriptionImportExportAction.java
NewsletterStatisticAction.java
SubscriptioManagementAction.java
Added Files:
SubscriptionImportUploadForm.java
Log Message:
CMSC-888 fix.
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-888
SubscriptionImportUploadForm.java is new
Index: SubscriptionImportExportAction.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/SubscriptionImportExportAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- SubscriptionImportExportAction.java 5 May 2008 02:40:11 - 1.1
+++ SubscriptionImportExportAction.java 7 May 2008 02:54:40 - 1.2
@@ -3,7 +3,9 @@
import com.finalist.cmsc.services.community.person.Person;
import com.finalist.newsletter.domain.Subscription;
import com.finalist.newsletter.domain.Term;
+import com.finalist.newsletter.domain.Newsletter;
import com.finalist.newsletter.services.NewsletterSubscriptionServices;
+import com.finalist.newsletter.services.NewsletterService;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver;
import org.apache.commons.logging.Log;
@@ -11,6 +13,7 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
+import org.apache.struts.upload.FormFile;
import org.springframework.web.struts.DispatchActionSupport;
import javax.servlet.http.HttpServletRequest;
@@ -24,10 +27,12 @@
private static Log log =
LogFactory.getLog(SubscriptionImportExportAction.class);
NewsletterSubscriptionServices subscriptionServices;
+ NewsletterService newsletterService;
protected void onInit() {
super.onInit();
- subscriptionServices = (NewsletterSubscriptionServices)
getWebApplicationContext().getBean("newsletterSubscriptionServices");
+ subscriptionServices = (NewsletterSubscriptionServices)
getWebApplicationContext().getBean("subscriptionServices");
+ newsletterService = (NewsletterService)
getWebApplicationContext().getBean("newsletterServices");
}
public ActionForward export(ActionMapping mapping, ActionForm form,
@@ -47,7 +52,14 @@
else if ("newsletter".equals(type)) {
String[] newsletterIds = request.getParameterValues("newsletterIds");
for (String newsletterid : newsletterIds) {
-List s =
subscriptionServices.getSubscriptionsByNewsletterId(Integer.parseInt(newsletterid));
+List s =
subscriptionServices.getSubscriptionsByNewsletterId(newsletterid);
+subscriptions.addAll(s);
+ }
+ }
+ else if ("person".equals(type)) {
+ String[] newsletterIds = request.getParameterValues("userId");
+ for (String newsletterid : newsletterIds) {
+List s =
subscriptionServices.getSubscriptionBySubscriber(newsletterid);
subscriptions.addAll(s);
}
}
@@ -56,7 +68,7 @@
}
- String xml = convertToXML(subscriptions);
+ String xml = getXStream().toXML(subscriptions);
byte[] bytes = xml.getBytes();
response.setContentType("text/xml");
@@ -73,6 +85,40 @@
return mapping.findForward(null);
}
+
+ public ActionForward importsubscription(ActionMapping mapping, ActionForm
form,
+ HttpServletRequest request,
HttpServletResponse response)
+ throws IOException {
+ SubscriptionImportUploadForm myForm = (SubscriptionImportUploadForm)
form;
+
+ FormFile myFile = myForm.getDatafile();
+ byte[] fileData = myFile.getFileData();
+
+ String xml = new String(fileData);
+
+ List subscriptionList = (List)
getXStream().fromXML(xml);
+
+ for(Subscription subscription : subscriptionList){
+ Person subscrier = subscription.getSubscriber();
+int sbId = subscrier.getId().intValue();
+int nId = subscription.getNewsletter().getId();
+
+ if(null==subscriptionServices.getSubscription(sbId,nId)){
+
+
+
+log.debug(String.format("try to import user %s's subscription of
%s which is not exist",sbId,nId));
+
+subscriptionServices.addNewRecord(sbId, nId);
+ }
+ }
+
+ return mapping.findForward("import_success");
+ }
+
+
+
+
private String convertToXML(List subscriptions) {
String xml;
XStream xstream = new XStream(new DomDriver());
@@ -83,4 +129,12 @@
xml = xstream.to
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter ApplicationContextFactory.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter
In directory
james.mmbase.org:/tmp/cvs-serv23236/portlets-newsletter/src/java/com/finalist/newsletter
Modified Files:
ApplicationContextFactory.java
Log Message:
CMSC-888 fix.
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-888
Index: ApplicationContextFactory.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/ApplicationContextFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ApplicationContextFactory.java 25 Apr 2008 17:59:57 - 1.1
+++ ApplicationContextFactory.java 7 May 2008 02:54:40 - 1.2
@@ -58,5 +58,8 @@
init(context);
}
+ public static Object getBean(String name){
+ return getApplicationContext().getBean(name);
+ }
}
\ 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/java/com/finalist/newsletter/domain Newsletter.java Subscription.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/domain
In directory
james.mmbase.org:/tmp/cvs-serv23236/portlets-newsletter/src/java/com/finalist/newsletter/domain
Modified Files:
Newsletter.java Subscription.java
Log Message:
CMSC-888 fix.
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-888
Index: Newsletter.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/domain/Newsletter.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- Newsletter.java 30 Apr 2008 07:30:10 - 1.10
+++ Newsletter.java 7 May 2008 02:54:40 - 1.11
@@ -127,4 +127,25 @@
public void setTxtempty(String txtempty) {
this.txtempty = txtempty;
}
+
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+
+ Newsletter that = (Newsletter) o;
+
+ if (id != that.id) {
+ return false;
+ }
+
+ return true;
+ }
+
+ public int hashCode() {
+ return id;
+ }
}
Index: Subscription.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/domain/Subscription.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- Subscription.java 3 May 2008 14:40:59 - 1.9
+++ Subscription.java 7 May 2008 02:54:40 - 1.10
@@ -110,4 +110,25 @@
public void setPausedTill(Date pausedTill) {
this.pausedTill = pausedTill;
}
+
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+
+ Subscription that = (Subscription) o;
+
+ if (newesletterId != null ? !newesletterId.equals(that.newesletterId) :
that.newesletterId != null) {
+ return false;
+ }
+
+ return true;
+ }
+
+ public int hashCode() {
+ return 31 * (newesletterId != null ? newesletterId.hashCode() : 0);
+ }
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module import.jsp report_newsletter_subscriptions.jsp report_subscriber_subscriptions.jsp report_ove
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
In directory
james.mmbase.org:/tmp/cvs-serv23236/portlets-newsletter/src/webapp/editors/newsletter/module
Modified Files:
report_newsletter_subscriptions.jsp
report_subscriber_subscriptions.jsp report_overview.jsp
report_newsletter_list.jsp report_subscriber_list.jsp
Added Files:
import.jsp
Log Message:
CMSC-888 fix.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
See also: http://www.mmbase.org/jira/browse/CMSC-888
import.jsp is new
Index: report_newsletter_subscriptions.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_newsletter_subscriptions.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- report_newsletter_subscriptions.jsp 5 May 2008 02:40:11 - 1.3
+++ report_newsletter_subscriptions.jsp 7 May 2008 02:54:39 - 1.4
@@ -18,16 +18,22 @@
-
+
-
-
+
+
+
+
+
+
+
+
+
- Title
+
-
+
@@ -44,18 +50,20 @@
-
-
+
+
-
-
+
+
+
+
- user name
- full name
- email
+
+
+
<[EMAIL PROTECTED] id="results"
type="java.util.List"--%>
@@ -63,7 +71,9 @@
- ${result.username}
+
+${result.email}
+
${result.fullname}
${result.email}
@@ -73,18 +83,36 @@
<%@ include file="pager_index.jsp" %>
-
-
-
-
-
-
+
+"/>
+
+ function exportsubscription() {
+ var subscriptions = document.getElementsByName('subscriptionId');
+ var hasSelection = false;
+ for (var i = 0; i < subscriptions.length; i ++) {
+ if (subscriptions[i].checked) {
+hasSelection = true;
+break;
+ }
+ }
+
+ if (hasSelection) {
+ document.forms['operationform'].submit();
+ }
+ else {
+ alert("You have to select at least one item");
+ }
+
+ return false;
+ }
+
+
Index: report_subscriber_subscriptions.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_subscriber_subscriptions.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- report_subscriber_subscriptions.jsp 21 Jan 2008 12:27:49 - 1.3
+++ report_subscriber_subscriptions.jsp 7 May 2008 02:54:39 - 1.4
@@ -1,67 +1,86 @@
<[EMAIL PROTECTED] file="globals.jsp" %>
-
-
-
-
-
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
+<%@ taglib uri="http://finalist.com/cmsc"; prefix="cmsc" %>
+<%@ taglib uri="http://jsptags.com/tags/navigation/pager"; prefix="pg" %>
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+ Title
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <[EMAIL PROTECTED] id="results"
type="java.util.List"--%>
+
+
-
+
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person PersonHibernateService.java PersonService.java
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
In directory
james.mmbase.org:/tmp/cvs-serv23218/community/src/java/com/finalist/cmsc/services/community/person
Modified Files:
PersonHibernateService.java PersonService.java
Log Message:
CMSC-888 fix.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
See also: http://www.mmbase.org/jira/browse/CMSC-888
Index: PersonHibernateService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonHibernateService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- PersonHibernateService.java 31 Mar 2008 19:49:02 - 1.4
+++ PersonHibernateService.java 7 May 2008 02:54:19 - 1.5
@@ -16,6 +16,7 @@
import org.hibernate.Criteria;
import org.hibernate.criterion.Example;
import org.hibernate.criterion.Restrictions;
+import org.hibernate.criterion.MatchMode;
import org.springframework.beans.factory.annotation.Required;
import org.springframework.transaction.annotation.Transactional;
@@ -53,6 +54,23 @@
/** [EMAIL PROTECTED] */
@Transactional
+ public List getLikePersons(Person example) {
+ if (example == null) {
+ return Collections.emptyList();
+ }
+
+ Example userExample = Example.create(example).
+enableLike(MatchMode.ANYWHERE).
+excludeZeroes().
+ignoreCase();
+ List personList =
getSession().createCriteria(Person.class).add(userExample).list();
+ return personList;
+ }
+
+ /**
+* [EMAIL PROTECTED]
+*/
+ @Transactional
public Person createPerson(String firstName, String infix, String lastName,
Long authenticationId) {
if (firstName == null) {
throw new IllegalArgumentException("Firstname is null. ");
@@ -82,6 +100,10 @@
getSession().saveOrUpdate(person);
getSession().flush();
}
+@Transactional
+ public List getAllPersons() {
+ return getSession().createCriteria(Person.class).list();
+ }
/** [EMAIL PROTECTED] */
@Transactional
Index: PersonService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- PersonService.java 31 Mar 2008 19:49:02 - 1.3
+++ PersonService.java 7 May 2008 02:54:19 - 1.4
@@ -35,6 +35,16 @@
*/
List getPersons(Person example);
+ /**
+* Get a list of matching persons that like the given example. The fields
+* that are set on the example Person are the criteria for the search.
+*
+* @param example
+* the example person
+* @return a list of persons that like the given example.
+*/
+ List getLikePersons(Person example);
+
Person getPersonByAuthenticationId(Long authenticationId);
Person createPerson(String firstName, String infix, String lastName, Long
authenticationId);
@@ -44,6 +54,8 @@
*/
void updatePerson(Person person);
+ List getAllPersons();
+
boolean deletePersonByAuthenticationId(Long userId);
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance/staging publishnode.jsp
Update of
/var/cvs/contributions/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance/staging
In directory
james.mmbase.org:/tmp/cvs-serv11599/cmsc/maintenance/src/webapp/editors/maintenance/staging
Modified Files:
Tag: b1_4
publishnode.jsp
Log Message:
PublishManager.createNode was using wrong destinationCloud number
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance/staging
Index: publishnode.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance/staging/publishnode.jsp,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -b -r1.2 -r1.2.4.1
--- publishnode.jsp 5 Jun 2007 12:51:05 - 1.2
+++ publishnode.jsp 6 May 2008 20:12:19 - 1.2.4.1
@@ -26,11 +26,10 @@
<%
String cloud1 = request.getParameter("cloud1");
if (cloud1 != null && !"".equals(cloud1)) {
-Cloud remoteCloud = CloudManager.getCloud(cloud, cloud1);
CloudInfo localCloudInfo = CloudInfo.getCloudInfo(cloud);
-CloudInfo remoteCloudInfo = CloudInfo.getCloudInfo(remoteCloud);
-
if (!PublishManager.isPublished(localCloudInfo, node)) {
+ int remoteCloudNumber =
org.mmbase.remotepublishing.builders.PublishingQueueBuilder.getCloudNumber(cloud1);
+ CloudInfo remoteCloudInfo =
CloudInfo.getCloudInfo(remoteCloudNumber);
PublishManager.createNodeAndRelations(localCloudInfo, node,
remoteCloudInfo);
}
else {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance/staging publishnode.jsp
Update of
/var/cvs/contributions/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance/staging
In directory
james.mmbase.org:/tmp/cvs-serv11578/cmsc/maintenance/src/webapp/editors/maintenance/staging
Modified Files:
Tag: v1_3
publishnode.jsp
Log Message:
PublishManager.createNode was using wrong destinationCloud number
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance/staging
Index: publishnode.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance/staging/publishnode.jsp,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -b -r1.2 -r1.2.2.1
--- publishnode.jsp 5 Jun 2007 12:51:05 - 1.2
+++ publishnode.jsp 6 May 2008 20:12:13 - 1.2.2.1
@@ -26,11 +26,10 @@
<%
String cloud1 = request.getParameter("cloud1");
if (cloud1 != null && !"".equals(cloud1)) {
-Cloud remoteCloud = CloudManager.getCloud(cloud, cloud1);
CloudInfo localCloudInfo = CloudInfo.getCloudInfo(cloud);
-CloudInfo remoteCloudInfo = CloudInfo.getCloudInfo(remoteCloud);
-
if (!PublishManager.isPublished(localCloudInfo, node)) {
+ int remoteCloudNumber =
org.mmbase.remotepublishing.builders.PublishingQueueBuilder.getCloudNumber(cloud1);
+ CloudInfo remoteCloudInfo =
CloudInfo.getCloudInfo(remoteCloudNumber);
PublishManager.createNodeAndRelations(localCloudInfo, node,
remoteCloudInfo);
}
else {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance/staging publishnode.jsp
Update of
/var/cvs/contributions/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance/staging
In directory
james.mmbase.org:/tmp/cvs-serv11556/cmsc/maintenance/src/webapp/editors/maintenance/staging
Modified Files:
publishnode.jsp
Log Message:
PublishManager.createNode was using wrong destinationCloud number
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance/staging
Index: publishnode.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance/staging/publishnode.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- publishnode.jsp 5 Jun 2007 12:51:05 - 1.2
+++ publishnode.jsp 6 May 2008 20:12:07 - 1.3
@@ -26,11 +26,10 @@
<%
String cloud1 = request.getParameter("cloud1");
if (cloud1 != null && !"".equals(cloud1)) {
-Cloud remoteCloud = CloudManager.getCloud(cloud, cloud1);
CloudInfo localCloudInfo = CloudInfo.getCloudInfo(cloud);
-CloudInfo remoteCloudInfo = CloudInfo.getCloudInfo(remoteCloud);
-
if (!PublishManager.isPublished(localCloudInfo, node)) {
+ int remoteCloudNumber =
org.mmbase.remotepublishing.builders.PublishingQueueBuilder.getCloudNumber(cloud1);
+ CloudInfo remoteCloudInfo =
CloudInfo.getCloudInfo(remoteCloudNumber);
PublishManager.createNodeAndRelations(localCloudInfo, node,
remoteCloudInfo);
}
else {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] Tag Heuer replicas better than originals
A Breitling watch is a statement not just of wealth, but of sophistication... it's a way to show the world that you are a man in charge of your life and that you know exactly what you want. Surely, among those things you do want is a bigger budget. So, why not kill two birds with one stone? Getting a replica Breitling wristwatch and keeping your budget practically untouched! http://www.deoospl.com/ Thanks to Prestige Replicas it is now possible! With an astonishing collection of replica Breitling timepieces at rock bottom prices, Selissia will make the delights of quality watches lovers. It offers excellent quality timepieces at unsurpassed prices; a privacy-assured guarantee, incomparable customer service, and what's better: 15% off when you buy two watches! http://www.deoospl.com/ ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/storage/implementation/database DatabaseStorageManager.java
Update of /var/cvs/src/org/mmbase/storage/implementation/database
In directory
james.mmbase.org:/tmp/cvs-serv4946/src/org/mmbase/storage/implementation/database
Modified Files:
DatabaseStorageManager.java
Log Message:
getBytes should start at 1, not 0. Also adapted some logging.
See also:
http://cvs.mmbase.org/viewcvs/src/org/mmbase/storage/implementation/database
Index: DatabaseStorageManager.java
===
RCS file:
/var/cvs/src/org/mmbase/storage/implementation/database/DatabaseStorageManager.java,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -b -r1.192 -r1.193
--- DatabaseStorageManager.java 11 Apr 2008 15:13:38 - 1.192
+++ DatabaseStorageManager.java 6 May 2008 15:27:40 - 1.193
@@ -32,7 +32,7 @@
*
* @author Pierre van Rooden
* @since MMBase-1.7
- * @version $Id: DatabaseStorageManager.java,v 1.192 2008/04/11 15:13:38
nklasens Exp $
+ * @version $Id: DatabaseStorageManager.java,v 1.193 2008/05/06 15:27:40
pierre Exp $
*/
public class DatabaseStorageManager implements StorageManager {
@@ -2922,15 +2922,18 @@
if (foundColumn) {
Blob b =
getBlobFromDatabase(node, field, false);
-byte[] bytes = b.getBytes(0L,
(int) b.length());
+int length = (int) b.length();
+if (length > 0) {
+ byte[] bytes =
b.getBytes(1L, length);
node.setValue(fieldName,
bytes);
storeBinaryAsFile(node, field);
node.storeValue(fieldName,
MMObjectNode.VALUE_SHORTED); // remove to avoid filling node-cache with lots of
handles and cause out-of-memory
// node.commit(); no need,
because we only changed blob (so no database updates are done)
result++;
+ log.service("( " + result +
") Found " + length + " bytes for " + node.getNumber() + " in database while
configured to be on disk. Stored to " + storeFile);
+}
fromDatabase++;
-log.service("( " + result + ")
Found bytes in database while configured to be on disk. Stored to " +
storeFile);
}
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/editors/evenementen evenement.jsp evenementen.jsp
Update of /var/cvs/contributions/natmm/templates/editors/evenementen
In directory james.mmbase.org:/tmp/cvs-serv3802/templates/editors/evenementen
Modified Files:
evenement.jsp evenementen.jsp
Log Message:
NMCMS-478
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/editors/evenementen
See also: http://www.mmbase.org/jira/browse/NMCMS-478
Index: evenement.jsp
===
RCS file:
/var/cvs/contributions/natmm/templates/editors/evenementen/evenement.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- evenement.jsp 5 May 2008 10:18:35 - 1.7
+++ evenement.jsp 6 May 2008 14:40:50 - 1.8
@@ -119,13 +119,16 @@
}
return false;
}
+
var cancelClick = false;
-function doDelete(prompt) {
+function doDelete(thisObject,prompt) {
var conf;
if (prompt && prompt!="") {
conf = confirm(prompt);
} else conf=true;
cancelClick=true;
+
+if (conf) showMessage(thisObject,'Verwijder selectie');
return conf;
}
@@ -139,6 +142,20 @@
}
}
+ var clickedButton = '';
+ function showMessage(obj,fAction){
+ string = 'theTarget = document.getElementById("message");';
+ eval(string);
+ if(theTarget != null){
+theTarget.innerHTML = 'Een moment geduld a.u.b.';
+ }
+ clickedButton=obj;
+ clickedButton.disabled=true;
+
+ document.getElementById("formAction").value= fAction;
+ document.forms[0].submit();
+ }
+
<%
@@ -154,9 +171,12 @@
// the focus="name" works together with the onkeypress for the name field, to
make sure the form is only posted once on [ENTER]-key
%>
+
+
+
);javascript:resizeBlocks();"
onResize="javascript:resizeBlocks();">
Nieuwe activiteit
@@ -167,6 +187,12 @@
Activiteit wijzigen
+
+
+
+
+ Â
+
Naam
@@ -199,9 +225,9 @@
-
- Â
-Â
-Â
+ Â
+Â
+Â
<% boolean bShowPastDates = false;
@@ -282,13 +308,13 @@
-
-
+
+
-
+
-
+
Overige onderdelen
@@ -308,9 +334,9 @@
- Â
- Â
-
+ Â
+ Â
+
Index: evenementen.jsp
===
RCS file:
/var/cvs/contributions/natmm/templates/editors/evenementen/evenementen.jsp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- evenementen.jsp 6 May 2008 08:52:55 - 1.16
+++ evenementen.jsp 6 May 2008 14:40:50 - 1.17
@@ -458,7 +458,7 @@
<% if((isAdmin||isChiefEditor)&&actionId.indexOf("print")==-1) { %>
-"/>/media/new.gif" border='0' alt='Maak een nieuwe
activiteit' />
+"/>/media/new.gif" border='0' alt='Maak een nieuwe
activiteit' onclick="javascript:showMessage(this,'Een moment geduld
a.u.b.');"/>
<% } %>
<%= soortId.toUpperCase()
%>
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util NewsletterUtil.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
In directory
james.mmbase.org:/tmp/cvs-serv2814/portlets-newsletter/src/java/com/finalist/newsletter/util
Modified Files:
NewsletterUtil.java
Log Message:
CMSC-735 Signout link in the footer
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-735
Index: NewsletterUtil.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterUtil.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- NewsletterUtil.java 6 May 2008 02:56:11 - 1.22
+++ NewsletterUtil.java 6 May 2008 14:02:53 - 1.23
@@ -12,6 +12,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.commons.lang.StringUtils;
import org.mmbase.bridge.Cloud;
import org.mmbase.bridge.Node;
import org.mmbase.bridge.NodeList;
@@ -23,7 +24,9 @@
import org.mmbase.storage.search.Step;
import com.finalist.cmsc.beans.om.ContentElement;
+import com.finalist.cmsc.mmbase.PropertiesUtil;
import com.finalist.newsletter.domain.Term;
+import com.finalist.newsletter.NewsletterSendFailException;
import com.finalist.portlets.newsletter.NewsletterContentPortlet;
public abstract class NewsletterUtil {
@@ -133,6 +136,7 @@
}
return (null);
}
+
public static List getArticlesByNewsletter(String
termNumbers, int offset, int elementsPerPage, String orderBy, String direction)
{
String[] numbers = termNumbers.split(",");
@@ -143,8 +147,9 @@
if (sort.size() == 0) {
return (null);
}
- return getArticles( offset, elementsPerPage, orderBy,
direction,sort);
+ return getArticles(offset, elementsPerPage, orderBy, direction, sort);
}
+
public static List getArticlesByNewsletter(int
newsletterNumber, int offset, int elementsPerPage, String orderBy, String
direction) {
if (newsletterNumber > 0) {
Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
@@ -160,12 +165,12 @@
if (sort.size() == 0) {
return (null);
}
- return getArticles( offset, elementsPerPage, orderBy,
direction,sort);
+ return getArticles(offset, elementsPerPage, orderBy, direction, sort);
}
return (null);
}
- public static List getArticles(int offset, int
elementsPerPage, String orderBy, String direction,SortedSet sort) {
+ public static List getArticles(int offset, int
elementsPerPage, String orderBy, String direction, SortedSet sort) {
List articles = new ArrayList();
Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
@@ -190,6 +195,7 @@
return (articles);
}
+
public static int countArticles(SortedSet sort) {
Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
@@ -203,6 +209,7 @@
return Queries.count(query);
}
+
public static int countArticlesByNewsletter(String termNumbers) {
String[] numbers = termNumbers.split(",");
@@ -302,6 +309,7 @@
}
return (false);
}
+
public static boolean isPaused(Node newsletterNode) {
if (newsletterNode != null) {
boolean isPaused = newsletterNode.getBooleanValue("paused");
@@ -310,6 +318,7 @@
}
return (false);
}
+
public static void pauseNewsletter(int number) {
if (number > 0) {
Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
@@ -361,4 +370,19 @@
}
+ public static 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;
+ }
+
}
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm .cvsignore
Update of /var/cvs/contributions/natmm In directory james.mmbase.org:/tmp/cvs-serv2225 Modified Files: .cvsignore Log Message: Never commit the bin directory. See also: http://cvs.mmbase.org/viewcvs/contributions/natmm Index: .cvsignore === RCS file: /var/cvs/contributions/natmm/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- .cvsignore 6 Dec 2006 09:30:21 - 1.2 +++ .cvsignore 6 May 2008 13:35:44 - 1.3 @@ -1,3 +1,4 @@ +bin build build.log mmbase ___ 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 UnsubscribePortlet.java
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter In directory james.mmbase.org:/tmp/cvs-serv1018/portlets-newsletter/src/java/com/finalist/portlets/newsletter Added Files: UnsubscribePortlet.java Log Message: CMSC-735 Signout link in the footer 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-735 UnsubscribePortlet.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/webapp/editors/newsletter/unsubscription finish.jsp delete.jsp canel.jsp
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/unsubscription In directory james.mmbase.org:/tmp/cvs-serv1018/portlets-newsletter/src/webapp/editors/newsletter/unsubscription Added Files: finish.jsp delete.jsp canel.jsp Log Message: CMSC-735 Signout link in the footer See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/unsubscription See also: http://www.mmbase.org/jira/browse/CMSC-735 finish.jsp is new delete.jsp is new canel.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/webapp/WEB-INF struts-newsletter.xml portlet-newsletter.xml
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF In directory james.mmbase.org:/tmp/cvs-serv1018/portlets-newsletter/src/webapp/WEB-INF Modified Files: struts-newsletter.xml portlet-newsletter.xml Log Message: CMSC-735 Signout link in the footer See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF See also: http://www.mmbase.org/jira/browse/CMSC-735 Index: struts-newsletter.xml === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/struts-newsletter.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -b -r1.5 -r1.6 --- struts-newsletter.xml 5 May 2008 02:40:11 - 1.5 +++ struts-newsletter.xml 6 May 2008 12:54:33 - 1.6 @@ -6,10 +6,15 @@ + + + + + - - + + + + + + + + + + + + Index: portlet-newsletter.xml === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/portlet-newsletter.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- portlet-newsletter.xml 25 Nov 2007 18:24:05 - 1.2 +++ portlet-newsletter.xml 6 May 2008 12:54:33 - 1.3 @@ -76,5 +76,35 @@ newslettersubscription - + + a unsubscribeportlet portlet + unsubscribeportlet + unsubscribeportlet Content Portlet + + com.finalist.portlets.newsletter.UnsubscribePortlet + + + template.edit_defaults + unsubscribe/unsubscribe.jsp + + + template.help + unsubscribe/unsubscribe.jsp + + + text/html + VIEW + HELP + EDIT_DEFAULTS + DELETE + + en + nl + portlets-unsubscribe + + unsubscribe Portlet + unsubscribe + unsubscribe + + \ No newline at end of file ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/view/newsletter/unsubscribe unsubscribe.jsp
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/view/newsletter/unsubscribe In directory james.mmbase.org:/tmp/cvs-serv1018/portlets-newsletter/src/webapp/WEB-INF/templates/view/newsletter/unsubscribe Added Files: unsubscribe.jsp Log Message: CMSC-735 Signout link in the footer See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/view/newsletter/unsubscribe See also: http://www.mmbase.org/jira/browse/CMSC-735 unsubscribe.jsp is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/resources newsletter.properties
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources In directory james.mmbase.org:/tmp/cvs-serv1018/portlets-newsletter/resources Modified Files: newsletter.properties Log Message: CMSC-735 Signout link in the footer See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources See also: http://www.mmbase.org/jira/browse/CMSC-735 Index: newsletter.properties === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter.properties,v retrieving revision 1.14 retrieving revision 1.15 diff -u -b -r1.14 -r1.15 --- newsletter.properties 30 Apr 2008 08:21:10 - 1.14 +++ newsletter.properties 6 May 2008 12:54:33 - 1.15 @@ -74,3 +74,11 @@ newspubinfo.satatus=Status newspubinfo.notsend=Not send yet newspubinfo.hassend=Has send \ No newline at end of file + +unsubscribe.page.canel=You canel unsubscribe! +unsubscribe.page.finish=You finish unsubscribe! +unsubscribe.page.question=Do you want unsubscribe the newsletter? +unsubscribe.yes= yes +unsubscribe.no= no +unsubscribe.link=Unsubscribe Link + ___ 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 UnsubscribeAction.java
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms In directory james.mmbase.org:/tmp/cvs-serv1018/portlets-newsletter/src/java/com/finalist/newsletter/forms Added Files: UnsubscribeAction.java Log Message: CMSC-735 Signout link in the footer 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-735 UnsubscribeAction.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/webapp/WEB-INF/templates/view/newsletter/unsubscribe - New directory
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/view/newsletter/unsubscribe In directory james.mmbase.org:/tmp/cvs-serv970/portlets-newsletter/src/webapp/WEB-INF/templates/view/newsletter/unsubscribe Log Message: Directory /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/view/newsletter/unsubscribe added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/view/newsletter/unsubscribe ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/forms ConverseAction.java ConverseForm.java FetchDataAction.java InitAction.java
Update of /var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/forms In directory james.mmbase.org:/tmp/cvs-serv29513/src/java/com/finalist/cmsc/dataconversion/forms Added Files: ConverseAction.java ConverseForm.java FetchDataAction.java InitAction.java Log Message: Add new module data conversion See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/forms ConverseAction.java is new ConverseForm.java is new FetchDataAction.java is new InitAction.java is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion/src/webapp/editors/dataconversion fetchdata.jsp globals.jsp main.jsp succeed.jsp
Update of /var/cvs/contributions/CMSContainer_Modules/dataconversion/src/webapp/editors/dataconversion In directory james.mmbase.org:/tmp/cvs-serv29513/src/webapp/editors/dataconversion Added Files: fetchdata.jsp globals.jsp main.jsp succeed.jsp Log Message: Add new module data conversion See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion/src/webapp/editors/dataconversion fetchdata.jsp is new globals.jsp is new main.jsp is new succeed.jsp is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion/src/webapp/WEB-INF struts-dataconversion.xml
Update of /var/cvs/contributions/CMSContainer_Modules/dataconversion/src/webapp/WEB-INF In directory james.mmbase.org:/tmp/cvs-serv29513/src/webapp/WEB-INF Added Files: struts-dataconversion.xml Log Message: Add new module data conversion See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion/src/webapp/WEB-INF struts-dataconversion.xml is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion/src/java import.xml
Update of /var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java In directory james.mmbase.org:/tmp/cvs-serv29513/src/java Added Files: import.xml Log Message: Add new module data conversion See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion/src/java import.xml is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion/config/applications dataconversion.xml
Update of /var/cvs/contributions/CMSContainer_Modules/dataconversion/config/applications In directory james.mmbase.org:/tmp/cvs-serv29513/config/applications Added Files: dataconversion.xml Log Message: Add new module data conversion See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion/config/applications dataconversion.xml is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/service Constants.java Conversion.java ConversionThread.java Data.java DateUtil.java NodeServi
Update of /var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/service In directory james.mmbase.org:/tmp/cvs-serv29513/src/java/com/finalist/cmsc/dataconversion/service Added Files: Constants.java Conversion.java ConversionThread.java Data.java DateUtil.java NodeService.java XMLParser.java XMLUtil.java Log Message: Add new module data conversion See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/service Constants.java is new Conversion.java is new ConversionThread.java is new Data.java is new DateUtil.java is new NodeService.java is new XMLParser.java is new XMLUtil.java is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/dataaccess DataAccessDelegate.java DataAccessor.java DataHolder.java DataSourceFactory.java El
Update of /var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/dataaccess In directory james.mmbase.org:/tmp/cvs-serv29513/src/java/com/finalist/cmsc/dataconversion/dataaccess Added Files: DataAccessDelegate.java DataAccessor.java DataHolder.java DataSourceFactory.java ElementMeta.java Elements.java Query.java Log Message: Add new module data conversion See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/dataaccess DataAccessDelegate.java is new DataAccessor.java is new DataHolder.java is new DataSourceFactory.java is new ElementMeta.java is new Elements.java is new Query.java is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion/resources cmsc-dataconversion.properties cmsc-dataconversion_en.properties cmsc-dataconversion_nl.properties cmsc-dataconversion_zh.prop
Update of /var/cvs/contributions/CMSContainer_Modules/dataconversion/resources In directory james.mmbase.org:/tmp/cvs-serv29513/resources Added Files: cmsc-dataconversion.properties cmsc-dataconversion_en.properties cmsc-dataconversion_nl.properties cmsc-dataconversion_zh.properties Log Message: Add new module data conversion See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion/resources cmsc-dataconversion.properties is new cmsc-dataconversion_en.properties is new cmsc-dataconversion_nl.properties is new cmsc-dataconversion_zh.properties is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion project.xml
Update of /var/cvs/contributions/CMSContainer_Modules/dataconversion In directory james.mmbase.org:/tmp/cvs-serv29513 Added Files: project.xml Log Message: Add new module data conversion See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion project.xml is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion/config/applications/dataconversion/builders dataconversion.xml
Update of /var/cvs/contributions/CMSContainer_Modules/dataconversion/config/applications/dataconversion/builders In directory james.mmbase.org:/tmp/cvs-serv29513/config/applications/dataconversion/builders Added Files: dataconversion.xml Log Message: Add new module data conversion See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion/config/applications/dataconversion/builders dataconversion.xml is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/dataaccess - New directory
Update of /var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/dataaccess In directory james.mmbase.org:/tmp/cvs-serv29348/dataaccess Log Message: Directory /var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/dataaccess added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/dataaccess ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/service - New directory
Update of /var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/service In directory james.mmbase.org:/tmp/cvs-serv29348/service Log Message: Directory /var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/service added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/service ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/forms - New directory
Update of /var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/forms In directory james.mmbase.org:/tmp/cvs-serv29348/forms Log Message: Directory /var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/forms added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/forms ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion - New directory
Update of /var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion In directory james.mmbase.org:/tmp/cvs-serv29327/dataconversion Log Message: Directory /var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc - New directory
Update of /var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc In directory james.mmbase.org:/tmp/cvs-serv29311/cmsc Log Message: Directory /var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist - New directory
Update of /var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist In directory james.mmbase.org:/tmp/cvs-serv29294/finalist Log Message: Directory /var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion/src/java/com - New directory
Update of /var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com In directory james.mmbase.org:/tmp/cvs-serv29276/com Log Message: Directory /var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion/src/java/com ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion/src/tests/com - New directory
Update of /var/cvs/contributions/CMSContainer_Modules/dataconversion/src/tests/com In directory james.mmbase.org:/tmp/cvs-serv29235/com Log Message: Directory /var/cvs/contributions/CMSContainer_Modules/dataconversion/src/tests/com added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion/src/tests/com ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion/src/webapp/editors/dataconversion - New directory
Update of /var/cvs/contributions/CMSContainer_Modules/dataconversion/src/webapp/editors/dataconversion In directory james.mmbase.org:/tmp/cvs-serv29196/dataconversion Log Message: Directory /var/cvs/contributions/CMSContainer_Modules/dataconversion/src/webapp/editors/dataconversion added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion/src/webapp/editors/dataconversion ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion/src/webapp/WEB-INF - New directory
Update of /var/cvs/contributions/CMSContainer_Modules/dataconversion/src/webapp/WEB-INF In directory james.mmbase.org:/tmp/cvs-serv29161/WEB-INF Log Message: Directory /var/cvs/contributions/CMSContainer_Modules/dataconversion/src/webapp/WEB-INF added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion/src/webapp/WEB-INF ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion/src/webapp/editors - New directory
Update of /var/cvs/contributions/CMSContainer_Modules/dataconversion/src/webapp/editors In directory james.mmbase.org:/tmp/cvs-serv29161/editors Log Message: Directory /var/cvs/contributions/CMSContainer_Modules/dataconversion/src/webapp/editors added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion/src/webapp/editors ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion/src/webapp - New directory
Update of /var/cvs/contributions/CMSContainer_Modules/dataconversion/src/webapp In directory james.mmbase.org:/tmp/cvs-serv29115/webapp Log Message: Directory /var/cvs/contributions/CMSContainer_Modules/dataconversion/src/webapp added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion/src/webapp ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion/src/tests - New directory
Update of /var/cvs/contributions/CMSContainer_Modules/dataconversion/src/tests In directory james.mmbase.org:/tmp/cvs-serv29115/tests Log Message: Directory /var/cvs/contributions/CMSContainer_Modules/dataconversion/src/tests added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion/src/tests ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion/src/tld - New directory
Update of /var/cvs/contributions/CMSContainer_Modules/dataconversion/src/tld In directory james.mmbase.org:/tmp/cvs-serv29115/tld Log Message: Directory /var/cvs/contributions/CMSContainer_Modules/dataconversion/src/tld added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion/src/tld ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion/src/java - New directory
Update of /var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java In directory james.mmbase.org:/tmp/cvs-serv29061/java Log Message: Directory /var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion/src/java ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion/config/applications/dataconversion/builders - New directory
Update of /var/cvs/contributions/CMSContainer_Modules/dataconversion/config/applications/dataconversion/builders In directory james.mmbase.org:/tmp/cvs-serv28984/builders Log Message: Directory /var/cvs/contributions/CMSContainer_Modules/dataconversion/config/applications/dataconversion/builders added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion/config/applications/dataconversion/builders ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion/config/applications/dataconversion - New directory
Update of /var/cvs/contributions/CMSContainer_Modules/dataconversion/config/applications/dataconversion In directory james.mmbase.org:/tmp/cvs-serv28958/dataconversion Log Message: Directory /var/cvs/contributions/CMSContainer_Modules/dataconversion/config/applications/dataconversion added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion/config/applications/dataconversion ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion/config/applications - New directory
Update of /var/cvs/contributions/CMSContainer_Modules/dataconversion/config/applications In directory james.mmbase.org:/tmp/cvs-serv28929/applications Log Message: Directory /var/cvs/contributions/CMSContainer_Modules/dataconversion/config/applications added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion/config/applications ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion/resources - New directory
Update of /var/cvs/contributions/CMSContainer_Modules/dataconversion/resources In directory james.mmbase.org:/tmp/cvs-serv28878/resources Log Message: Directory /var/cvs/contributions/CMSContainer_Modules/dataconversion/resources added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion/resources ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion/config - New directory
Update of /var/cvs/contributions/CMSContainer_Modules/dataconversion/config In directory james.mmbase.org:/tmp/cvs-serv28878/config Log Message: Directory /var/cvs/contributions/CMSContainer_Modules/dataconversion/config added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion/config ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion/src - New directory
Update of /var/cvs/contributions/CMSContainer_Modules/dataconversion/src In directory james.mmbase.org:/tmp/cvs-serv28878/src Log Message: Directory /var/cvs/contributions/CMSContainer_Modules/dataconversion/src added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion/src ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion - New directory
Update of /var/cvs/contributions/CMSContainer_Modules/dataconversion In directory james.mmbase.org:/tmp/cvs-serv28845/dataconversion Log Message: Directory /var/cvs/contributions/CMSContainer_Modules/dataconversion added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/editors/evenementen evenementen.jsp
Update of /var/cvs/contributions/natmm/templates/editors/evenementen
In directory james.mmbase.org:/tmp/cvs-serv26088/templates/editors/evenementen
Modified Files:
evenementen.jsp
Log Message:
NMCMS-494
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/editors/evenementen
See also: http://www.mmbase.org/jira/browse/NMCMS-494
Index: evenementen.jsp
===
RCS file:
/var/cvs/contributions/natmm/templates/editors/evenementen/evenementen.jsp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- evenementen.jsp 24 May 2007 09:53:26 - 1.15
+++ evenementen.jsp 6 May 2008 08:52:55 - 1.16
@@ -13,6 +13,11 @@
String soortIdFC = "activiteiten";
String titelIdFC = "";
String natuurgebiedenIdFC = "";
+
+String aanmelderNaamIdFC = "";
+String aanmelderPostcodeIdFC = "";
+String aanmelderNummerIdFC = "";
+
String beginDyIdFC = "" + cal.get(Calendar.DAY_OF_MONTH);
String beginMnthIdFC = "" + (cal.get(Calendar.MONTH)+1);
String beginYrIdFC = "" + cal.get(Calendar.YEAR);
@@ -39,6 +44,11 @@
if(thisName.equals("soortIdFC")) { soortIdFC = thisValue; }
if(thisName.equals("titelIdFC")) { titelIdFC = thisValue; }
if(thisName.equals("natuurgebiedenIdFC")) { natuurgebiedenIdFC =
thisValue; }
+
+ if(thisName.equals("aanmelderNaamIdFC")) { aanmelderNaamIdFC =
thisValue; }
+ if(thisName.equals("aanmelderPostcodeIdFC")) { aanmelderPostcodeIdFC
= thisValue; }
+ if(thisName.equals("aanmelderNummerIdFC")) { aanmelderNummerIdFC =
thisValue; }
+
if(thisName.equals("beginDyIdFC")) { beginDyIdFC = thisValue; }
if(thisName.equals("beginMnthIdFC")) { beginMnthIdFC = thisValue;
}
if(thisName.equals("beginYrIdFC")) { beginYrIdFC = thisValue; }
@@ -62,6 +72,11 @@
<%= soortIdFC
%><% if(soortId==null) { soortId = ""; } %>
<%
if(titelId==null) { titelId = titelIdFC; } %>
<% if(natuurgebiedenId==null) { natuurgebiedenId =
natuurgebiedenIdFC; } %>
+
+<% if(aanmelderNaamId==null) { aanmelderNaamId =
aanmelderNaamIdFC; } %>
+<% if(aanmelderPostcodeId==null) {
aanmelderPostcodeId = aanmelderPostcodeIdFC; } %>
+<% if(aanmelderNummerId==null) { aanmelderNummerId =
aanmelderNummerIdFC; } %>
+
<%
if(beginDyId==null||beginDyId.equals("")) { beginDyId = beginDyIdFC; } %>
<%
if(beginMnthId==null||beginMnthId.equals("")) { beginMnthId = beginMnthIdFC; }
%>
<%
if(beginYrId==null||beginYrId.equals("")) { beginYrId = beginYrIdFC; } %>
@@ -81,6 +96,11 @@
soortId = "activiteiten";
titelId = "";
natuurgebiedenId = "";
+
+ aanmelderNaamId = "";
+ aanmelderPostcodeId = "";
+ aanmelderNummerId = "";
+
beginDyId = "" + cal.get(Calendar.DAY_OF_MONTH);
beginMnthId = "" + (cal.get(Calendar.MONTH)+1);
beginYrId = "" + cal.get(Calendar.YEAR);
@@ -102,6 +122,11 @@
soort: <%= soortId %>
titel: <%= titelId %>
natuurgebieden:<%= natuurgebiedenId %>
+
+aanmelder_naam: <%= aanmelderNaamId %>
+aanmelder_postcode: <%= aanmelderPostcodeId %>
+aanmelder_nummer: <%= aanmelderNummerId %>
+
beginDy: <%= beginDyId %>
beginMnth: <%= beginMnthId %>
beginYr: <%= beginYrId %>
@@ -122,6 +147,11 @@
thisCookie = new Cookie("soortIdFC", soortId ); thisCookie.setMaxAge(maxAge);
response.addCookie(thisCookie);
thisCookie = new Cookie("titelIdFC", titelId ); thisCookie.setMaxAge(maxAge);
response.addCookie(thisCookie);
thisCookie = new Cookie("natuurgebiedenIdFC",natuurgebiedenId );
thisCookie.setMaxAge(maxAge); response.addCookie(thisCookie);
+
+thisCookie = new Cookie("aanmelderNaamIdFC", aanmelderNaamId );
thisCookie.setMaxAge(maxAge); response.addCookie(thisCookie);
+thisCookie = new Cookie("aanmelderPostcodeIdFC", aanmelderPostcodeId );
thisCookie.setMaxAge(maxAge); response.addCookie(thisCookie);
+thisCookie = new Cookie("aanmelderNummerIdFC", aanmelderNummerId );
thisCookie.setMaxAge(maxAge); response.addCookie(thisCookie);
+
thisCookie = new Cookie("beginDyIdFC", beginDyId );
thisCookie.setMaxAge(maxAge); response.addCookie(thisCookie);
thisCookie = new Cookie("beginMnthIdFC", beginMnthId );
thisCookie.setMaxAge(maxAge); response.addCookie(thisCookie);
thisCookie = new Cookie("beginYrIdFC", beginYrId );
thisCookie.setMaxAge(maxAge); response.addCookie(thisCookie);
@@ -314,6 +344,25 @@
><%
}
+ // the search query much check for participant constraints
+ if(isValidEvent &&
(!aanmelderNaamId.equals("")||!aanmelderPostcodeId.equals("")||!aanmelderNummerId.equals("")))
{
+isValidEvent = false;
+%><%
+ if(!aanmelderNaamId.equals("")) {
+%>" /><%
+ }
+ if(!aanmelderPostcodeId.equals("")) {
+%><%
+ }
+ if(!aanmelderNummerId.equals("")) {
+%><%
+ }
+ %><%
+isValidEvent = true;
+ %><%
+ }
+
if(isValidEvent) {
