from:"nikkoyin"

[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/domain PersonVO.java

2008-12-01 Thread nikkoyin

Update of 
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/domain
In directory james.mmbase.org:/tmp/cvs-serv8543/services/community/domain

Modified Files:
PersonVO.java 
Log Message:
CMSC-949, Blocking users: user status enhancements,show state through Action


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/domain
See also: http://www.mmbase.org/jira/browse/CMSC-949


Index: PersonVO.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/domain/PersonVO.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- PersonVO.java   23 Sep 2008 07:12:57 -  1.4
+++ PersonVO.java   2 Dec 2008 06:39:34 -   1.5
@@ -9,6 +9,15 @@
private String groups;
private Long authId;
private boolean inGroup;
+   private String active;
+
+   public String getActive() {
+  return active;
+   }
+
+   public void setActive(String active) {
+  this.active = active;
+   }
 
public String getFullname() {
   return fullname;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms SearchConditionalUserAction.java

2008-12-01 Thread nikkoyin

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

Modified Files:
SearchConditionalUserAction.java 
Log Message:
CMSC-949, Blocking users: user status enhancements,show state through Action


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


Index: SearchConditionalUserAction.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/SearchConditionalUserAction.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- SearchConditionalUserAction.java25 Sep 2008 06:56:13 -  1.19
+++ SearchConditionalUserAction.java2 Dec 2008 06:39:34 -   1.20
@@ -63,7 +63,12 @@
 
   setPagingInformation(request);
   Map  String , String  map = getParameterMap(actionForm);
-
+  String active=request.getParameter(state); 
+  if(null!=active){
+ String authId=request.getParameter(authid);
+ Long authenticationId=Long.parseLong(authId);
+ personService.changeStateByAuthenticationId(authenticationId,active);
+  }
   List  Person  persons = personService.getAssociatedPersons(map);
   int totalCount = personService.getAssociatedPersonsNum(map);
 
@@ -168,6 +173,7 @@
  per.setUsername(username);
  per.setGroups(groupsName);
  per.setAuthId(p.getAuthenticationId());
+ per.setActive(p.getActive());
  perShow.add(per);
   }
   return perShow;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person PersonHibernateService.java PersonService.java

2008-12-01 Thread nikkoyin

Update of 
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
In directory james.mmbase.org:/tmp/cvs-serv8543/services/community/person

Modified Files:
PersonHibernateService.java PersonService.java 
Log Message:
CMSC-949, Blocking users: user status enhancements,show state through Action


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


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.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- PersonHibernateService.java 6 Nov 2008 07:04:22 -   1.24
+++ PersonHibernateService.java 2 Dec 2008 06:39:34 -   1.25
@@ -431,4 +431,10 @@
  creatRelationRecord(importPerson);
   }
}
+   @Transactional
+   public void changeStateByAuthenticationId(Long authenticationId, String 
active) {
+  Person per=getPersonByAuthenticationId(authenticationId);
+  per.setActive(active);
+  updatePerson(per);  
+   }
 }


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.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- PersonService.java  6 Nov 2008 07:04:22 -   1.17
+++ PersonService.java  2 Dec 2008 06:39:34 -   1.18
@@ -81,4 +81,6 @@
public List  Person  getPersonsByAuthenticationIds(Set  Integer  
authenticationIds, String name, String email);
 
public void addRelationRecord(String level, PersonExportImportVO 
importPerson);
+
+   void changeStateByAuthenticationId(Long authenticationId, String active);
 }
___
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 DataAccessor.java

2008-11-28 Thread nikkoyin

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

Modified Files:
DataAccessor.java 
Log Message:
CMSC-1166, KNMI migration to the CMS Container,delete some unuseful import


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


Index: DataAccessor.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/dataaccess/DataAccessor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- DataAccessor.java   28 Nov 2008 07:30:44 -  1.3
+++ DataAccessor.java   28 Nov 2008 08:07:42 -  1.4
@@ -2,12 +2,9 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.Reader;
 import java.sql.Blob;
 import java.sql.Connection;
-import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
___
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 NodeService.java

2008-11-28 Thread nikkoyin

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

Modified Files:
NodeService.java 
Log Message:
CMSC-1166, KNMI migration to the CMS Container,delete some unuseful import


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


Index: NodeService.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/service/NodeService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- NodeService.java28 Nov 2008 07:30:44 -  1.5
+++ NodeService.java28 Nov 2008 08:07:42 -  1.6
@@ -13,14 +13,12 @@
 import org.mmbase.bridge.Cloud;
 import org.mmbase.bridge.CloudContext;
 import org.mmbase.bridge.ContextProvider;
-import org.mmbase.bridge.Field;
 import org.mmbase.bridge.Node;
 import org.mmbase.bridge.NodeList;
 import org.mmbase.bridge.NodeManager;
 import org.mmbase.bridge.NodeQuery;
 import org.mmbase.bridge.Relation;
 import org.mmbase.bridge.util.SearchUtil;
-import org.mmbase.datatypes.DataType;
 import org.mmbase.module.core.MMBase;
 import org.mmbase.module.core.MMObjectNode;
 import org.mmbase.util.logging.Logger;
@@ -297,9 +295,7 @@
   Node desNode = cloud.getNode(Integer.parseInt(node));
   for (Iterator iter = rootDatas.entrySet().iterator(); iter.hasNext();) {
  Map.Entry entry = (Map.Entry) iter.next();
- String key = (String) entry.getKey();
  ArrayListInteger val = (ArrayListInteger) entry.getValue();
- NodeManager manager = cloud.getNodeManager(key);
  for (Integer i : val) {
 int sn=getNewkey(cloud,i);
 if (sn0) {
___
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 Data.java NodeService.java XMLUtil.java

2008-11-27 Thread nikkoyin

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

Modified Files:
Constants.java Conversion.java Data.java NodeService.java 
XMLUtil.java 
Log Message:
CMSC-1166, KNMI migration to the CMS Container,make some improvements to get 
the data imported properly


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


Index: Constants.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/service/Constants.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Constants.java  6 May 2008 11:05:49 -   1.1
+++ Constants.java  28 Nov 2008 07:30:44 -  1.2
@@ -10,4 +10,6 @@

public static final Byte ROOT_CATEGORY_TYPE = 3;

+   public static final Byte RELATION_DATA_TYPE = 4;
+   
 }


Index: Conversion.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/service/Conversion.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- Conversion.java 7 Oct 2008 13:05:59 -   1.4
+++ Conversion.java 28 Nov 2008 07:30:44 -  1.5
@@ -4,6 +4,7 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
 
 import javax.servlet.ServletContext;
@@ -16,6 +17,7 @@
 import org.w3c.dom.NodeList;
 
 import com.finalist.cmsc.dataconversion.dataaccess.DataAccessDelegate;
+import com.finalist.cmsc.dataconversion.dataaccess.DataAccessor;
 import com.finalist.cmsc.dataconversion.dataaccess.DataHolder;
 import com.finalist.cmsc.dataconversion.dataaccess.DataSourceFactory;
 
@@ -60,125 +62,199 @@
   Document dom = null; 
   long beginTime = System.currentTimeMillis();
   try {
- 
- 
  log.info( ###  begin  import 
##);
  dom = 
XMLParser.parseXMLToDOM(context.getResourceAsStream(IMPORT_FILE));   
 // XMLParser.DTDValidator(dom);
- Element element = (Element)dom.getElementsByTagName(import).item(0);
+ Element element = (Element) 
dom.getElementsByTagName(import).item(0);
  NodeList list = element.getChildNodes(); 
  ListData sources =  new ArrayListData();
- for(int i = 0 ; i  list.getLength(); i++) {
-//datatype node
-if(list.item(i).getNodeName().equals(datatype)) {
-   //deal with data type node
-   
log.info(String.format(table_log,XMLUtil.getSourceType((Element)list.item(i;
-   Data sorData = getDataOfDataType((Element)list.item(i));
-   //load data number from 
-   HashMapInteger,Integer keys = 
DataAccessDelegate.getNumbersOfDataType((Element)list.item(i), dataSource);
-   
log.info(String.format(result_count,keys.size(),XMLUtil.getSourceType((Element)list.item(i;
+ ListData clondSources = new ArrayListData();
+ int j= list.getLength();
+ for (int i = 0; i  j; i++) {
+// datatype node
+if (list.item(i).getNodeName().equals(datatype)) {
+   // deal with data type node
+   log.info(String.format(table_log, 
XMLUtil.getSourceType((Element) list.item(i;
+   Data sorData = getDataOfDataType((Element) list.item(i));
+   // load data number from
+   HashMapInteger, Integer keys = 
DataAccessDelegate.getNumbersOfDataType((Element) list.item(i),
+ dataSource);
+   log.info(String.format(result_count, keys.size(), XMLUtil
+ .getSourceType((Element) list.item(i;
sorData.setIdentifiers(keys);
sources.add(sorData);
-
-   if(XMLUtil.hasSelfRelation((Element)list.item(i))) {
-  
log.info(String.format(sefRelation_log,XMLUtil.getSourceType((Element)list.item(i;
-  Data relData = getDataOfSelfRelation((Element)list.item(i));
-  HashMapInteger,Integer keys1 = 
DataAccessDelegate.getNumbersOfSelfRelation((Element)list.item(i), dataSource);
-  
log.info(String.format(result_count,keys1.size(),XMLUtil.getSourceType((Element)list.item(i;
+   //log.info(did I chage? +Utils.getXML(list.item(i)));
+   if (XMLUtil.hasSelfRelation((Element) list.item(i))) {
+  log.info(String.format(sefRelation_log, 
XMLUtil.getSourceType((Element) list.item(i;
+  Data

[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/dataaccess DataAccessDelegate.java DataAccessor.java ElementMeta.java

2008-11-27 Thread nikkoyin

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

Modified Files:
DataAccessDelegate.java DataAccessor.java ElementMeta.java 
Log Message:
CMSC-1166, KNMI migration to the CMS Container,make some improvements to get 
the data imported properly


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


Index: DataAccessDelegate.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/dataaccess/DataAccessDelegate.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- DataAccessDelegate.java 6 May 2008 11:05:49 -   1.1
+++ DataAccessDelegate.java 28 Nov 2008 07:30:44 -  1.2
@@ -1,9 +1,13 @@
 package com.finalist.cmsc.dataconversion.dataaccess;
 
 import java.util.HashMap;
+import java.util.List;
+
 import javax.sql.DataSource;
 import org.w3c.dom.Element;
 
+import com.finalist.cmsc.dataconversion.service.Data;
+
 public class DataAccessDelegate {

public static HashMapInteger,Integer getNumbersOfDataType(Element 
element,DataSource dataSource) throws Exception {
@@ -30,4 +34,8 @@
   ElementMeta elementMeta = new ElementMeta(element); 
   return new DataAccessor(dataSource,elementMeta);
}
+
+   public static ListString getResOfRelation(ListData sources, Data 
reldata, DataSource dataSource) {
+  return new DataAccessor(dataSource).getResOfRelation(reldata,sources);
+   }
 }


Index: DataAccessor.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/dataaccess/DataAccessor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- DataAccessor.java   16 May 2008 11:45:45 -  1.2
+++ DataAccessor.java   28 Nov 2008 07:30:44 -  1.3
@@ -1,7 +1,13 @@
 package com.finalist.cmsc.dataconversion.dataaccess;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
+import java.sql.Blob;
 import java.sql.Connection;
+import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
@@ -13,6 +19,7 @@
 import org.mmbase.util.logging.Logging;
 
 import com.finalist.cmsc.dataconversion.service.Constants;
+import com.finalist.cmsc.dataconversion.service.Data;
 
 /**
  * used for Data accessing 
@@ -31,6 +38,8 @@
public static final String DATATYPE_NUMBER = datatype;
public static final String SELFREL_NUMBER = selfrelate;
public static final String RELACTION_NUMBER = relation;
+   public static final String INT_TO_DATA = intToData;
+   public static final String BLOB_TO_STRING = blobToString;

public DataAccessor(DataSource dataSource,ElementMeta elementMeta) {
   
@@ -39,6 +48,11 @@
   query = new Query();
}   

+   public DataAccessor(DataSource dataSource) {
+  this.dataSource = dataSource;
+  query = new Query();
+   }
+
/**
 *  get  numbers 
 * @return key number
@@ -114,7 +128,6 @@
   try {
  connection = dataSource.getConnection();
  statement = connection.createStatement();
-
  if(type == Constants.ENTITY_TYPE) {
 rs = statement.executeQuery(query.getQueryString(elementMeta,key));
 parseResultSet(rs,list,elementMeta);
@@ -122,7 +135,7 @@
 holder.setTableName(elementMeta.getDesTableName());
 
  }
- else if(type == Constants.RELATION_TYPE){
+ else if(type == 
Constants.RELATION_TYPE||type==Constants.RELATION_DATA_TYPE){//add new type
 
if(StringUtils.isNotEmpty(query.getRelateFieldsString(elementMeta,key))) {
relRs = 
statement.executeQuery(query.getRelateFieldsString(elementMeta,key));
parse(relRs,list,elementMeta,holder,key);
@@ -160,11 +173,17 @@
  Elements element = new Elements();
  for(String fieldName : elementMeta.getFieldNames()) {
 if(StringUtils.isNotEmpty(fieldName)) {
-   if(StringUtils.isEmpty(elementMeta.getPrefix(fieldName)) || 
(rs.getObject(fieldName) != null  
rs.getObject(fieldName).toString().startsWith(URL_PROTOCOL))) {
+   
if(StringUtils.isEmpty(elementMeta.getStyle(fieldName))StringUtils.isEmpty(elementMeta.getPrefix(fieldName))
 || (rs.getObject(fieldName) != null  
rs.getObject(fieldName).toString().startsWith(URL_PROTOCOL))) {
   
element.setValue(elementMeta.getDesFieldName(fieldName),rs.getObject(fieldName));
}
-

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

2008-11-18 Thread nikkoyin

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

Modified Files:
ContentSearchAction.java 
Log Message:
CMSC-1089,change Assets display in two ways. list and thumbnails.contentSearch 
to make title and keywords to combination


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


Index: ContentSearchAction.java
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentSearchAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ContentSearchAction.java13 Nov 2008 09:52:27 -  1.1
+++ ContentSearchAction.java19 Nov 2008 06:06:06 -  1.2
@@ -46,9 +46,9 @@
  */
 private static final Logger log = 
Logging.getLoggerInstance(ContentSearchAction.class.getName());
 
-
 @Override
-public ActionForward execute(ActionMapping mapping, ActionForm form, 
HttpServletRequest request, HttpServletResponse response, Cloud cloud) throws 
Exception {
+   public ActionForward execute(ActionMapping mapping, ActionForm form, 
HttpServletRequest request,
+ HttpServletResponse response, Cloud cloud) throws Exception {
 
 log.debug(Starting the search:);
 
@@ -58,10 +58,9 @@
 String deleteContentRequest = 
request.getParameter(deleteContentRequest);
 
 if (StringUtils.isNotEmpty(deleteContentRequest)) {
-   if(deleteContentRequest.startsWith(massDelete:)) {
+ if (deleteContentRequest.startsWith(massDelete:)) {
   massDeleteContent(deleteContentRequest.substring(11));
-   }
-   else {
+ } else {
 deleteContent(deleteContentRequest);
}
 
@@ -91,7 +90,7 @@
 
 NodeManager nodeManager = 
cloud.getNodeManager(searchForm.getContenttypes());
 QueryStringComposer queryStringComposer = new QueryStringComposer();
-if(StringUtils.isNotEmpty(request.getParameter(MODE))) {
+  if (StringUtils.isNotEmpty(request.getParameter(MODE))) {
queryStringComposer.addParameter(MODE, 
request.getParameter(MODE));
 }
 NodeQuery query = cloud.createNodeQuery();
@@ -107,8 +106,7 @@
 theStep = query.addRelationStep(nodeManager, 
RepositoryUtil.CONTENTREL, DESTINATION).getNext();
 query.setNodeStep(theStep);
 queryStringComposer.addParameter(PARENTCHANNEL, 
searchForm.getParentchannel());
-}
-else {
+  } else {
 theStep = query.addStep(nodeManager);
 query.setNodeStep(theStep);
 }
@@ -174,29 +172,17 @@
 SearchUtil.addConstraint(query, titleConstraint);
 }
 
-// And some keyword searching
-if (StringUtils.isNotEmpty(searchForm.getKeywords())) {
-queryStringComposer.addParameter(ContentElementUtil.KEYWORD_FIELD, 
searchForm.getKeywords());
-Field keywordField = 
nodeManager.getField(ContentElementUtil.KEYWORD_FIELD);
-ListString keywords = 
KeywordUtil.getKeywords(searchForm.getKeywords());
-for (String keyword : keywords) {
-Constraint keywordConstraint = 
SearchUtil.createLikeConstraint(query, keywordField, keyword);
-SearchUtil.addORConstraint(query, keywordConstraint);
-}
-}
-
+  searchKey(request, searchForm, nodeManager, queryStringComposer, query);
 // Set the objectid constraint
 if (StringUtils.isNotEmpty(searchForm.getObjectid())) {
String stringObjectId = searchForm.getObjectid().trim();
 Integer objectId = null;
 if (stringObjectId.matches(^\\d+$)) {
 objectId = Integer.valueOf(stringObjectId);
-}
-else {
+ } else {
 if (cloud.hasNode(stringObjectId)) {
 objectId = 
Integer.valueOf(cloud.getNode(stringObjectId).getNumber());
-}
-else {
+} else {
 objectId = Integer.valueOf(-1);
 }
 }
@@ -227,8 +213,7 @@
 String resultsPerPage = 
PropertiesUtil.getProperty(REPOSITORY_SEARCH_RESULTS_PER_PAGE);
 if (resultsPerPage == null || !resultsPerPage.matches(\\d+)) {
 query.setMaxNumber(25);
-}
-else {
+  } else {
 query.setMaxNumber(Integer.parseInt(resultsPerPage));
 }
 
@@ -247,14 +232,39 @@
 searchForm.setResultCount(resultCount);
 searchForm.setResults(results);
 request.setAttribute(GETURL, queryStringComposer.getQueryString());
-
 return super.execute(mapping, form, request, response,

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

2008-11-16 Thread nikkoyin

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

Modified Files:
NewsletterPublicationCAOImpl.java 
Log Message:
CMSC-1156,Newsletter: remove the WAP version in the Newsletter; remove the Text 
when empty functionality, code and fields; fix the text-version view of 
newsletter,remove the Text when empty functionality


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


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.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- NewsletterPublicationCAOImpl.java   10 Nov 2008 10:35:19 -  1.30
+++ NewsletterPublicationCAOImpl.java   17 Nov 2008 02:33:11 -  1.31
@@ -75,7 +75,6 @@
 
   Node node = relatedNewsletters.get(0);
   new POConvertUtilsNewsletter().convert(newsletter, node);
-  newsletter.setTxtempty(node.getStringValue(txtempty));
   newsletter.setReplyAddress(node.getStringValue(replyto_mail));
   pub.setNewsletter(newsletter);
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/domain Newsletter.java

2008-11-16 Thread nikkoyin

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

Modified Files:
Newsletter.java 
Log Message:
CMSC-1156,Newsletter: remove the WAP version in the Newsletter; remove the Text 
when empty functionality, code and fields; fix the text-version view of 
newsletter,remove the Text when empty functionality


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


Index: Newsletter.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/domain/Newsletter.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- Newsletter.java 3 Nov 2008 05:54:06 -   1.14
+++ Newsletter.java 17 Nov 2008 02:33:11 -  1.15
@@ -26,8 +26,6 @@
 
private String fromAddress;
 
-   private String txtempty;
-
public int getId() {
   return id;
}
@@ -108,14 +106,6 @@
   this.terms = terms;
}
 
-   public String getTxtempty() {
-  return txtempty;
-   }
-
-   public void setTxtempty(String txtempty) {
-  this.txtempty = txtempty;
-   }
-
public boolean equals(Object o) {
   if (this == o) {
  return true;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

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

2008-11-16 Thread nikkoyin

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

Modified Files:
newsletter.xml 
Log Message:
CMSC-1156,Newsletter: remove the WAP version in the Newsletter; remove the Text 
when empty functionality, code and fields; fix the text-version view of 
newsletter,remove the Text when empty functionality


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


Index: newsletter.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders/newsletter.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- newsletter.xml  3 Nov 2008 05:54:06 -   1.18
+++ newsletter.xml  17 Nov 2008 02:33:10 -  1.19
@@ -263,28 +263,6 @@
description xml:lang=en/description
/descriptions
gui
-   guiname xml:lang=nlTekst als leeg/guiname
-   guiname xml:lang=enText when empty/guiname
-   /gui
-   editor
-   positions
-   input9/input
-   list-1/list
-   search-1/search
-   /positions
-   /editor
- datatype base=cmscrichtext 
xmlns=http://www.mmbase.org/xmlns/datatypes; /
-   db
-   nametxtempty/name
-   type key=false notnull=false size=64000 
state=persistentSTRING/type
-   /db
-   /field
-  field
-   descriptions
-   description xml:lang=nl/description
-   description xml:lang=en/description
-   /descriptions
-   gui
guiname xml:lang=nlVerzendplan/guiname
guiname xml:lang=enSchedule/guiname
/gui
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

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

2008-11-16 Thread nikkoyin

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

Modified Files:
edit_newsletter.xml load_newsletter.xml 
Log Message:
CMSC-1156,Newsletter: remove the WAP version in the Newsletter; remove the Text 
when empty functionality, code and fields; fix the text-version view of 
newsletter,remove the Text when empty functionality


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


Index: edit_newsletter.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/edit_newsletter.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- edit_newsletter.xml 6 Nov 2008 16:56:43 -   1.22
+++ edit_newsletter.xml 17 Nov 2008 02:33:11 -  1.23
@@ -68,11 +68,6 @@
prompt xml:lang=zhæåæªæ¢/prompt
optionlist select=boolean /
/field
-   field name=txtempty dtmaxlength=1024 ftype=text rows=3
-   prompt xml:lang=enText when empty/prompt
-   prompt xml:lang=nlTekst als leeg/prompt
-   prompt 
xml:lang=zhåå®¹ä¸ºç©ºæ¶æ¯å¦åéå¶ä»åå®¹/prompt
-   /field
field name=schedule ftype=calendar
prompt xml:lang=enSchedule/prompt
prompt xml:lang=nlSchedule/prompt


Index: load_newsletter.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/load_newsletter.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- load_newsletter.xml 3 Nov 2008 05:54:06 -   1.16
+++ load_newsletter.xml 17 Nov 2008 02:33:11 -  1.17
@@ -20,7 +20,6 @@
field name=subject /
field name=description /
field name=externalurl/
-   field name=txtempty /
field name=schedule /
field name=bounce_checking/
field name=max_bounces/
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

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

2008-11-16 Thread nikkoyin

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

Modified Files:
NewsletterPublicationUtil.java 
Log Message:
CMSC-1156,Newsletter: remove the WAP version in the Newsletter; remove the Text 
when empty functionality, code and fields; fix the text-version view of 
newsletter,remove the Text when empty functionality


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


Index: NewsletterPublicationUtil.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterPublicationUtil.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- NewsletterPublicationUtil.java  13 Nov 2008 11:45:40 -  1.32
+++ NewsletterPublicationUtil.java  17 Nov 2008 02:33:11 -  1.33
@@ -143,7 +143,6 @@
 
   Node node = relatedNewsletters.get(0);
   new POConvertUtilsNewsletter().convert(newsletter, node);
-  newsletter.setTxtempty(node.getStringValue(txtempty));
   newsletter.setReplyAddress(node.getStringValue(replyto_mail));
   pub.setNewsletter(newsletter);
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

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

2008-11-16 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
NewsletterPublicationUtil.java 
Log Message:
CMSC-1156,Newsletter: remove the WAP version in the Newsletter; remove the Text 
when empty functionality, code and fields; fix the text-version view of 
newsletter,remove the Text when empty functionality


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


Index: NewsletterPublicationUtil.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterPublicationUtil.java,v
retrieving revision 1.26.2.4
retrieving revision 1.26.2.5
diff -u -b -r1.26.2.4 -r1.26.2.5
--- NewsletterPublicationUtil.java  13 Nov 2008 11:47:31 -  1.26.2.4
+++ NewsletterPublicationUtil.java  17 Nov 2008 02:49:28 -  1.26.2.5
@@ -143,7 +143,6 @@
 
   Node node = relatedNewsletters.get(0);
   new POConvertUtilsNewsletter().convert(newsletter, node);
-  newsletter.setTxtempty(node.getStringValue(txtempty));
   newsletter.setReplyAddress(node.getStringValue(replyto_mail));
   pub.setNewsletter(newsletter);
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

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

2008-11-16 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
NewsletterPublicationCAOImpl.java 
Log Message:
CMSC-1156,Newsletter: remove the WAP version in the Newsletter; remove the Text 
when empty functionality, code and fields; fix the text-version view of 
newsletter,remove the Text when empty functionality


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


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.24.2.3
retrieving revision 1.24.2.4
diff -u -b -r1.24.2.3 -r1.24.2.4
--- NewsletterPublicationCAOImpl.java   10 Nov 2008 10:35:24 -  1.24.2.3
+++ NewsletterPublicationCAOImpl.java   17 Nov 2008 02:49:28 -  1.24.2.4
@@ -75,7 +75,6 @@
 
   Node node = relatedNewsletters.get(0);
   new POConvertUtilsNewsletter().convert(newsletter, node);
-  newsletter.setTxtempty(node.getStringValue(txtempty));
   newsletter.setReplyAddress(node.getStringValue(replyto_mail));
   pub.setNewsletter(newsletter);
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

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

2008-11-16 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
newsletter.xml 
Log Message:
CMSC-1156,Newsletter: remove the WAP version in the Newsletter; remove the Text 
when empty functionality, code and fields; fix the text-version view of 
newsletter,remove the Text when empty functionality


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


Index: newsletter.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders/newsletter.xml,v
retrieving revision 1.17.2.1
retrieving revision 1.17.2.2
diff -u -b -r1.17.2.1 -r1.17.2.2
--- newsletter.xml  3 Nov 2008 06:08:09 -   1.17.2.1
+++ newsletter.xml  17 Nov 2008 02:49:28 -  1.17.2.2
@@ -263,28 +263,6 @@
description xml:lang=en/description
/descriptions
gui
-   guiname xml:lang=nlTekst als leeg/guiname
-   guiname xml:lang=enText when empty/guiname
-   /gui
-   editor
-   positions
-   input9/input
-   list-1/list
-   search-1/search
-   /positions
-   /editor
- datatype base=cmscrichtext 
xmlns=http://www.mmbase.org/xmlns/datatypes; /
-   db
-   nametxtempty/name
-   type key=false notnull=false size=64000 
state=persistentSTRING/type
-   /db
-   /field
-  field
-   descriptions
-   description xml:lang=nl/description
-   description xml:lang=en/description
-   /descriptions
-   gui
guiname xml:lang=nlVerzendplan/guiname
guiname xml:lang=enSchedule/guiname
/gui
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

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

2008-11-16 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
edit_newsletter.xml load_newsletter.xml 
Log Message:
CMSC-1156,Newsletter: remove the WAP version in the Newsletter; remove the Text 
when empty functionality, code and fields; fix the text-version view of 
newsletter,remove the Text when empty functionality


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


Index: edit_newsletter.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/edit_newsletter.xml,v
retrieving revision 1.20.2.2
retrieving revision 1.20.2.3
diff -u -b -r1.20.2.2 -r1.20.2.3
--- edit_newsletter.xml 6 Nov 2008 16:56:37 -   1.20.2.2
+++ edit_newsletter.xml 17 Nov 2008 02:49:28 -  1.20.2.3
@@ -68,11 +68,6 @@
prompt xml:lang=zhæåæªæ¢/prompt
optionlist select=boolean /
/field
-   field name=txtempty dtmaxlength=1024 ftype=text rows=3
-   prompt xml:lang=enText when empty/prompt
-   prompt xml:lang=nlTekst als leeg/prompt
-   prompt 
xml:lang=zhåå®¹ä¸ºç©ºæ¶æ¯å¦åéå¶ä»åå®¹/prompt
-   /field
field name=schedule ftype=calendar
prompt xml:lang=enSchedule/prompt
prompt xml:lang=nlSchedule/prompt


Index: load_newsletter.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/load_newsletter.xml,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -u -b -r1.15.2.1 -r1.15.2.2
--- load_newsletter.xml 3 Nov 2008 06:08:09 -   1.15.2.1
+++ load_newsletter.xml 17 Nov 2008 02:49:28 -  1.15.2.2
@@ -20,7 +20,6 @@
field name=subject /
field name=description /
field name=externalurl/
-   field name=txtempty /
field name=schedule /
field name=bounce_checking/
field name=max_bounces/
___
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

2008-11-16 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
Newsletter.java 
Log Message:
CMSC-1156,Newsletter: remove the WAP version in the Newsletter; remove the Text 
when empty functionality, code and fields; fix the text-version view of 
newsletter,remove the Text when empty functionality


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


Index: Newsletter.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/domain/Newsletter.java,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -u -b -r1.13.2.1 -r1.13.2.2
--- Newsletter.java 3 Nov 2008 06:08:09 -   1.13.2.1
+++ Newsletter.java 17 Nov 2008 02:49:28 -  1.13.2.2
@@ -26,8 +26,6 @@
 
private String fromAddress;
 
-   private String txtempty;
-
public int getId() {
   return id;
}
@@ -108,14 +106,6 @@
   this.terms = terms;
}
 
-   public String getTxtempty() {
-  return txtempty;
-   }
-
-   public void setTxtempty(String txtempty) {
-  this.txtempty = txtempty;
-   }
-
public boolean equals(Object o) {
   if (this == o) {
  return true;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

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

2008-11-13 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
NewsletterPublisher.java 
Added Files:
  Tag: b1_5
HtmlBodyParser.java 
Log Message:
CMSC-1084, Newsletter: sending test email contains empty body,forbid empty 
content email sended


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


HtmlBodyParser.java is new



Index: NewsletterPublisher.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher/NewsletterPublisher.java,v
retrieving revision 1.34.2.1
retrieving revision 1.34.2.2
diff -u -b -r1.34.2.1 -r1.34.2.2
--- NewsletterPublisher.java3 Nov 2008 06:08:09 -   1.34.2.1
+++ NewsletterPublisher.java13 Nov 2008 08:14:09 -  1.34.2.2
@@ -51,57 +51,63 @@
 
public void deliver(Publication publication, Subscription subscription) {
   try {
+ //if needed to prompt user this validate will be remove to Action
+ String originalBody = getBody(publication, subscription);
+ if 
(!containAticle(publication)||StringUtils.isBlank(HtmlBodyParser.html2text(originalBody)))
 {
+log.error(the mail does not contain any aticle, please check your 
term or article !);
+return;
+ } else {
  NewsletterService service = (NewsletterService) 
ApplicationContextFactory.getBean(newsletterServices);
 // Newsletter newsletter = 
service.getNewsletterBySubscription(subscription.getId());
  Newsletter newsletter = publication.getNewsletter();
  String replyAddress = newsletter.getReplyAddress();
  String toEmail = subscription.getEmail();
  Message message = new MimeMessage(getMailSession(toEmail, 
replyAddress));
-
- setSenderInfomation(message, newsletter.getFromAddress(), 
newsletter.getFromName(), replyAddress, newsletter.getReplyName());
-
- setContent(message, publication, subscription);
+setSenderInfomation(message, newsletter.getFromAddress(), 
newsletter.getFromName(), replyAddress,
+  newsletter.getReplyName());
+setContent(message, publication, subscription, originalBody);
  setRecipient(message, subscription.getEmail());
  // setBody(publication, subscription, message);
  setTitle(message, newsletter.getTitle());
  // setMIME(message, subscription.getMimeType());
-
  Transport.send(message);
- log.debug(String.format(
-   mail send! publication %s to %s in %s format,
-   publication.getId(), subscription.getId(), 
subscription.getMimeType())
- );
   }
-  catch (MessagingException e) {
+
+ log.debug(String.format(mail send! publication %s to %s in %s 
format, publication.getId(), subscription
+   .getId(), subscription.getMimeType()));
+  } catch (MessagingException e) {
  log.error(e);
  throw new NewsletterSendFailException(e);
-  }
-  catch (UnsupportedEncodingException e) {
+  } catch (UnsupportedEncodingException e) {
  log.error(e);
  throw new NewsletterSendFailException(e);
   }
}
 
-   private void setContent(Message message, Publication publication,
-   Subscription subscription) {
+   private void setContent(Message message, Publication 
publication,Subscription subscription,String originalBody) {
   Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
   Node newsletterPublicationNode = cloud.getNode(publication.getId());
   NodeList attachmentNodes = 
newsletterPublicationNode.getRelatedNodes(attachments);
   Multipart multipart = new MimeMultipart();
-  MimeBodyPart mdp = new MimeBodyPart();
+  setBody(publication, subscription, multipart,originalBody);
+  setAttachment(multipart, attachmentNodes, MimeType.attachment);
+  NodeList imageNodes = 
newsletterPublicationNode.getRelatedNodes(images);
+  setAttachment(multipart, imageNodes, MimeType.image);
   try {
- mdp.setContent(getBody(publication, subscription), 
subscription.getMimeType());
- multipart.addBodyPart(mdp);
+ message.setContent(multipart);
   }
   catch (MessagingException e) {
  log.error(e);
   }
+   }
 
-  setAttachment(multipart, attachmentNodes, MimeType.attachment);
-  NodeList imageNodes = 
newsletterPublicationNode.getRelatedNodes(images);
-  setAttachment(multipart, imageNodes, MimeType.image);
+   private void setBody(Publication publication, Subscription subscription, 
Multipart multipart,String originalBody) {
+

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

2008-11-13 Thread nikkoyin

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

Added Files:
ContentSearchAction.java 
Log Message:
CMSC-1089,change Assets display in two ways. list and thumbnails.contentSearch


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


ContentSearchAction.java is new

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

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

2008-11-13 Thread nikkoyin

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

Modified Files:
NewsletterPublisher.java 
Log Message:
CMSC-1084, Newsletter: sending test email contains empty body,allow empty 
content email sended


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


Index: NewsletterPublisher.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher/NewsletterPublisher.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- NewsletterPublisher.java13 Nov 2008 08:03:30 -  1.38
+++ NewsletterPublisher.java13 Nov 2008 11:10:43 -  1.39
@@ -51,28 +51,22 @@
 
public void deliver(Publication publication, Subscription subscription) {
   try {
- //if needed to prompt user this validate will be remove to Action
+ // if needed to prompt user this validate will be remove to Action
  String originalBody = getBody(publication, subscription);
- if 
(!containAticle(publication)||StringUtils.isBlank(HtmlBodyParser.html2text(originalBody)))
 {
-log.error(the mail does not contain any aticle, please check your 
term or article !);
-return;
- } else {
 NewsletterService service = (NewsletterService) 
ApplicationContextFactory.getBean(newsletterServices);
 // Newsletter newsletter = 
service.getNewsletterBySubscription(subscription.getId());
 Newsletter newsletter = publication.getNewsletter();
 String replyAddress = newsletter.getReplyAddress();
 String toEmail = subscription.getEmail();
 Message message = new MimeMessage(getMailSession(toEmail, 
replyAddress));
-setSenderInfomation(message, newsletter.getFromAddress(), 
newsletter.getFromName(), replyAddress,
-  newsletter.getReplyName());
+ setSenderInfomation(message, newsletter.getFromAddress(), 
newsletter.getFromName(), replyAddress, newsletter
+   .getReplyName());
 setContent(message, publication, subscription, originalBody);
 setRecipient(message, subscription.getEmail());
 // setBody(publication, subscription, message);
 setTitle(message, newsletter.getTitle());
 // setMIME(message, subscription.getMimeType());
 Transport.send(message);
- }
-
  log.debug(String.format(mail send! publication %s to %s in %s 
format, publication.getId(), subscription
.getId(), subscription.getMimeType()));
   } catch (MessagingException e) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository contentsearch.jsp index.jsp

2008-11-13 Thread nikkoyin

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

Modified Files:
index.jsp 
Added Files:
contentsearch.jsp 
Log Message:
CMSC-1089,change Assets display in two ways. list and thumbnails.contentSearch


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


contentsearch.jsp is new



Index: index.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/index.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- index.jsp   24 Sep 2008 06:06:33 -  1.6
+++ index.jsp   13 Nov 2008 10:17:04 -  1.7
@@ -57,7 +57,7 @@
 /mm:notpresent
 mm:notpresent referid=contenturl
c:if test=${not empty param.title}
-  mm:url page=/editors/repository/SearchAction.do?title=${param.title} 
id=contenturl write=false /
+  mm:url 
page=/editors/repository/ContentSearchAction.do?title=${param.title} 
id=contenturl write=false /
/c:if
c:if test=${empty param.title}
   mm:url page=/editors/repository/SearchInitAction.do id=contenturl 
write=false /
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/webapp/WEB-INF struts-repository.xml

2008-11-13 Thread nikkoyin

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

Modified Files:
struts-repository.xml 
Log Message:
CMSC-1089,change Assets display in two ways. list and thumbnails.contentSearch


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


Index: struts-repository.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/WEB-INF/struts-repository.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- struts-repository.xml   13 Nov 2008 04:24:08 -  1.21
+++ struts-repository.xml   13 Nov 2008 10:17:04 -  1.22
@@ -100,11 +100,11 @@
 
   action path=/editors/repository/SearchInitAction 
type=com.finalist.cmsc.repository.forms.SearchInitAction
  name=SearchForm scope=request unknown=false validate=false
- forward name=searchoptions path=/editors/repository/search.jsp 
redirect=false /
- forward name=dosearch path=/editors/repository/SearchAction.do 
redirect=false /
+ forward name=searchoptions 
path=/editors/repository/contentsearch.jsp redirect=false /
+ forward name=dosearch 
path=/editors/repository/ContentSearchAction.do redirect=false /
   /action
-  action path=/editors/repository/SearchAction 
type=com.finalist.cmsc.repository.forms.SearchAction
- name=SearchForm scope=request 
input=/editors/repository/search.jsp unknown=false validate=true
+  action path=/editors/repository/ContentSearchAction 
type=com.finalist.cmsc.repository.forms.ContentSearchAction
+ name=SearchForm scope=request 
input=/editors/repository/contentsearch.jsp unknown=false validate=true
   /action
   action path=/editors/repository/contentMassDelete 
type=com.finalist.cmsc.repository.forms.ContentMassDeleteAction 
  unknown=false validate=false
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

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

2008-11-13 Thread nikkoyin

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

Modified Files:
NewsletterPublisher.java 
Log Message:
CMSC-1084, Newsletter: sending test email contains empty body,allow not  
contained-Aticle content email sended


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


Index: NewsletterPublisher.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher/NewsletterPublisher.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- NewsletterPublisher.java13 Nov 2008 11:48:50 -  1.41
+++ NewsletterPublisher.java14 Nov 2008 06:35:10 -  1.42
@@ -164,16 +164,12 @@
   }
   String content =  ;
   if ((subscription.getTerms() == null) || (subscription.getTerms().size() 
== 0) || !cache.contains(url)) {
- if (!containAticle(publication)) {
-content = publication.getNewsletter().getTxtempty();
-log.info(the newsletter use textEmpty + content);
- } else {
-log.info(url + url);
-content = NewsletterGenerator.generate(url, 
subscription.getMimeType());
- }
  if (null != getPersonalise()) {
 content = getPersonalise().personalise(content, subscription, 
publication);
 log.info(the content sended is Personalised : + content);
+ }else {
+log.info(url + url);
+content = NewsletterGenerator.generate(url, 
subscription.getMimeType());
  }
  cache.add(url, content);
   } else {
@@ -183,15 +179,6 @@
   return content + \n;
}
 
-   private boolean containAticle(Publication publication) {
-  int articleCounts = 
NewsletterUtil.countArticlesByNewsletter(publication.getNewsletterId());
-  if (articleCounts == 0 ) {
- return false;
-  }else{
- return true;
-  }
-   }
-
private void setSenderInfomation(Message message, String fromAddress, 
String fromName, String replyAddress, String replyName)
 throws MessagingException, UnsupportedEncodingException {
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

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

2008-11-13 Thread nikkoyin

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

Removed Files:
HtmlBodyParser.java 
Log Message:
CMSC-1084, Newsletter: sending test email contains empty body,remove a unuseful 
class


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


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

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

2008-11-13 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
NewsletterPublisher.java 
Removed Files:
  Tag: b1_5
HtmlBodyParser.java 
Log Message:
CMSC-1084, Newsletter: sending test email contains empty body,allow not  
contained-Aticle content email sended


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


Index: NewsletterPublisher.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher/NewsletterPublisher.java,v
retrieving revision 1.34.2.5
retrieving revision 1.34.2.6
diff -u -b -r1.34.2.5 -r1.34.2.6
--- NewsletterPublisher.java13 Nov 2008 11:49:16 -  1.34.2.5
+++ NewsletterPublisher.java14 Nov 2008 07:01:17 -  1.34.2.6
@@ -164,16 +164,12 @@
   }
   String content =  ;
   if ((subscription.getTerms() == null) || (subscription.getTerms().size() 
== 0) || !cache.contains(url)) {
- if (!containAticle(publication)) {
-content = publication.getNewsletter().getTxtempty();
-log.info(the newsletter use textEmpty + content);
- } else {
-log.info(url + url);
-content = NewsletterGenerator.generate(url, 
subscription.getMimeType());
- }
  if (null != getPersonalise()) {
 content = getPersonalise().personalise(content, subscription, 
publication);
 log.info(the content sended is Personalised : + content);
+ }else {
+log.info(url + url);
+content = NewsletterGenerator.generate(url, 
subscription.getMimeType());
  }
  cache.add(url, content);
   } else {
@@ -183,15 +179,6 @@
   return content + \n;
}
 
-   private boolean containAticle(Publication publication) {
-  int articleCounts = 
NewsletterUtil.countArticlesByNewsletter(publication.getNewsletterId());
-  if (articleCounts == 0 ) {
- return false;
-  }else{
- return true;
-  }
-   }
-
private void setSenderInfomation(Message message, String fromAddress, 
String fromName, String replyAddress, String replyName)
 throws MessagingException, UnsupportedEncodingException {
 


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

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

2008-11-12 Thread nikkoyin

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

Modified Files:
NewsletterPublisher.java 
Log Message:
CMSC-1084, Newsletter: sending test email contains empty body,add loginfo 
messages to look for the reason


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


Index: NewsletterPublisher.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher/NewsletterPublisher.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- NewsletterPublisher.java3 Nov 2008 05:54:06 -   1.36
+++ NewsletterPublisher.java12 Nov 2008 08:59:40 -  1.37
@@ -90,7 +90,10 @@
   Multipart multipart = new MimeMultipart();
   MimeBodyPart mdp = new MimeBodyPart();
   try {
- mdp.setContent(getBody(publication, subscription), 
subscription.getMimeType());
+ String type=subscription.getMimeType();
+ String o=getBody(publication, subscription);
+ log.info(the content will be sended:+o+\n +his type is :+type);
+ mdp.setContent(o, type);
  multipart.addBodyPart(mdp);
   }
   catch (MessagingException e) {
@@ -142,8 +145,7 @@
private String getBody(Publication publication, Subscription subscription)
 throws MessagingException {
 
-  String url = NewsletterUtil.getTermURL(publication.getUrl(), subscription
-   .getTerms(), publication.getId());
+  String url = NewsletterUtil.getTermURL(publication.getUrl(), 
subscription.getTerms(), publication.getId());
   ICache cache = null;
   String expiration = 
PropertiesUtil.getProperty(publication.cache.expiration);
   if (StringUtils.isEmpty(expiration)) {
@@ -156,16 +158,19 @@
  int articleCounts = 
NewsletterUtil.countArticlesByNewsletter(publication.getNewsletterId());
  if (articleCounts == 0 ) {
 content = publication.getNewsletter().getTxtempty();
+log.info(the newsletter use textEmpty + content);
  } else {
 log.info(url + url);
 content = NewsletterGenerator.generate(url, 
subscription.getMimeType());
  }
  if (null != getPersonalise()) {
 content = getPersonalise().personalise(content, subscription, 
publication);
+log.info(the content sended is Personalised :+content);
  }
  cache.add(url, content);
   } else {
  content = (String) cache.get(url);
+ log.info(the content sended is from the cache+content);
   }
   return content + \n;
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms PreviewImageAction.java

2008-11-09 Thread nikkoyin

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

Added Files:
PreviewImageAction.java 
Log Message:
CMSC-1089,change Assets display in two ways. list and thumbnails.previewImage


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


PreviewImageAction.java is new

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

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

2008-11-03 Thread nikkoyin

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

Modified Files:
NewsletterDelete.java 
Log Message:
CMSC-1134, Newsletter project: add edit-icon to newsletter overview; remove 
Send when empty; add warning by removal,  add warning by remova forward


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


Index: NewsletterDelete.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterDelete.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- NewsletterDelete.java   14 Oct 2008 11:22:43 -  1.16
+++ NewsletterDelete.java   4 Nov 2008 03:50:07 -   1.17
@@ -71,6 +71,9 @@
   }
 
   if (isCancelAction(request)) {
+ if (StringUtils.isNotEmpty(getParameter(request, forward))) {
+return mapping.findForward(newslettermanage);
+ }
  return mapping.findForward(SUCCESS);
   }
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

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

2008-11-03 Thread nikkoyin

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

Modified Files:
report_newsletter_overview_list.jsp 
Log Message:
CMSC-1134, Newsletter project: add edit-icon to newsletter overview; remove 
Send when empty; add warning by removal,  add warning by remova forward back


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


Index: report_newsletter_overview_list.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_newsletter_overview_list.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- report_newsletter_overview_list.jsp 3 Nov 2008 07:46:21 -   1.7
+++ report_newsletter_overview_list.jsp 4 Nov 2008 05:01:10 -   1.8
@@ -65,6 +65,6 @@
   }
   
   function ask(idk){   
-   location.href= 
NewsletterDelete.do?number=+idk+amp;remove='true'amp;forward='manage'; 

+   location.href= 
NewsletterDelete.do?number=+idk+forward='manage';   
  }
 /script
\ 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/editors/newsletter newsletterdelete.jsp

2008-11-03 Thread nikkoyin

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

Modified Files:
newsletterdelete.jsp 
Log Message:
CMSC-1134, Newsletter project: add edit-icon to newsletter overview; remove 
Send when empty; add warning by removal,  add warning by remova forward back


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


Index: newsletterdelete.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/newsletterdelete.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- newsletterdelete.jsp3 Nov 2008 07:26:19 -   1.3
+++ newsletterdelete.jsp4 Nov 2008 05:01:10 -   1.4
@@ -12,6 +12,7 @@
/style
 /cmscedit:head
 mm:import externid=number required=true from=parameters/
+mm:import externid=forward required=false from=parameters/
 mm:cloud jspvar=cloud rank=basic user loginpage=../login.jsp
 body
 cmscedit:sideblock title=newsletterdelete.title 
titleClass=side_block_green
@@ -23,6 +24,7 @@
/p
form action=?
html:hidden property=number value=${number} /
+   html:hidden property=forward value=${forward} /
html:submit property=removefmt:message 
key=newsletterdelete.yes//html:submitnbsp;
a href=javascript:window.history.go(-1);input 
type=button value=fmt:message key=newsletterdelete.no//a 
/form
___
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 report_newsletter_overview_list.jsp

2008-11-03 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
report_newsletter_overview_list.jsp 
Log Message:
CMSC-1134, Newsletter project: add edit-icon to newsletter overview; remove 
Send when empty; add warning by removal,  add warning by remova forward back


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


Index: report_newsletter_overview_list.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_newsletter_overview_list.jsp,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -b -r1.5.2.2 -r1.5.2.3
--- report_newsletter_overview_list.jsp 3 Nov 2008 07:48:22 -   1.5.2.2
+++ report_newsletter_overview_list.jsp 4 Nov 2008 05:04:15 -   1.5.2.3
@@ -65,6 +65,6 @@
   }
   
   function ask(idk){   
-   location.href= 
NewsletterDelete.do?number=+idk+amp;remove='true'amp;forward='manage'; 

+   location.href= 
NewsletterDelete.do?number=+idk+forward='manage';   
  }
 /script
\ 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/editors/newsletter newsletterdelete.jsp

2008-11-03 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
newsletterdelete.jsp 
Log Message:
CMSC-1134, Newsletter project: add edit-icon to newsletter overview; remove 
Send when empty; add warning by removal,  add warning by remova forward back


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


Index: newsletterdelete.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/newsletterdelete.jsp,v
retrieving revision 1.2.4.1
retrieving revision 1.2.4.2
diff -u -b -r1.2.4.1 -r1.2.4.2
--- newsletterdelete.jsp3 Nov 2008 07:30:47 -   1.2.4.1
+++ newsletterdelete.jsp4 Nov 2008 05:04:15 -   1.2.4.2
@@ -12,6 +12,7 @@
/style
 /cmscedit:head
 mm:import externid=number required=true from=parameters/
+mm:import externid=forward required=false from=parameters/
 mm:cloud jspvar=cloud rank=basic user loginpage=../login.jsp
 body
 cmscedit:sideblock title=newsletterdelete.title 
titleClass=side_block_green
@@ -23,6 +24,7 @@
/p
form action=?
html:hidden property=number value=${number} /
+   html:hidden property=forward value=${forward} /
html:submit property=removefmt:message 
key=newsletterdelete.yes//html:submitnbsp;
a href=javascript:window.history.go(-1);input 
type=button value=fmt:message key=newsletterdelete.no//a 
/form
___
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 NewsletterDelete.java

2008-11-03 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
NewsletterDelete.java 
Log Message:
CMSC-1134, Newsletter project: add edit-icon to newsletter overview; remove 
Send when empty; add warning by removal,  add warning by remova forward


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


Index: NewsletterDelete.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterDelete.java,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -b -r1.15 -r1.15.2.1
--- NewsletterDelete.java   23 Sep 2008 09:07:06 -  1.15
+++ NewsletterDelete.java   4 Nov 2008 05:05:41 -   1.15.2.1
@@ -73,6 +73,9 @@
   }
 
   if (isCancelAction(request)) {
+ if (StringUtils.isNotEmpty(getParameter(request, forward))) {
+return mapping.findForward(newslettermanage);
+ }
  return mapping.findForward(SUCCESS);
   }
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

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

2008-11-02 Thread nikkoyin

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

Modified Files:
NewsletterPublisher.java 
Log Message:
CMSC-1134) Newsletter project: add edit-icon to newsletter overview; remove 
Send when empty; add warning by removal,remove Send when empty


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


Index: NewsletterPublisher.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher/NewsletterPublisher.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- NewsletterPublisher.java14 Oct 2008 11:22:44 -  1.35
+++ NewsletterPublisher.java3 Nov 2008 05:54:06 -   1.36
@@ -154,7 +154,7 @@
   String content =  ;
   if ((subscription.getTerms() == null) || (subscription.getTerms().size() 
== 0) || !cache.contains(url)) {
  int articleCounts = 
NewsletterUtil.countArticlesByNewsletter(publication.getNewsletterId());
- if (articleCounts == 0  publication.getNewsletter().getSendempty()) 
{
+ if (articleCounts == 0 ) {
 content = publication.getNewsletter().getTxtempty();
  } else {
 log.info(url + url);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

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

2008-11-02 Thread nikkoyin

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

Modified Files:
NewsletterPublicationCAOImpl.java 
Log Message:
CMSC-1134) Newsletter project: add edit-icon to newsletter overview; remove 
Send when empty; add warning by removal,remove Send when empty


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


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.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- NewsletterPublicationCAOImpl.java   28 Oct 2008 11:13:36 -  1.27
+++ NewsletterPublicationCAOImpl.java   3 Nov 2008 05:54:06 -   1.28
@@ -75,7 +75,6 @@
 
   Node node = relatedNewsletters.get(0);
   new POConvertUtilsNewsletter().convert(newsletter, node);
-  newsletter.setSendempty(node.getBooleanValue(sendempty));
   newsletter.setTxtempty(node.getStringValue(txtempty));
   newsletter.setReplyAddress(node.getStringValue(replyto_mail));
   pub.setNewsletter(newsletter);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

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

2008-11-02 Thread nikkoyin

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

Modified Files:
edit_newsletter.xml load_newsletter.xml 
Log Message:
CMSC-1134) Newsletter project: add edit-icon to newsletter overview; remove 
Send when empty; add warning by removal,remove Send when empty


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


Index: edit_newsletter.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/edit_newsletter.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- edit_newsletter.xml 13 Aug 2008 09:39:26 -  1.20
+++ edit_newsletter.xml 3 Nov 2008 05:54:06 -   1.21
@@ -68,12 +68,6 @@
prompt xml:lang=zhæåæªæ¢/prompt
optionlist select=boolean /
/field
-   field name=sendempty ftype=enum
-   prompt xml:lang=enSend when empty/prompt
-   prompt xml:lang=nlVerstuur als leeg/prompt
-   prompt xml:lang=zhåå®¹ä¸ºç©ºæ¶æ¯å¦åé/prompt
-   optionlist select=boolean /
-   /field
field name=txtempty dtmaxlength=1024 ftype=text rows=3
prompt xml:lang=enText when empty/prompt
prompt xml:lang=nlText when empty/prompt


Index: load_newsletter.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/load_newsletter.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- load_newsletter.xml 24 Jul 2008 11:11:33 -  1.15
+++ load_newsletter.xml 3 Nov 2008 05:54:06 -   1.16
@@ -20,7 +20,6 @@
field name=subject /
field name=description /
field name=externalurl/
-   field name=sendempty/
field name=txtempty /
field name=schedule /
field name=bounce_checking/
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

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

2008-11-02 Thread nikkoyin

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

Modified Files:
newsletter.xml 
Log Message:
CMSC-1134) Newsletter project: add edit-icon to newsletter overview; remove 
Send when empty; add warning by removal,remove Send when empty


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


Index: newsletter.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders/newsletter.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- newsletter.xml  24 Jul 2008 11:11:33 -  1.17
+++ newsletter.xml  3 Nov 2008 05:54:06 -   1.18
@@ -259,28 +259,6 @@
/field
   field
descriptions
-   description xml:lang=nlVerzend als 
leeg/description
-   description xml:lang=enSend when 
empty/description
-   /descriptions
-   gui
-   guiname xml:lang=nlVerzend als 
leeg/guiname
-   guiname xml:lang=enSend when empty/guiname
-   /gui
-   editor
-   positions
-   input7/input
-   list-1/list
-   search-1/search
-   /positions
-   /editor
-   datatype base=yesno 
xmlns=http://www.mmbase.org/xmlns/datatypes; /
-   db
-   namesendempty/name
-   type key=false required=true 
state=persistentBOOLEAN/type
-   /db
-   /field
-  field
-   descriptions
description xml:lang=nl/description
description xml:lang=en/description
/descriptions
___
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

2008-11-02 Thread nikkoyin

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

Modified Files:
Newsletter.java 
Log Message:
CMSC-1134) Newsletter project: add edit-icon to newsletter overview; remove 
Send when empty; add warning by removal,remove Send when empty


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


Index: Newsletter.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/domain/Newsletter.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- Newsletter.java 23 Sep 2008 10:31:36 -  1.13
+++ Newsletter.java 3 Nov 2008 05:54:06 -   1.14
@@ -26,8 +26,6 @@
 
private String fromAddress;
 
-   private boolean sendempty;
-
private String txtempty;
 
public int getId() {
@@ -110,14 +108,6 @@
   this.terms = terms;
}
 
-   public boolean getSendempty() {
-  return sendempty;
-   }
-
-   public void setSendempty(boolean sendempty) {
-  this.sendempty = sendempty;
-   }
-
public String getTxtempty() {
   return txtempty;
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

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

2008-11-02 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
newsletter.xml 
Log Message:
CMSC-1134) Newsletter project: add edit-icon to newsletter overview; remove 
Send when empty; add warning by removal,remove Send when empty


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


Index: newsletter.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders/newsletter.xml,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -u -b -r1.17 -r1.17.2.1
--- newsletter.xml  24 Jul 2008 11:11:33 -  1.17
+++ newsletter.xml  3 Nov 2008 06:08:09 -   1.17.2.1
@@ -259,28 +259,6 @@
/field
   field
descriptions
-   description xml:lang=nlVerzend als 
leeg/description
-   description xml:lang=enSend when 
empty/description
-   /descriptions
-   gui
-   guiname xml:lang=nlVerzend als 
leeg/guiname
-   guiname xml:lang=enSend when empty/guiname
-   /gui
-   editor
-   positions
-   input7/input
-   list-1/list
-   search-1/search
-   /positions
-   /editor
-   datatype base=yesno 
xmlns=http://www.mmbase.org/xmlns/datatypes; /
-   db
-   namesendempty/name
-   type key=false required=true 
state=persistentBOOLEAN/type
-   /db
-   /field
-  field
-   descriptions
description xml:lang=nl/description
description xml:lang=en/description
/descriptions
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

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

2008-11-02 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
NewsletterPublisher.java 
Log Message:
CMSC-1134) Newsletter project: add edit-icon to newsletter overview; remove 
Send when empty; add warning by removal,remove Send when empty


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


Index: NewsletterPublisher.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher/NewsletterPublisher.java,v
retrieving revision 1.34
retrieving revision 1.34.2.1
diff -u -b -r1.34 -r1.34.2.1
--- NewsletterPublisher.java23 Sep 2008 10:53:48 -  1.34
+++ NewsletterPublisher.java3 Nov 2008 06:08:09 -   1.34.2.1
@@ -156,7 +156,7 @@
   String content =  ;
   if ((subscription.getTerms() == null) || (subscription.getTerms().size() 
== 0) || !cache.contains(url)) {
  int articleCounts = 
NewsletterUtil.countArticlesByNewsletter(publication.getNewsletterId());
- if (articleCounts == 0publication.getNewsletter().getSendempty()) {
+ if (articleCounts == 0) {
 content = publication.getNewsletter().getTxtempty();
  }
  else {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

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

2008-11-02 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
edit_newsletter.xml load_newsletter.xml 
Log Message:
CMSC-1134) Newsletter project: add edit-icon to newsletter overview; remove 
Send when empty; add warning by removal,remove Send when empty


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


Index: edit_newsletter.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/edit_newsletter.xml,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -u -b -r1.20 -r1.20.2.1
--- edit_newsletter.xml 13 Aug 2008 09:39:26 -  1.20
+++ edit_newsletter.xml 3 Nov 2008 06:08:09 -   1.20.2.1
@@ -68,12 +68,6 @@
prompt xml:lang=zhæåæªæ¢/prompt
optionlist select=boolean /
/field
-   field name=sendempty ftype=enum
-   prompt xml:lang=enSend when empty/prompt
-   prompt xml:lang=nlVerstuur als leeg/prompt
-   prompt xml:lang=zhåå®¹ä¸ºç©ºæ¶æ¯å¦åé/prompt
-   optionlist select=boolean /
-   /field
field name=txtempty dtmaxlength=1024 ftype=text rows=3
prompt xml:lang=enText when empty/prompt
prompt xml:lang=nlText when empty/prompt


Index: load_newsletter.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/load_newsletter.xml,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -b -r1.15 -r1.15.2.1
--- load_newsletter.xml 24 Jul 2008 11:11:33 -  1.15
+++ load_newsletter.xml 3 Nov 2008 06:08:09 -   1.15.2.1
@@ -20,7 +20,6 @@
field name=subject /
field name=description /
field name=externalurl/
-   field name=sendempty/
field name=txtempty /
field name=schedule /
field name=bounce_checking/
___
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

2008-11-02 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
Newsletter.java 
Log Message:
CMSC-1134) Newsletter project: add edit-icon to newsletter overview; remove 
Send when empty; add warning by removal,remove Send when empty


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


Index: Newsletter.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/domain/Newsletter.java,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -b -r1.13 -r1.13.2.1
--- Newsletter.java 23 Sep 2008 10:31:36 -  1.13
+++ Newsletter.java 3 Nov 2008 06:08:09 -   1.13.2.1
@@ -26,8 +26,6 @@
 
private String fromAddress;
 
-   private boolean sendempty;
-
private String txtempty;
 
public int getId() {
@@ -110,14 +108,6 @@
   this.terms = terms;
}
 
-   public boolean getSendempty() {
-  return sendempty;
-   }
-
-   public void setSendempty(boolean sendempty) {
-  this.sendempty = sendempty;
-   }
-
public String getTxtempty() {
   return txtempty;
}
___
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 report_newsletter_overview_list.jsp

2008-11-02 Thread nikkoyin

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

Modified Files:
report_newsletter_overview_list.jsp 
Log Message:
CMSC-1134) Newsletter project: add edit-icon to newsletter overview; remove 
Send when empty; add warning by removal,add edit-icon to newsletter overview


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


Index: report_newsletter_overview_list.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_newsletter_overview_list.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- report_newsletter_overview_list.jsp 22 Sep 2008 03:58:21 -  1.5
+++ report_newsletter_overview_list.jsp 3 Nov 2008 07:24:13 -   1.6
@@ -6,11 +6,11 @@
   table
  thead
 th width=3%/th
-th width=5%/th
+th width=12%/th
 th width=15%fmt:message 
key=newsletteroverview.newsletter//th
 th width=15%fmt:message 
key=globalstats.total.publications//th
 th width=15%fmt:message 
key=globalstats.total.sentsubscriptions//th
-th width=47%fmt:message 
key=globalstats.total.subscriptions//th
+th width=40%fmt:message 
key=globalstats.total.subscriptions//th
  /thead
  tbody
 c:forEach items=${results} var=result
@@ -19,7 +19,8 @@
 input type=checkbox name=ids 
value=${result.id}/
  /td
  td
-a 
href=NewsletterDelete.do?number=${result.id}amp;remove='true'amp;forward='manage'img
 src=../gfx/icons/delete.png align=top title=fmt:message 
key='site.newsletter.remove'///a
+a 
href=../site/NavigatorPanel.do?nodeId=${result.id}img height=16 
width=16 title=fmt:message key='site.newsletter.edit'/ 
src=../gfx/icons/edit.gif//a
+a href=javascript:ask('${result.id}')img 
src=../gfx/icons/delete.png align=top title=fmt:message 
key='site.newsletter.remove'///a
 a 
href=NewsletterEdit.do?number=${result.id}amp;forward=manageimg 
src=../gfx/icons/edit_defaults.png align=top title=fmt:message 
key='site.newsletter.edit'///a
  /td
  td
@@ -62,4 +63,8 @@
 
   return false;
}
+  
+  function ask(idk){   
+   location.href= 
NewsletterDelete.do?number=+idk+amp;remove='true'amp;forward='manage'; 

+ }
 /script
\ 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/editors/newsletter newsletterdelete.jsp

2008-11-02 Thread nikkoyin

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

Modified Files:
newsletterdelete.jsp 
Log Message:
CMSC-1134) Newsletter project: add edit-icon to newsletter overview; remove 
Send when empty; add warning by removal,  add warning by remova


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


Index: newsletterdelete.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/newsletterdelete.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- newsletterdelete.jsp12 Dec 2007 14:43:52 -  1.2
+++ newsletterdelete.jsp3 Nov 2008 07:26:19 -   1.3
@@ -24,7 +24,7 @@
form action=?
html:hidden property=number value=${number} /
html:submit property=removefmt:message 
key=newsletterdelete.yes//html:submitnbsp;
-   html:submit property=cancelfmt:message 
key=newsletterdelete.no//html:submit
+   a href=javascript:window.history.go(-1);input 
type=button value=fmt:message key=newsletterdelete.no//a 
/form
 /cmscedit:sideblock
 /body
___
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 report_newsletter_overview_list.jsp

2008-11-02 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
report_newsletter_overview_list.jsp 
Log Message:
CMSC-1134) Newsletter project: add edit-icon to newsletter overview; remove 
Send when empty; add warning by removal,add edit-icon to newsletter overview


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


Index: report_newsletter_overview_list.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_newsletter_overview_list.jsp,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -b -r1.5 -r1.5.2.1
--- report_newsletter_overview_list.jsp 22 Sep 2008 03:58:21 -  1.5
+++ report_newsletter_overview_list.jsp 3 Nov 2008 07:29:32 -   1.5.2.1
@@ -6,11 +6,11 @@
   table
  thead
 th width=3%/th
-th width=5%/th
+th width=12%/th
 th width=15%fmt:message 
key=newsletteroverview.newsletter//th
 th width=15%fmt:message 
key=globalstats.total.publications//th
 th width=15%fmt:message 
key=globalstats.total.sentsubscriptions//th
-th width=47%fmt:message 
key=globalstats.total.subscriptions//th
+th width=40%fmt:message 
key=globalstats.total.subscriptions//th
  /thead
  tbody
 c:forEach items=${results} var=result
@@ -19,7 +19,8 @@
 input type=checkbox name=ids 
value=${result.id}/
  /td
  td
-a 
href=NewsletterDelete.do?number=${result.id}amp;remove='true'amp;forward='manage'img
 src=../gfx/icons/delete.png align=top title=fmt:message 
key='site.newsletter.remove'///a
+a 
href=../site/NavigatorPanel.do?nodeId=${result.id}img height=16 
width=16 title=fmt:message key='site.newsletter.edit'/ 
src=../gfx/icons/edit.gif//a
+a href=javascript:ask('${result.id}')img 
src=../gfx/icons/delete.png align=top title=fmt:message 
key='site.newsletter.remove'///a
 a 
href=NewsletterEdit.do?number=${result.id}amp;forward=manageimg 
src=../gfx/icons/edit_defaults.png align=top title=fmt:message 
key='site.newsletter.edit'///a
  /td
  td
@@ -62,4 +63,8 @@
 
   return false;
}
+  
+  function ask(idk){   
+   location.href= 
NewsletterDelete.do?number=+idk+amp;remove='true'amp;forward='manage'; 

+ }
 /script
\ 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/editors/newsletter newsletterdelete.jsp

2008-11-02 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
newsletterdelete.jsp 
Log Message:
CMSC-1134, Newsletter project: add edit-icon to newsletter overview; remove 
Send when empty; add warning by removal,  add warning by remova


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


Index: newsletterdelete.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/newsletterdelete.jsp,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -b -r1.2 -r1.2.4.1
--- newsletterdelete.jsp12 Dec 2007 14:43:52 -  1.2
+++ newsletterdelete.jsp3 Nov 2008 07:30:47 -   1.2.4.1
@@ -24,7 +24,7 @@
form action=?
html:hidden property=number value=${number} /
html:submit property=removefmt:message 
key=newsletterdelete.yes//html:submitnbsp;
-   html:submit property=cancelfmt:message 
key=newsletterdelete.no//html:submit
+   a href=javascript:window.history.go(-1);input 
type=button value=fmt:message key=newsletterdelete.no//a 
/form
 /cmscedit:sideblock
 /body
___
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 report_newsletter_overview_list.jsp

2008-11-02 Thread nikkoyin

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

Modified Files:
report_newsletter_overview_list.jsp 
Log Message:
CMSC-1134, Newsletter project: add edit-icon to newsletter overview; remove 
Send when empty; add warning by removal,add edit-icon to newsletter overview


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


Index: report_newsletter_overview_list.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_newsletter_overview_list.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- report_newsletter_overview_list.jsp 3 Nov 2008 07:24:13 -   1.6
+++ report_newsletter_overview_list.jsp 3 Nov 2008 07:46:21 -   1.7
@@ -19,7 +19,7 @@
 input type=checkbox name=ids 
value=${result.id}/
  /td
  td
-a 
href=../site/NavigatorPanel.do?nodeId=${result.id}img height=16 
width=16 title=fmt:message key='site.newsletter.edit'/ 
src=../gfx/icons/edit.gif//a
+a 
href=../site/NavigatorPanel.do?nodeId=${result.id}img height=16 
width=16 title=fmt:message key='newsletter.icons.title.editproperty'/ 
src=../gfx/icons/edit.gif//a
 a href=javascript:ask('${result.id}')img 
src=../gfx/icons/delete.png align=top title=fmt:message 
key='site.newsletter.remove'///a
 a 
href=NewsletterEdit.do?number=${result.id}amp;forward=manageimg 
src=../gfx/icons/edit_defaults.png align=top title=fmt:message 
key='site.newsletter.edit'///a
  /td
___
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 report_newsletter_overview_list.jsp

2008-11-02 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
report_newsletter_overview_list.jsp 
Log Message:
CMSC-1134, Newsletter project: add edit-icon to newsletter overview; remove 
Send when empty; add warning by removal,add edit-icon to newsletter overview


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


Index: report_newsletter_overview_list.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_newsletter_overview_list.jsp,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -b -r1.5.2.1 -r1.5.2.2
--- report_newsletter_overview_list.jsp 3 Nov 2008 07:29:32 -   1.5.2.1
+++ report_newsletter_overview_list.jsp 3 Nov 2008 07:48:22 -   1.5.2.2
@@ -19,7 +19,7 @@
 input type=checkbox name=ids 
value=${result.id}/
  /td
  td
-a 
href=../site/NavigatorPanel.do?nodeId=${result.id}img height=16 
width=16 title=fmt:message key='site.newsletter.edit'/ 
src=../gfx/icons/edit.gif//a
+a 
href=../site/NavigatorPanel.do?nodeId=${result.id}img height=16 
width=16 title=fmt:message key='newsletter.icons.title.editproperty'/ 
src=../gfx/icons/edit.gif//a
 a href=javascript:ask('${result.id}')img 
src=../gfx/icons/delete.png align=top title=fmt:message 
key='site.newsletter.remove'///a
 a 
href=NewsletterEdit.do?number=${result.id}amp;forward=manageimg 
src=../gfx/icons/edit_defaults.png align=top title=fmt:message 
key='site.newsletter.edit'///a
  /td
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

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

2008-10-30 Thread nikkoyin

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

Modified Files:
NewsletterSubscriptionServicesImpl.java 
Log Message:
CMSC-1110, Import newsletter subscription data gives stacktrace,add validate 
servserce


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


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.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- NewsletterSubscriptionServicesImpl.java 28 Oct 2008 11:13:36 -  
1.31
+++ NewsletterSubscriptionServicesImpl.java 30 Oct 2008 07:38:06 -  
1.32
@@ -316,7 +316,11 @@
}
 
public Subscription getSubscription(int userId, int newsletterId) {
+  if (isAbleSubscrip(userId,newsletterId)) {
   return subscriptionCAO.getSubscription(newsletterId, userId);
+  }else{
+ return null;
+  }
}
 
public void unSubscribeAllInNewsletter(int newsletterId) {
@@ -400,5 +404,15 @@
   return subscriberIds;
}

+   public boolean isAbleSubscrip(int userId, int newsletterId) {
+  
+  if (null == personService.getPersonByUserId(String.valueOf(userId))
+|| null == newsletterService.getNewsletterName(newsletterId)) {
+ return false;
+  } else {
+ return true;
+  }
+   }
+   
 
 }
___
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 NewsletterSubscriptionServices.java

2008-10-30 Thread nikkoyin

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

Modified Files:
NewsletterSubscriptionServices.java 
Log Message:
CMSC-1110, Import newsletter subscription data gives stacktrace,add validate 
servserce


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


Index: NewsletterSubscriptionServices.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/NewsletterSubscriptionServices.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- NewsletterSubscriptionServices.java 28 Oct 2008 11:13:36 -  1.20
+++ NewsletterSubscriptionServices.java 30 Oct 2008 07:38:06 -  1.21
@@ -57,6 +57,8 @@
 
public Subscription getSubscription(int sbId, int nId);
 
+   public boolean isAbleSubscrip(int sbId, int nId);
+
void unSubscribeAllInNewsletter(int integer);
 
public void createSubscription(int userId, int newsletterId);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

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

2008-10-30 Thread nikkoyin

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

Modified Files:
SubscriptionImportExportAction.java 
Log Message:
CMSC-1110, Import newsletter subscription data gives stacktrace,add validate 
Xsream Object


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


Index: SubscriptionImportExportAction.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/SubscriptionImportExportAction.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- SubscriptionImportExportAction.java 29 Oct 2008 07:33:22 -  1.12
+++ SubscriptionImportExportAction.java 30 Oct 2008 08:00:13 -  1.13
@@ -4,6 +4,7 @@
 import com.finalist.cmsc.services.community.person.Person;
 import com.finalist.cmsc.services.community.person.PersonService;
 import com.finalist.cmsc.services.community.security.AuthenticationService;
+import com.finalist.newsletter.domain.Newsletter;
 import com.finalist.newsletter.domain.Subscription;
 import com.finalist.newsletter.domain.Term;
 import com.finalist.newsletter.services.CommunityModuleAdapter;
@@ -189,11 +190,20 @@
   }
 
   for (Subscription subscription : subscriptionList) {
- Person subscrier = subscription.getSubscriber();
- int sbId = subscrier.getId().intValue();
- int nId = subscription.getNewsletter().getId();
-
- if (null == subscriptionServices.getSubscription(sbId, nId)) {
+ Person subscrier = new Person();
+ Newsletter newsletter= new Newsletter();
+ int sbId=0;
+ int nId=0;
+ if (null!=subscription) {
+subscrier = subscription.getSubscriber();
+newsletter=subscription.getNewsletter();
+if (null!=subscriernull!=newsletter) {
+   //there will be add method to extend
+   sbId = subscrier.getId().intValue();
+   nId = subscription.getNewsletter().getId();
+}
+ }   
+ if (subscriptionServices.isAbleSubscrip(sbId, nId)null == 
subscriptionServices.getSubscription(sbId, nId)) {
 
 log.debug(String.format(try to import user %s's subscription of 
%s which is not exist, sbId, nId));
 
___
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 NewsletterSubscriptionServices.java

2008-10-30 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
NewsletterSubscriptionServices.java 
Log Message:
CMSC-1110, Import newsletter subscription data gives stacktrace,add validate 
servserce


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


Index: NewsletterSubscriptionServices.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/NewsletterSubscriptionServices.java,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -u -b -r1.18 -r1.18.2.1
--- NewsletterSubscriptionServices.java 23 Sep 2008 10:31:36 -  1.18
+++ NewsletterSubscriptionServices.java 30 Oct 2008 09:09:01 -  1.18.2.1
@@ -1,13 +1,10 @@
 package com.finalist.newsletter.services;
 
-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;
 
 import com.finalist.cmsc.services.community.person.Person;
+import com.finalist.newsletter.domain.Newsletter;
 import com.finalist.newsletter.domain.Subscription;
 
 public interface NewsletterSubscriptionServices {
@@ -60,6 +57,8 @@
 
public Subscription getSubscription(int sbId, int nId);
 
+   public boolean isAbleSubscrip(int sbId, int nId);
+
void unSubscribeAllInNewsletter(int integer);
 
public void createSubscription(int userId, int newsletterId);
@@ -75,4 +74,5 @@
public String getNewsletterNameList(int authenticationId);
 
public String getTermsNameList(int authenticationId);
+   
 }
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

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

2008-10-30 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
NewsletterSubscriptionServicesImpl.java 
Log Message:
CMSC-1110, Import newsletter subscription data gives stacktrace,add validate 
servserce


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


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.26.2.2
retrieving revision 1.26.2.3
diff -u -b -r1.26.2.2 -r1.26.2.3
--- NewsletterSubscriptionServicesImpl.java 24 Oct 2008 02:24:17 -  
1.26.2.2
+++ NewsletterSubscriptionServicesImpl.java 30 Oct 2008 09:09:01 -  
1.26.2.3
@@ -316,7 +316,11 @@
}
 
public Subscription getSubscription(int userId, int newsletterId) {
+  if (isAbleSubscrip(userId,newsletterId)) {
   return subscriptionCAO.getSubscription(newsletterId, userId);
+  }else{
+ return null;
+  }
}
 
public void unSubscribeAllInNewsletter(int newsletterId) {
@@ -399,4 +403,16 @@
   }
   return subscriberIds;
}
+
+   public boolean isAbleSubscrip(int userId, int newsletterId) {
+  
+  if (null == personService.getPersonByUserId(String.valueOf(userId))
+|| null == newsletterService.getNewsletterName(newsletterId)) {
+ return false;
+  } else {
+ return true;
+  }
+   }
+   
+
 }
___
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 SubscriptionImportExportAction.java

2008-10-30 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
SubscriptionImportExportAction.java 
Log Message:
CMSC-1110, Import newsletter subscription data gives stacktrace,add validate 
Xsream Object


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


Index: SubscriptionImportExportAction.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/SubscriptionImportExportAction.java,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -b -r1.10.2.1 -r1.10.2.2
--- SubscriptionImportExportAction.java 29 Oct 2008 07:36:43 -  1.10.2.1
+++ SubscriptionImportExportAction.java 30 Oct 2008 09:11:03 -  1.10.2.2
@@ -4,6 +4,7 @@
 import com.finalist.cmsc.services.community.person.Person;
 import com.finalist.cmsc.services.community.person.PersonService;
 import com.finalist.cmsc.services.community.security.AuthenticationService;
+import com.finalist.newsletter.domain.Newsletter;
 import com.finalist.newsletter.domain.Subscription;
 import com.finalist.newsletter.domain.Term;
 import com.finalist.newsletter.services.CommunityModuleAdapter;
@@ -189,11 +190,20 @@
   }
 
   for (Subscription subscription : subscriptionList) {
- Person subscrier = subscription.getSubscriber();
- int sbId = subscrier.getId().intValue();
- int nId = subscription.getNewsletter().getId();
-
- if (null == subscriptionServices.getSubscription(sbId, nId)) {
+ Person subscrier = new Person();
+ Newsletter newsletter= new Newsletter();
+ int sbId=0;
+ int nId=0;
+ if (null!=subscription) {
+subscrier = subscription.getSubscriber();
+newsletter=subscription.getNewsletter();
+if (null!=subscriernull!=newsletter) {
+   //there will be add method to extend
+   sbId = subscrier.getId().intValue();
+   nId = subscription.getNewsletter().getId();
+}
+ }   
+ if (subscriptionServices.isAbleSubscrip(sbId, nId)null == 
subscriptionServices.getSubscription(sbId, nId)) {
 
 log.debug(String.format(try to import user %s's subscription of 
%s which is not exist, sbId, nId));
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/image ImageTag.java

2008-10-28 Thread nikkoyin

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

Modified Files:
ImageTag.java 
Log Message:
CMSC-829, ImageTag attributes are incorrectly escaped ,Html  Escape


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


Index: ImageTag.java
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/image/ImageTag.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- ImageTag.java   2 Jun 2008 21:51:34 -   1.7
+++ ImageTag.java   29 Oct 2008 04:59:03 -  1.8
@@ -156,6 +156,7 @@
  return  alt=\\;
   }
   alt = org.mmbase.util.transformers.Xml.XMLAttributeEscape(alt, '\');
+  alt = org.mmbase.util.transformers.Xml.XMLEscape(alt);
   return  alt=\ + alt + \ title=\ + alt + \;
}
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/image ImageTag.java

2008-10-28 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
ImageTag.java 
Log Message:
CMSC-829, ImageTag attributes are incorrectly escaped ,Html  Escape


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


Index: ImageTag.java
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/image/ImageTag.java,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -b -r1.7 -r1.7.2.1
--- ImageTag.java   2 Jun 2008 21:51:34 -   1.7
+++ ImageTag.java   29 Oct 2008 05:03:39 -  1.7.2.1
@@ -156,6 +156,7 @@
  return  alt=\\;
   }
   alt = org.mmbase.util.transformers.Xml.XMLAttributeEscape(alt, '\');
+  alt = org.mmbase.util.transformers.Xml.XMLEscape(alt);
   return  alt=\ + alt + \ title=\ + alt + \;
}
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

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

2008-10-24 Thread nikkoyin

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

Modified Files:
NewsletterGenerator.java 
Log Message:
CMSC-1084, Newsletter: sending test email contains empty body,add error 
messages to print out the system live-path use http


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


Index: NewsletterGenerator.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher/NewsletterGenerator.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- NewsletterGenerator.java24 Oct 2008 02:39:50 -  1.16
+++ NewsletterGenerator.java24 Oct 2008 07:59:37 -  1.17
@@ -4,8 +4,6 @@
 import java.io.Reader;
 import java.net.HttpURLConnection;
 import java.net.URL;
-import java.util.regex.Pattern;
-
 import javax.mail.MessagingException;
 
 import org.htmlparser.Parser;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

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

2008-10-23 Thread nikkoyin

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

Modified Files:
NewsletterGenerator.java 
Log Message:
CMSC-1084, Newsletter: sending test email contains empty body,add error 
messages to print out  it uses the system live-path variable


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


Index: NewsletterGenerator.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher/NewsletterGenerator.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- NewsletterGenerator.java22 Oct 2008 08:51:25 -  1.14
+++ NewsletterGenerator.java23 Oct 2008 08:51:47 -  1.15
@@ -32,7 +32,7 @@
  log.debug(Try to get content from URL: + urlPath);
 
  URL url = new URL(urlPath);
- if (!Pattern.matches(^(http  brvbarftp  brvbarfile)://.*,  
urlPath)) {
+ if (!Pattern.matches(http://(\\w+(-\\w+)*)(\\.(\\w+(-\\w+)*))*(\\ 
?\\S*)?$,  urlPath)) {
 errorInfo += the path does not start with http:// ;
  }
  HttpURLConnection connection = (HttpURLConnection) 
url.openConnection();
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

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

2008-10-23 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
NewsletterGenerator.java 
Log Message:
CMSC-1084, Newsletter: sending test email contains empty body,add error 
messages to print out  it uses the system live-path variable


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


Index: NewsletterGenerator.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher/NewsletterGenerator.java,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -b -r1.11.2.1 -r1.11.2.2
--- NewsletterGenerator.java14 Oct 2008 07:46:13 -  1.11.2.1
+++ NewsletterGenerator.java23 Oct 2008 08:54:15 -  1.11.2.2
@@ -4,6 +4,7 @@
 import java.io.Reader;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.util.regex.Pattern;
 
 import javax.mail.MessagingException;
 
@@ -25,11 +26,15 @@
   log.debug(generate newsletter from url: + urlPath);
 
   String inputString = ;
+  String errorInfo=please check the system live-path variable, ;
   try {
 
  log.debug(Try to get content from URL: + urlPath);
 
  URL url = new URL(urlPath);
+ if (!Pattern.matches(http://(\\w+(-\\w+)*)(\\.(\\w+(-\\w+)*))*(\\ 
?\\S*)?$,  urlPath)) {
+errorInfo += the path does not start with http:// ;
+ }
  HttpURLConnection connection = (HttpURLConnection) 
url.openConnection();
 
  connection.setRequestMethod(GET);
@@ -57,7 +62,7 @@
 
  return (inputString);
   } catch (Exception e) {
- log.error(Error when try to get content from + urlPath, e);
+ log.error(Error when try to get content from + urlPath+errorInfo, 
e);
   }
 
   return inputString;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

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

2008-10-23 Thread nikkoyin

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

Modified Files:
NewsletterSubscriptionServicesImpl.java 
Log Message:
CMSC-1097, Opening Newsletter Management first time gives stacktrace,change 
Count to count


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


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.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- NewsletterSubscriptionServicesImpl.java 22 Oct 2008 10:07:47 -  
1.28
+++ NewsletterSubscriptionServicesImpl.java 24 Oct 2008 02:17:33 -  
1.29
@@ -242,7 +242,7 @@
}
 
public int countSubscriptionByNewsletter(int id) {
-  return subscriptionCAO.CountSubscription(id);
+  return subscriptionCAO.countSubscription(id);
}
 
public ListSubscription getAllSubscription() {
___
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 NewsletterSubscriptionCAO.java

2008-10-23 Thread nikkoyin

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

Modified Files:
NewsletterSubscriptionCAO.java 
Log Message:
CMSC-1097, Opening Newsletter Management first time gives stacktrace,change 
Count to count


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


Index: NewsletterSubscriptionCAO.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/NewsletterSubscriptionCAO.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- NewsletterSubscriptionCAO.java  22 Oct 2008 10:07:47 -  1.18
+++ NewsletterSubscriptionCAO.java  24 Oct 2008 02:19:03 -  1.19
@@ -55,6 +55,6 @@
 
public SetNode getTermsByScriptionRecord(int authenticationId);
 
-   public int CountSubscription(int id);
+   public int countSubscription(int id);
 
 }
___
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

2008-10-23 Thread nikkoyin

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

Modified Files:
NewsletterSubscriptionCAOImpl.java 
Log Message:
CMSC-1097, Opening Newsletter Management first time gives stacktrace,change 
Count to count


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


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.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- NewsletterSubscriptionCAOImpl.java  22 Oct 2008 10:07:47 -  1.32
+++ NewsletterSubscriptionCAOImpl.java  24 Oct 2008 02:19:03 -  1.33
@@ -435,7 +435,7 @@
   return subscriptions;
}
 
-   public int CountSubscription(int newsletterId) {
+   public int countSubscription(int newsletterId) {
   ListNode records = 
cloud.getNode(newsletterId).getRelatedNodes(subscriptionrecord);
   log.debug(Get subscriptions of newsletter: + newsletterId +  and get 
 + records.size() +  records in all);
   int subscribers = 0;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

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

2008-10-23 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
NewsletterSubscriptionServicesImpl.java 
Log Message:
CMSC-1097, Opening Newsletter Management first time gives stacktrace,change 
Count to count


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


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.26.2.1
retrieving revision 1.26.2.2
diff -u -b -r1.26.2.1 -r1.26.2.2
--- NewsletterSubscriptionServicesImpl.java 22 Oct 2008 09:50:03 -  
1.26.2.1
+++ NewsletterSubscriptionServicesImpl.java 24 Oct 2008 02:24:17 -  
1.26.2.2
@@ -242,7 +242,7 @@
}
 
public int countSubscriptionByNewsletter(int id) {
-  return subscriptionCAO.CountSubscription(id);
+  return subscriptionCAO.countSubscription(id);
}
 
public ListSubscription getAllSubscription() {
___
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 NewsletterSubscriptionCAO.java

2008-10-23 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
NewsletterSubscriptionCAO.java 
Log Message:
CMSC-1097, Opening Newsletter Management first time gives stacktrace,change 
Count to count


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


Index: NewsletterSubscriptionCAO.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/NewsletterSubscriptionCAO.java,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -u -b -r1.16.2.1 -r1.16.2.2
--- NewsletterSubscriptionCAO.java  22 Oct 2008 09:51:07 -  1.16.2.1
+++ NewsletterSubscriptionCAO.java  24 Oct 2008 02:25:27 -  1.16.2.2
@@ -54,6 +54,6 @@
 
public SetNode getTermsByScriptionRecord(int authenticationId);
 
-   public int CountSubscription(int newsletterId);
+   public int countSubscription(int newsletterId);
 
 }
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

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

2008-10-23 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
NewsletterSubscriptionCAOImpl.java 
Log Message:
CMSC-1097, Opening Newsletter Management first time gives stacktrace,change 
Count to count


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


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.30.2.1
retrieving revision 1.30.2.2
diff -u -b -r1.30.2.1 -r1.30.2.2
--- NewsletterSubscriptionCAOImpl.java  22 Oct 2008 09:51:07 -  1.30.2.1
+++ NewsletterSubscriptionCAOImpl.java  24 Oct 2008 02:25:27 -  1.30.2.2
@@ -435,7 +435,7 @@
   return subscriptions;
}
 
-   public int CountSubscription(int newsletterId) {
+   public int countSubscription(int newsletterId) {
   ListNode records = 
cloud.getNode(newsletterId).getRelatedNodes(subscriptionrecord);
   log.debug(Get subscriptions of newsletter: + newsletterId +  and get 
 + records.size() +  records in all);
   int subscribers = 0;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

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

2008-10-23 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
NewsletterGenerator.java 
Log Message:
CMSC-1084, Newsletter: sending test email contains empty body,add error 
messages to print out the system live-path use http


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


Index: NewsletterGenerator.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher/NewsletterGenerator.java,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -u -b -r1.11.2.2 -r1.11.2.3
--- NewsletterGenerator.java23 Oct 2008 08:54:15 -  1.11.2.2
+++ NewsletterGenerator.java24 Oct 2008 02:36:31 -  1.11.2.3
@@ -32,8 +32,8 @@
  log.debug(Try to get content from URL: + urlPath);
 
  URL url = new URL(urlPath);
- if (!Pattern.matches(http://(\\w+(-\\w+)*)(\\.(\\w+(-\\w+)*))*(\\ 
?\\S*)?$,  urlPath)) {
-errorInfo += the path does not start with http:// ;
+ if (urlPath.indexOf(http)  0) {
+errorInfo += the path does not start with http: ;
  }
  HttpURLConnection connection = (HttpURLConnection) 
url.openConnection();
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

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

2008-10-23 Thread nikkoyin

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

Modified Files:
NewsletterGenerator.java 
Log Message:
CMSC-1084, Newsletter: sending test email contains empty body,add error 
messages to print out the system live-path use http


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


Index: NewsletterGenerator.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher/NewsletterGenerator.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- NewsletterGenerator.java23 Oct 2008 08:51:47 -  1.15
+++ NewsletterGenerator.java24 Oct 2008 02:39:50 -  1.16
@@ -32,7 +32,7 @@
  log.debug(Try to get content from URL: + urlPath);
 
  URL url = new URL(urlPath);
- if (!Pattern.matches(http://(\\w+(-\\w+)*)(\\.(\\w+(-\\w+)*))*(\\ 
?\\S*)?$,  urlPath)) {
+ if (urlPath.indexOf(http)  0) {
 errorInfo += the path does not start with http:// ;
  }
  HttpURLConnection connection = (HttpURLConnection) 
url.openConnection();
___
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 report_newsletter_list.jsp

2008-10-22 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
report_newsletter_list.jsp 
Log Message:
CMSC-1094, All newsletters with their subscriptions list should be ordered,add 
sort element in the jsp


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


Index: report_newsletter_list.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_newsletter_list.jsp,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -b -r1.11 -r1.11.2.1
--- report_newsletter_list.jsp  22 Sep 2008 03:58:21 -  1.11
+++ report_newsletter_list.jsp  22 Oct 2008 06:00:19 -  1.11.2.1
@@ -40,16 +40,16 @@
 edit:ui-tcolumn title= width=5%
input type=checkbox name=ids value=${result.id}/
 /edit:ui-tcolumn
-edit:ui-tcolumn titlekey=newsletteroverview.newsletter 
sort=title width=15%
+edit:ui-tcolumn titlekey=newsletteroverview.newsletter 
sort=title width=15% 
a 
href=SubscriptionManagement.do?action=listSubscriptionnewsletterId=${result.id}${result.title}/a
 /edit:ui-tcolumn
-edit:ui-tcolumn titlekey=globalstats.total.publications 
width=15%
+edit:ui-tcolumn titlekey=globalstats.total.publications 
width=15%  sort=countpublications 
${result.countpublications}
 /edit:ui-tcolumn
-edit:ui-tcolumn titlekey=globalstats.total.sentsubscriptions 
width=15%
+edit:ui-tcolumn titlekey=globalstats.total.sentsubscriptions 
width=15%  sort=countSentPublicatons 
${result.countSentPublicatons}
 /edit:ui-tcolumn
-edit:ui-tcolumn titlekey=globalstats.total.subscriptions 
width=15%
+edit:ui-tcolumn titlekey=globalstats.total.subscriptions 
width=15% sort=countSubscriptions 
${result.countSubscriptions}
 /edit:ui-tcolumn
  /edit:ui-table
___
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 NewsletterBounceUtil.java

2008-10-22 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
NewsletterBounceUtil.java 
Log Message:
CMSC-1095, Newsletter Bounces list should be ordered,add newsletterSort when 
bounceManager can't sort


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


Index: NewsletterBounceUtil.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterBounceUtil.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -b -r1.3 -r1.3.2.1
--- NewsletterBounceUtil.java   4 Aug 2008 03:09:21 -   1.3
+++ NewsletterBounceUtil.java   22 Oct 2008 06:06:37 -  1.3.2.1
@@ -1,7 +1,7 @@
 package com.finalist.newsletter.util;
 
 import java.util.ArrayList;
-import java.util.Date;
+import java.util.Collections;
 import java.util.List;
 
 import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
@@ -13,6 +13,7 @@
 import org.mmbase.bridge.NodeList;
 import org.mmbase.bridge.NodeManager;
 import org.mmbase.bridge.NodeQuery;
+import org.mmbase.bridge.util.Queries;
 import org.mmbase.bridge.util.SearchUtil;
 
 import com.finalist.newsletter.domain.NewsletterBounce;
@@ -22,58 +23,80 @@

private static Log log = LogFactory.getLog(NewsletterBounceUtil.class);
 
-   public static ListNewsletterBounce getBounceRecord(int offset,int 
pageSize){
+   public static ListNewsletterBounce getBounceRecord(int offset, int 
pageSize, String order, String direction) {
   ListNewsletterBounce bounces = new ArrayListNewsletterBounce();
   Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
   NodeManager bounceManager = cloud.getNodeManager(newsletterbounce);
   NodeQuery query = bounceManager.createQuery();
+  if (null == order || bounceManager.hasField(order)) {
   query.setMaxNumber(pageSize);
   query.setOffset(offset);
+ Queries.addSortOrders(query, order, direction);
+  }
   NodeList bounceNodes = query.getList();
   bounces = convertNodeListToList(bounceNodes);
+  if (null != order  !bounceManager.hasField(order)) {
+ bounces = nesletterSort(bounces, offset, pageSize, direction, order);
+  }
+  return bounces;
+   }
+
+   private static ListNewsletterBounce nesletterSort(ListNewsletterBounce 
bounces, int offset, int pageSize,
+ String direction, String order) {
+  ComparisonUtil comparator = new ComparisonUtil();
+  comparator.setFields_user(new String[] { order });
+  Collections.sort(bounces, comparator);
+  if (down.equals(direction)) {
+ Collections.reverse(bounces);
+  }
+  if (pageSize + offset  bounces.size()) {
+ bounces = bounces.subList(offset, pageSize + offset);
+  } else {
+ bounces = bounces.subList(offset, bounces.size());
+  }
   return bounces;
}

public static int getTotalCount() {
   Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
   NodeList bounces = SearchUtil.findNodeList(cloud, newsletterbounce);
-  if(bounces != null) {
+  if (bounces != null) {
  return bounces.size();
   }
   return (0);
}

public static ListNewsletterBounce convertNodeListToList(NodeList 
bounceNodes) {
-  if(bounceNodes == null || bounceNodes.size() 1){
+  if (bounceNodes == null || bounceNodes.size()  1) {
  return null;
   }
   ListNewsletterBounce bounces = new ArrayListNewsletterBounce();
-  for(int i = 0 ; i  bounceNodes.size() ; i++) {
+  for (int i = 0; i  bounceNodes.size(); i++) {
  Node bounceNode = bounceNodes.getNode(i);
- if(bounceNode == null){
+ if (bounceNode == null) {
 continue;
  }
  NewsletterBounce bounce = new NewsletterBounce();
- copyProperties(bounceNode,bounce);
+ copyProperties(bounceNode, bounce);
  bounces.add(bounce);
   }
   return bounces;
}

-   public static void copyProperties(Node srcBounceNode,NewsletterBounce 
desBounce){
+   public static void copyProperties(Node srcBounceNode, NewsletterBounce 
desBounce) {
 
   Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
   desBounce.setId(srcBounceNode.getNumber());
   desBounce.setNewsletterId(srcBounceNode.getIntValue(newsletter));
   desBounce.setUserId(srcBounceNode.getIntValue(userid));
 
-  if(srcBounceNode.getIntValue(newsletter)  0){
+  if (srcBounceNode.getIntValue(newsletter)  0) {
  Node publicationNode = 
cloud.getNode(srcBounceNode.getIntValue(newsletter));

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

2008-10-22 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
NewsletterBounceAction.java 
Log Message:
CMSC-1095, Newsletter Bounces list should be ordered,add paramater oder and 
direction


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


Index: NewsletterBounceAction.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterBounceAction.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -b -r1.3 -r1.3.2.1
--- NewsletterBounceAction.java 22 Sep 2008 07:53:42 -  1.3
+++ NewsletterBounceAction.java 22 Oct 2008 06:08:18 -  1.3.2.1
@@ -6,8 +6,6 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
@@ -19,27 +17,32 @@
 
 public class NewsletterBounceAction  extends DispatchAction {
 
-   public ActionForward list (ActionMapping mapping, ActionForm form, 
HttpServletRequest request, HttpServletResponse response)
- throws Exception {
+   public ActionForward list(ActionMapping mapping, ActionForm form, 
HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
   int pageSize = 12;
   int offset = 0;
   if 
(StringUtils.isNotEmpty(PropertiesUtil.getProperty(repository.search.results.per.page)))
 {
  pageSize = 
Integer.parseInt(PropertiesUtil.getProperty(repository.search.results.per.page));
   }
   String strOffset  = request.getParameter(offset);
+  String direction = request.getParameter(direction);
+  String order = request.getParameter(order);
   if (StringUtils.isNotEmpty(strOffset)) {
  offset = Integer.parseInt(strOffset);
   }
-  List  NewsletterBounce  bounces =  
NewsletterBounceUtil.getBounceRecord(offset * pageSize, pageSize);
+  ListNewsletterBounce bounces = 
NewsletterBounceUtil.getBounceRecord(offset * pageSize, pageSize, order,
+direction);
   int count = NewsletterBounceUtil.getTotalCount();
   request.setAttribute(resultList, bounces);
   request.setAttribute(resultCount, count);
   request.setAttribute(offset, offset);
+  request.setAttribute(direction, direction);
+  request.setAttribute(order, order);
   return mapping.findForward(success);
}
 
-public ActionForward getItem(ActionMapping mapping, ActionForm form, 
HttpServletRequest request, HttpServletResponse response)
-throws Exception {
+   public ActionForward getItem(ActionMapping mapping, ActionForm form, 
HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
String number  = request.getParameter(objectnumber);   
NewsletterBounce bounce = 
NewsletterBounceUtil.getNewsletterBounce(Integer.parseInt(number));
request.setAttribute(bounce, bounce);
___
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 newsletterbouncelist.jsp

2008-10-22 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
newsletterbouncelist.jsp 
Log Message:
CMSC-1095, Newsletter Bounces list should be ordered,move paging javascript to 
newsletter.js


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


Index: newsletterbouncelist.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/newsletterbouncelist.jsp,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -b -r1.3 -r1.3.2.1
--- newsletterbouncelist.jsp8 Sep 2008 07:46:48 -   1.3
+++ newsletterbouncelist.jsp22 Oct 2008 06:09:50 -  1.3.2.1
@@ -6,15 +6,7 @@
 html:html xhtml=true
 cmscedit:head title=newsletter.bounce.title
 c:url var=actionUrl 
value=/editors/newsletter/module/NewsletterBounceAction.do/
-script type=text/javascript
- function setOffset(offset) {
-document.forms[0].offset.value = offset;
-document.forms[0].submit();
- }
- function showItem(objectnumber) {
-openPopupWindow(showItem, 500, 500, 
'NewsletterBounceAction.do?method=getItemobjectnumber=' + objectnumber);
-}
-/script
+script type=text/javascript src=../newsletter.js/script
 /cmscedit:head
 body
 mm:cloud jspvar=cloud rank=basic user loginpage=../../login.jsp
@@ -33,17 +25,21 @@
 form action=${actionUrl} name=termForm method=post
 input type=hidden name=method value=list/
 input type=hidden name=offset value=${offset}/
+input type=hidden name=direction value=${direction}/
+input type=hidden name=order value=${order}/
 
 mm:import jspvar=resultCount vartype=Integer${resultCount}/mm:import
 mm:import externid=offset jspvar=offset 
vartype=Integer${offset}/mm:import
+mm:import externid=direction jspvar=direction 
vartype=String${direction}/mm:import
+mm:import externid=order jspvar=order 
vartype=String${order}/mm:import
 c:if test=${resultCount  0}
 [EMAIL PROTECTED] file=../../repository/searchpages.jsp %
table
   tr class=listheader
- th fmt:message key=newsletter.bounce.subscriber / /th
- thfmt:message key=newsletter.bounce.newsletter //th
- thfmt:message key=newsletter.bounce.bouncedate //th
- thfmt:message key=newsletter.bounce.bouncecontent //th
+ tha href=javascript:sortBy('userName') fmt:message 
key=newsletter.bounce.subscriber //a /th
+ tha href=javascript:sortBy('newsLetterTitle')fmt:message 
key=newsletter.bounce.newsletter //a/th
+ tha href=javascript:sortBy('bouncedate')fmt:message 
key=newsletter.bounce.bouncedate //a/th
+ tha href=javascript:sortBy('content')fmt:message 
key=newsletter.bounce.bouncecontent //a/th
   /tr
   tbody class=hover
 c:set var=useSwapStyletrue/c:set
___
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 newsletter.js

2008-10-22 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
newsletter.js 
Log Message:
CMSC-1095, Newsletter Bounces list should be ordered,add paging sortBy function 
in newsletter.js


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


Index: newsletter.js
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/newsletter.js,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -b -r1.3 -r1.3.2.1
--- newsletter.js   31 Jul 2008 10:56:31 -  1.3
+++ newsletter.js   22 Oct 2008 06:11:25 -  1.3.2.1
@@ -18,3 +18,32 @@
 }
 }   
 }
\ No newline at end of file
+
+function setOffset(offset) {
+document.forms[0].offset.value = offset;
+document.forms[0].submit();
+ }
+ function showItem(objectnumber) {
+openPopupWindow(showItem, 500, 500, 
'NewsletterBounceAction.do?method=getItemobjectnumber=' + objectnumber);
+}
+ function sortBy(orderColumn){
+var offset = document.forms[0].offset.value;
+var oldOrderColumn = document.forms[0].order.value;
+
+if (oldOrderColumn == orderColumn) {
+// order column is not changed so change direction
+var oldDirection = document.forms[0].direction.value;
+
+if (oldDirection == 'down') {
+document.forms[0].direction.value = 'up';
+}
+else {
+document.forms[0].direction.value = 'down';
+}
+}
+else {
+document.forms[0].order.value = orderColumn;
+document.forms[0].direction.value = 'down';
+}
+document.forms[0].submit();
+}
\ 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/cao/impl NewsletterCAOImpl.java

2008-10-22 Thread nikkoyin

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

Modified Files:
NewsletterCAOImpl.java 
Log Message:
CMSC-1094, All newsletters with their subscriptions list should be 
ordered,check if nodeManager can order


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


Index: NewsletterCAOImpl.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterCAOImpl.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- NewsletterCAOImpl.java  14 Oct 2008 11:22:44 -  1.24
+++ NewsletterCAOImpl.java  22 Oct 2008 06:41:05 -  1.25
@@ -39,7 +39,8 @@
   return MMBaseNodeMapper.convertList(list, Term.class);
}
 
-   public ListNewsletter getNewsletterByConstraint(String property, String 
constraintType, String value, boolean paging) {
+   public ListNewsletter getNewsletterByConstraint(String property, String 
constraintType, String value,
+ boolean paging) {
   PagingStatusHolder pagingHolder = PagingUtils.getStatusHolder();
   NodeQuery query = cloud.createNodeQuery();
   NodeManager nodeManager = cloud.getNodeManager(newsletter);
@@ -50,13 +51,16 @@
 SearchUtil.addLikeConstraint(query, 
nodeManager.getField(property), value);
  }
   }
+  if (pagingHolder != null  
nodeManager.hasField(pagingHolder.getSort())) {
+ Queries.addSortOrders(query, pagingHolder.getSort(), 
pagingHolder.getMMBaseDirection());
+  } else if (null != pagingHolder.getSort()) {
+ paging = false;
+  }
   if (paging) {
  query.setMaxNumber(pagingHolder.getPageSize());
  query.setOffset(pagingHolder.getOffset());
   }
-  if (pagingHolder != null) {
- Queries.addSortOrders(query, pagingHolder.getSort(), 
pagingHolder.getMMBaseDirection());
-  }
+
   NodeList list = query.getList();
   return MMBaseNodeMapper.convertList(list, Newsletter.class);
}
@@ -109,7 +113,8 @@
   NodeQuery query = cloud.createNodeQuery();
   Step newsletterStep = query.addStep(newsletterNodeManager);
   query.setNodeStep(newsletterStep);
-  Constraint idConstraint = SearchUtil.createEqualConstraint(query, 
newsletterNodeManager.getField(number), newsletterId);
+  Constraint idConstraint = SearchUtil.createEqualConstraint(query, 
newsletterNodeManager.getField(number),
+newsletterId);
   SearchUtil.addConstraint(query, idConstraint);
 
   RelationStep relationStep = query.addRelationStep(termNodeManager, 
posrel, destination);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

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

2008-10-22 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
NewsletterCAOImpl.java 
Log Message:
CMSC-1094, All newsletters with their subscriptions list should be 
ordered,check if nodeManager can order


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


Index: NewsletterCAOImpl.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterCAOImpl.java,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -u -b -r1.23 -r1.23.2.1
--- NewsletterCAOImpl.java  23 Sep 2008 10:31:36 -  1.23
+++ NewsletterCAOImpl.java  22 Oct 2008 06:45:59 -  1.23.2.1
@@ -39,7 +39,8 @@
   return MMBaseNodeMapper.convertList(list, Term.class);
}
 
-   public ListNewsletter getNewsletterByConstraint(String property, String 
constraintType, String value, boolean paging) {
+   public ListNewsletter getNewsletterByConstraint(String property, String 
constraintType, String value,
+ boolean paging) {
   PagingStatusHolder pagingHolder = PagingUtils.getStatusHolder();
   NodeQuery query = cloud.createNodeQuery();
   NodeManager nodeManager = cloud.getNodeManager(newsletter);
@@ -50,13 +51,16 @@
 SearchUtil.addLikeConstraint(query, 
nodeManager.getField(property), value);
  }
   }
+  if (pagingHolder != null  
nodeManager.hasField(pagingHolder.getSort())) {
+ Queries.addSortOrders(query, pagingHolder.getSort(), 
pagingHolder.getMMBaseDirection());
+  } else if (null != pagingHolder.getSort()) {
+ paging = false;
+  }
   if (paging) {
  query.setMaxNumber(pagingHolder.getPageSize());
  query.setOffset(pagingHolder.getOffset());
   }
-  if (pagingHolder != null) {  
- Queries.addSortOrders(query, pagingHolder.getSort(), 
pagingHolder.getMMBaseDirection());
-  }
+
   NodeList list = query.getList();
   return MMBaseNodeMapper.convertList(list, Newsletter.class);
}
@@ -109,7 +113,8 @@
   NodeQuery query = cloud.createNodeQuery();
   Step newsletterStep = query.addStep(newsletterNodeManager);
   query.setNodeStep(newsletterStep);
-  Constraint idConstraint = SearchUtil.createEqualConstraint(query, 
newsletterNodeManager.getField(number), newsletterId);
+  Constraint idConstraint = SearchUtil.createEqualConstraint(query, 
newsletterNodeManager.getField(number),
+newsletterId);
   SearchUtil.addConstraint(query, idConstraint);
 
   RelationStep relationStep = query.addRelationStep(termNodeManager, 
posrel, destination);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

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

2008-10-22 Thread nikkoyin

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

Modified Files:
NewsletterGenerator.java 
Log Message:
CMSC-1084, Newsletter: sending test email contains empty body,add error 
messages to print out  it uses the system live-path variable


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


Index: NewsletterGenerator.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher/NewsletterGenerator.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- NewsletterGenerator.java14 Oct 2008 11:22:44 -  1.13
+++ NewsletterGenerator.java22 Oct 2008 08:51:25 -  1.14
@@ -4,6 +4,7 @@
 import java.io.Reader;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.util.regex.Pattern;
 
 import javax.mail.MessagingException;
 
@@ -25,11 +26,15 @@
   log.debug(generate newsletter from url: + urlPath);
 
   String inputString = ;
+  String errorInfo=please check the system live-path variable, ;
   try {
 
  log.debug(Try to get content from URL: + urlPath);
 
  URL url = new URL(urlPath);
+ if (!Pattern.matches(^(http  brvbarftp  brvbarfile)://.*,  
urlPath)) {
+errorInfo += the path does not start with http:// ;
+ }
  HttpURLConnection connection = (HttpURLConnection) 
url.openConnection();
 
  connection.setRequestMethod(GET);
@@ -57,7 +62,7 @@
 
  return (inputString);
   } catch (Exception e) {
- log.error(Error when try to get content from + urlPath, e);
+ log.error(Error when try to get content from + urlPath+errorInfo, 
e);
   }
 
   return inputString;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

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

2008-10-22 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
NewsletterSubscriptionServicesImpl.java 
Log Message:
CMSC-1097, Opening Newsletter Management first time gives stacktrace,add 
CountSubscription


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


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.26
retrieving revision 1.26.2.1
diff -u -b -r1.26 -r1.26.2.1
--- NewsletterSubscriptionServicesImpl.java 23 Sep 2008 10:31:36 -  
1.26
+++ NewsletterSubscriptionServicesImpl.java 22 Oct 2008 09:50:03 -  
1.26.2.1
@@ -242,7 +242,7 @@
}
 
public int countSubscriptionByNewsletter(int id) {
-  return subscriptionCAO.getSubscription(id).size();
+  return subscriptionCAO.CountSubscription(id);
}
 
public ListSubscription getAllSubscription() {
___
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 NewsletterSubscriptionCAO.java

2008-10-22 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
NewsletterSubscriptionCAO.java 
Log Message:
CMSC-1097, Opening Newsletter Management first time gives stacktrace,add 
CountSubscription


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


Index: NewsletterSubscriptionCAO.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/NewsletterSubscriptionCAO.java,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -u -b -r1.16 -r1.16.2.1
--- NewsletterSubscriptionCAO.java  12 Aug 2008 11:00:43 -  1.16
+++ NewsletterSubscriptionCAO.java  22 Oct 2008 09:51:07 -  1.16.2.1
@@ -54,4 +54,6 @@
 
public SetNode getTermsByScriptionRecord(int authenticationId);
 
+   public int CountSubscription(int newsletterId);
+
 }
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

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

2008-10-22 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
NewsletterSubscriptionCAOImpl.java 
Log Message:
CMSC-1097, Opening Newsletter Management first time gives stacktrace,add 
CountSubscription


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


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.30
retrieving revision 1.30.2.1
diff -u -b -r1.30 -r1.30.2.1
--- NewsletterSubscriptionCAOImpl.java  23 Sep 2008 10:31:36 -  1.30
+++ NewsletterSubscriptionCAOImpl.java  22 Oct 2008 09:51:07 -  1.30.2.1
@@ -434,4 +434,17 @@
 
   return subscriptions;
}
+
+   public int CountSubscription(int newsletterId) {
+  ListNode records = 
cloud.getNode(newsletterId).getRelatedNodes(subscriptionrecord);
+  log.debug(Get subscriptions of newsletter: + newsletterId +  and get 
 + records.size() +  records in all);
+  int subscribers = 0;
+  for (Node record : records) {
+ String status = record.getStringValue(status);
+ if (STATUS.ACTIVE.equals(STATUS.valueOf(status))) {
+subscribers++;
+ }
+  }
+  return subscribers;
+   }
 }
___
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

2008-10-22 Thread nikkoyin

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

Modified Files:
NewsletterSubscriptionCAOImpl.java 
Log Message:
CMSC-1097, Opening Newsletter Management first time gives stacktrace,add 
CountSubscription


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


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.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- NewsletterSubscriptionCAOImpl.java  14 Oct 2008 11:22:44 -  1.31
+++ NewsletterSubscriptionCAOImpl.java  22 Oct 2008 10:07:47 -  1.32
@@ -434,4 +434,17 @@
 
   return subscriptions;
}
+
+   public int CountSubscription(int newsletterId) {
+  ListNode records = 
cloud.getNode(newsletterId).getRelatedNodes(subscriptionrecord);
+  log.debug(Get subscriptions of newsletter: + newsletterId +  and get 
 + records.size() +  records in all);
+  int subscribers = 0;
+  for (Node record : records) {
+ String status = record.getStringValue(status);
+ if (STATUS.ACTIVE.equals(STATUS.valueOf(status))) {
+subscribers++;
+ }
+  }
+  return subscribers;
+   }
 }
___
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 NewsletterSubscriptionCAO.java

2008-10-22 Thread nikkoyin

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

Modified Files:
NewsletterSubscriptionCAO.java 
Log Message:
CMSC-1097, Opening Newsletter Management first time gives stacktrace,add 
CountSubscription


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


Index: NewsletterSubscriptionCAO.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/NewsletterSubscriptionCAO.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- NewsletterSubscriptionCAO.java  14 Oct 2008 11:22:44 -  1.17
+++ NewsletterSubscriptionCAO.java  22 Oct 2008 10:07:47 -  1.18
@@ -55,4 +55,6 @@
 
public SetNode getTermsByScriptionRecord(int authenticationId);
 
+   public int CountSubscription(int id);
+
 }
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

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

2008-10-22 Thread nikkoyin

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

Modified Files:
NewsletterSubscriptionServicesImpl.java 
Log Message:
CMSC-1097, Opening Newsletter Management first time gives stacktrace,add 
CountSubscription


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


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.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- NewsletterSubscriptionServicesImpl.java 14 Oct 2008 11:22:44 -  
1.27
+++ NewsletterSubscriptionServicesImpl.java 22 Oct 2008 10:07:47 -  
1.28
@@ -242,7 +242,7 @@
}
 
public int countSubscriptionByNewsletter(int id) {
-  return subscriptionCAO.getSubscription(id).size();
+  return subscriptionCAO.CountSubscription(id);
}
 
public ListSubscription getAllSubscription() {
@@ -264,11 +264,11 @@
   return subscriptionCAO.getSubscription(Integer.parseInt(newsletterId));
}
 
-   public SetNewsletter getNewslettersBySubscription(int subscriberId, 
String title, boolean paging) {
+   public SetNewsletter getNewslettersBySubscription(int subscriberId, 
String title, boolean paging){
   log.debug(Get Subscriptions of subscriberId + subscriberId);
   ListNewsletter newsletters = 
subscriptionCAO.getNewslettersByScription(subscriberId, title, paging);
   SetNewsletter results = new HashSetNewsletter();
-  for (Newsletter newsletter : newsletters) {
+  for(Newsletter newsletter: newsletters){
  String status = subscriptionCAO.getSubscription(newsletter.getId(), 
subscriberId).getStatus().toString();
  newsletter.setStatus(status);
  results.add(newsletter);
@@ -385,7 +385,7 @@
public SetLong getAuthenticationIdsByNewsletter(int newsletterId) {
   ListSubscription subscriptions = 
subscriptionCAO.getSubscription(newsletterId);
   SetLong subscriberIds = new HashSetLong();
-  for (Subscription subscription : subscriptions) {
+  for(Subscription subscription: subscriptions){
  subscriberIds.add(new 
Long(Integer.parseInt(subscription.getSubscriberId(;
   }
   return subscriberIds;
@@ -394,7 +394,7 @@
public SetLong getAuthenticationIds() {
   ListNode subscriptions = subscriptionCAO.getAllSubscriptions();
   SetLong subscriberIds = new HashSetLong();
-  for (Node subscription : subscriptions) {
+  for(Node subscription: subscriptions){
  subscriberIds.add(new Long(subscription.getIntValue(subscriber)));
   }
   return subscriberIds;
___
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 ComparisonUtil.java

2008-10-21 Thread nikkoyin

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

Added Files:
ComparisonUtil.java 
Log Message:
CMSC-1094, All newsletters with their subscriptions list should be ordered,add 
comparison


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


ComparisonUtil.java is new

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

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

2008-10-21 Thread nikkoyin

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

Modified Files:
SubscriptioManagementAction.java 
Log Message:
CMSC-1094, All newsletters with their subscriptions list should be ordered,add 
convertToOderedMap and pseudoRanking


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


Index: SubscriptioManagementAction.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/SubscriptioManagementAction.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- SubscriptioManagementAction.java14 Oct 2008 11:22:43 -  1.14
+++ SubscriptioManagementAction.java22 Oct 2008 05:19:44 -  1.15
@@ -1,6 +1,8 @@
 package com.finalist.newsletter.forms;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
@@ -19,6 +21,7 @@
 import org.apache.struts.action.ActionMapping;
 import org.springframework.web.struts.DispatchActionSupport;
 
+import com.finalist.cmsc.paging.PagingStatusHolder;
 import com.finalist.cmsc.paging.PagingUtils;
 import com.finalist.cmsc.services.community.person.PersonService;
 import com.finalist.newsletter.domain.Newsletter;
@@ -26,6 +29,7 @@
 import com.finalist.newsletter.services.NewsletterService;
 import com.finalist.newsletter.services.NewsletterSubscriptionServices;
 import com.finalist.newsletter.services.SubscriptionHibernateService;
+import com.finalist.newsletter.util.ComparisonUtil;
 
 /**
  * @author Lisa
@@ -66,7 +70,8 @@
protected void onInit() {
   super.onInit();
   newsletterService = (NewsletterService) 
getWebApplicationContext().getBean(newsletterServices);
-  subscriptionServices = (NewsletterSubscriptionServices) 
getWebApplicationContext().getBean(subscriptionServices);
+  subscriptionServices = (NewsletterSubscriptionServices) 
getWebApplicationContext()
+.getBean(subscriptionServices);
   personServices = (PersonService) 
getWebApplicationContext().getBean(personService);
   publicationService = (NewsletterPublicationService) 
getWebApplicationContext().getBean(publicationService);
   subscriptionHService = (SubscriptionHibernateService) 
getWebApplicationContext().getBean(subscriptionHService);
@@ -106,11 +111,11 @@
   PagingUtils.initStatusHolder(request);
   String title = request.getParameter(PARAM_TITLE);
   String subscriber = request.getParameter(PARAM_SUBSCRIBER);
-
   int resultCount = newsletterService.getNewsletters(subscriber, title, 
false).size();
-  ListNewsletter newsletters = 
newsletterService.getNewsletters(subscriber, title, true);
-  ListMapObject, Object results = convertToMap(newsletters);
-
+  ListNewsletter newsletters;
+  ListMapObject, Object results;
+  newsletters = newsletterService.getNewsletters(subscriber, title, true);
+  results = convertToOderedMap(newsletters);
   request.setAttribute(RESULTS, results);
   request.setAttribute(RESULTCOUNT, resultCount);
   return mapping.findForward(FORWARD_OVERVIEW);
@@ -149,9 +154,12 @@
/**
 * get newsletter related newsletter subscription information List
 *
-* @param newsletterId subscribed newsletter's Id
-* @param name subscriber's name
-* @param emailsubscriber's email address
+* @param newsletterId
+*   subscribed newsletter's Id
+* @param name
+*   subscriber's name
+* @param email
+*   subscriber's email address
 * @return newsletter subscription list with information subscriber's user 
name, email address, authenticationId,user
 * name,
 */
@@ -175,7 +183,8 @@
/**
 * convert related information to Map
 *
-* @param results  result list with information of newsletter 
subscription
+* @param results
+*   result list with information of newsletter subscription
 * @param fullName
 * @param userName
 * @param email
@@ -296,4 +305,33 @@
   }
   return results;
}
+
+   private ListMapObject, Object convertToOderedMap(ListNewsletter 
newsletters) {
+  ListMapObject, Object results = convertToMap(newsletters);
+  PagingStatusHolder pagingHolder = PagingUtils.getStatusHolder();
+  String order = pagingHolder.getSort();
+  if (!title.equals(order)  null != order) {
+ results = pseudoRanking(results, pagingHolder, order);
+  }
+  return results;
+   }
+
+   private ListMapObject, Object pseudoRanking(ListMapObject, Object 
results, PagingStatusHolder

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

2008-10-21 Thread nikkoyin

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

Modified Files:
report_newsletter_list.jsp 
Log Message:
CMSC-1094, All newsletters with their subscriptions list should be ordered,add 
sort element in the jsp


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


Index: report_newsletter_list.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_newsletter_list.jsp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- report_newsletter_list.jsp  22 Sep 2008 03:58:21 -  1.11
+++ report_newsletter_list.jsp  22 Oct 2008 05:24:20 -  1.12
@@ -40,16 +40,16 @@
 edit:ui-tcolumn title= width=5%
input type=checkbox name=ids value=${result.id}/
 /edit:ui-tcolumn
-edit:ui-tcolumn titlekey=newsletteroverview.newsletter 
sort=title width=15%
+edit:ui-tcolumn titlekey=newsletteroverview.newsletter 
sort=title width=15% 
a 
href=SubscriptionManagement.do?action=listSubscriptionnewsletterId=${result.id}${result.title}/a
 /edit:ui-tcolumn
-edit:ui-tcolumn titlekey=globalstats.total.publications 
width=15%
+edit:ui-tcolumn titlekey=globalstats.total.publications 
width=15%  sort=countpublications 
${result.countpublications}
 /edit:ui-tcolumn
-edit:ui-tcolumn titlekey=globalstats.total.sentsubscriptions 
width=15%
+edit:ui-tcolumn titlekey=globalstats.total.sentsubscriptions 
width=15%  sort=countSentPublicatons 
${result.countSentPublicatons}
 /edit:ui-tcolumn
-edit:ui-tcolumn titlekey=globalstats.total.subscriptions 
width=15%
+edit:ui-tcolumn titlekey=globalstats.total.subscriptions 
width=15% sort=countSubscriptions 
${result.countSubscriptions}
 /edit:ui-tcolumn
  /edit:ui-table
___
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 NewsletterBounceUtil.java

2008-10-21 Thread nikkoyin

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

Modified Files:
NewsletterBounceUtil.java 
Log Message:
CMSC-1095, Newsletter Bounces list should be ordered,add newsletterSort when 
bounceManager can't sort


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


Index: NewsletterBounceUtil.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterBounceUtil.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- NewsletterBounceUtil.java   14 Oct 2008 11:22:44 -  1.4
+++ NewsletterBounceUtil.java   22 Oct 2008 05:32:07 -  1.5
@@ -1,7 +1,7 @@
 package com.finalist.newsletter.util;
 
 import java.util.ArrayList;
-import java.util.Date;
+import java.util.Collections;
 import java.util.List;
 
 import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
@@ -13,6 +13,7 @@
 import org.mmbase.bridge.NodeList;
 import org.mmbase.bridge.NodeManager;
 import org.mmbase.bridge.NodeQuery;
+import org.mmbase.bridge.util.Queries;
 import org.mmbase.bridge.util.SearchUtil;
 
 import com.finalist.newsletter.domain.NewsletterBounce;
@@ -22,15 +23,37 @@
 
private static Log log = LogFactory.getLog(NewsletterBounceUtil.class);
 
-   public static ListNewsletterBounce getBounceRecord(int offset, int 
pageSize) {
+   public static ListNewsletterBounce getBounceRecord(int offset, int 
pageSize, String order, String direction) {
   ListNewsletterBounce bounces = new ArrayListNewsletterBounce();
   Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
   NodeManager bounceManager = cloud.getNodeManager(newsletterbounce);
   NodeQuery query = bounceManager.createQuery();
+  if (null == order || bounceManager.hasField(order)) {
   query.setMaxNumber(pageSize);
   query.setOffset(offset);
+ Queries.addSortOrders(query, order, direction);
+  }
   NodeList bounceNodes = query.getList();
   bounces = convertNodeListToList(bounceNodes);
+  if (null != order  !bounceManager.hasField(order)) {
+ bounces = nesletterSort(bounces, offset, pageSize, direction, order);
+  }
+  return bounces;
+   }
+
+   private static ListNewsletterBounce nesletterSort(ListNewsletterBounce 
bounces, int offset, int pageSize,
+ String direction, String order) {
+  ComparisonUtil comparator = new ComparisonUtil();
+  comparator.setFields_user(new String[] { order });
+  Collections.sort(bounces, comparator);
+  if (down.equals(direction)) {
+ Collections.reverse(bounces);
+  }
+  if (pageSize + offset  bounces.size()) {
+ bounces = bounces.subList(offset, pageSize + offset);
+  } else {
+ bounces = bounces.subList(offset, bounces.size());
+  }
   return bounces;
}
 
___
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 NewsletterBounceAction.java

2008-10-21 Thread nikkoyin

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

Modified Files:
NewsletterBounceAction.java 
Log Message:
CMSC-1095, Newsletter Bounces list should be ordered,add paramater oder and 
direction


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


Index: NewsletterBounceAction.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterBounceAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- NewsletterBounceAction.java 14 Oct 2008 11:22:43 -  1.4
+++ NewsletterBounceAction.java 22 Oct 2008 05:35:01 -  1.5
@@ -6,8 +6,6 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
@@ -19,27 +17,32 @@
 
 public class NewsletterBounceAction extends DispatchAction {
 
-   public ActionForward list(ActionMapping mapping, ActionForm form, 
HttpServletRequest request, HttpServletResponse response)
-throws Exception {
+   public ActionForward list(ActionMapping mapping, ActionForm form, 
HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
   int pageSize = 12;
   int offset = 0;
   if 
(StringUtils.isNotEmpty(PropertiesUtil.getProperty(repository.search.results.per.page)))
 {
  pageSize = 
Integer.parseInt(PropertiesUtil.getProperty(repository.search.results.per.page));
   }
   String strOffset = request.getParameter(offset);
+  String direction = request.getParameter(direction);
+  String order = request.getParameter(order);
   if (StringUtils.isNotEmpty(strOffset)) {
  offset = Integer.parseInt(strOffset);
   }
-  ListNewsletterBounce bounces = 
NewsletterBounceUtil.getBounceRecord(offset * pageSize, pageSize);
+  ListNewsletterBounce bounces = 
NewsletterBounceUtil.getBounceRecord(offset * pageSize, pageSize, order,
+direction);
   int count = NewsletterBounceUtil.getTotalCount();
   request.setAttribute(resultList, bounces);
   request.setAttribute(resultCount, count);
   request.setAttribute(offset, offset);
+  request.setAttribute(direction, direction);
+  request.setAttribute(order, order);
   return mapping.findForward(success);
}
 
-   public ActionForward getItem(ActionMapping mapping, ActionForm form, 
HttpServletRequest request, HttpServletResponse response)
-throws Exception {
+   public ActionForward getItem(ActionMapping mapping, ActionForm form, 
HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
   String number = request.getParameter(objectnumber);
   NewsletterBounce bounce = 
NewsletterBounceUtil.getNewsletterBounce(Integer.parseInt(number));
   request.setAttribute(bounce, bounce);
___
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 newsletter.js

2008-10-21 Thread nikkoyin

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

Modified Files:
newsletter.js 
Log Message:
CMSC-1095, Newsletter Bounces list should be ordered,add paging sortBy function 
in newsletter.js


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


Index: newsletter.js
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/newsletter.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- newsletter.js   31 Jul 2008 10:56:31 -  1.3
+++ newsletter.js   22 Oct 2008 05:39:34 -  1.4
@@ -18,3 +18,32 @@
 }
 }   
 }
\ No newline at end of file
+
+function setOffset(offset) {
+document.forms[0].offset.value = offset;
+document.forms[0].submit();
+ }
+ function showItem(objectnumber) {
+openPopupWindow(showItem, 500, 500, 
'NewsletterBounceAction.do?method=getItemobjectnumber=' + objectnumber);
+}
+ function sortBy(orderColumn){
+var offset = document.forms[0].offset.value;
+var oldOrderColumn = document.forms[0].order.value;
+
+if (oldOrderColumn == orderColumn) {
+// order column is not changed so change direction
+var oldDirection = document.forms[0].direction.value;
+
+if (oldDirection == 'down') {
+document.forms[0].direction.value = 'up';
+}
+else {
+document.forms[0].direction.value = 'down';
+}
+}
+else {
+document.forms[0].order.value = orderColumn;
+document.forms[0].direction.value = 'down';
+}
+document.forms[0].submit();
+}
\ 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/util ComparisonUtil.java

2008-10-21 Thread nikkoyin

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

Added Files:
  Tag: b1_5
ComparisonUtil.java 
Log Message:
CMSC-1094, All newsletters with their subscriptions list should be ordered,add 
comparison


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


ComparisonUtil.java is new

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

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

2008-10-21 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
SubscriptioManagementAction.java 
Log Message:
CMSC-1094, All newsletters with their subscriptions list should be ordered,add 
convertToOderedMap and pseudoRanking


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


Index: SubscriptioManagementAction.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/SubscriptioManagementAction.java,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -b -r1.13 -r1.13.2.1
--- SubscriptioManagementAction.java24 Sep 2008 09:56:25 -  1.13
+++ SubscriptioManagementAction.java22 Oct 2008 05:58:42 -  1.13.2.1
@@ -1,6 +1,8 @@
 package com.finalist.newsletter.forms;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
@@ -19,6 +21,7 @@
 import org.apache.struts.action.ActionMapping;
 import org.springframework.web.struts.DispatchActionSupport;
 
+import com.finalist.cmsc.paging.PagingStatusHolder;
 import com.finalist.cmsc.paging.PagingUtils;
 import com.finalist.cmsc.services.community.person.PersonService;
 import com.finalist.newsletter.domain.Newsletter;
@@ -26,11 +29,10 @@
 import com.finalist.newsletter.services.NewsletterService;
 import com.finalist.newsletter.services.NewsletterSubscriptionServices;
 import com.finalist.newsletter.services.SubscriptionHibernateService;
+import com.finalist.newsletter.util.ComparisonUtil;
 
 /**
- * 
  * @author Lisa
- * 
  */
 public class SubscriptioManagementAction extends DispatchActionSupport {
 
@@ -68,7 +70,8 @@
protected void onInit() {
   super.onInit();
   newsletterService = (NewsletterService) 
getWebApplicationContext().getBean(newsletterServices);
-  subscriptionServices = (NewsletterSubscriptionServices) 
getWebApplicationContext().getBean(subscriptionServices);
+  subscriptionServices = (NewsletterSubscriptionServices) 
getWebApplicationContext()
+.getBean(subscriptionServices);
   personServices = (PersonService) 
getWebApplicationContext().getBean(personService);
   publicationService = (NewsletterPublicationService) 
getWebApplicationContext().getBean(publicationService);
   subscriptionHService = (SubscriptionHibernateService) 
getWebApplicationContext().getBean(subscriptionHService);
@@ -94,7 +97,6 @@
}
 
/**
-* 
 * @param mapping
 * @param form
 * @param request
@@ -109,11 +111,11 @@
   PagingUtils.initStatusHolder(request);
   String title = request.getParameter(PARAM_TITLE);
   String subscriber = request.getParameter(PARAM_SUBSCRIBER);
-
   int resultCount = newsletterService.getNewsletters(subscriber, title, 
false).size();
-  ListNewsletter newsletters = 
newsletterService.getNewsletters(subscriber, title, true);
-  ListMapObject, Object results = convertToMap(newsletters);
-
+  ListNewsletter newsletters;
+  ListMapObject, Object results;
+  newsletters = newsletterService.getNewsletters(subscriber, title, true);
+  results = convertToOderedMap(newsletters);
   request.setAttribute(RESULTS, results);
   request.setAttribute(RESULTCOUNT, resultCount);
   return mapping.findForward(FORWARD_OVERVIEW);
@@ -303,4 +305,33 @@
   }
   return results;
}
+
+   private ListMapObject, Object convertToOderedMap(ListNewsletter 
newsletters) {
+  ListMapObject, Object results = convertToMap(newsletters);
+  PagingStatusHolder pagingHolder = PagingUtils.getStatusHolder();
+  String order = pagingHolder.getSort();
+  if (!title.equals(order)  null != order) {
+ results = pseudoRanking(results, pagingHolder, order);
+  }
+  return results;
+   }
+
+   private ListMapObject, Object pseudoRanking(ListMapObject, Object 
results, PagingStatusHolder pagingHolder,
+ String order) {
+  String oderby = pagingHolder.getDir();
+  int offset = pagingHolder.getOffset();
+  int size = pagingHolder.getPageSize();
+  ComparisonUtil comparator = new ComparisonUtil();
+  comparator.setFields_user(new String[] { order });
+  Collections.sort(results, comparator);
+  if (desc.equals(oderby)) {
+ Collections.reverse(results);
+  }
+  if (size + offset  results.size()) {
+ results = results.subList(offset, size + offset);
+  } else {
+ results = results.subList(offset, results.size());
+  }
+  return results;
+   }
 }
___
Cvs mailing

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

2008-10-14 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
NewsletterGenerator.java 
Log Message:
CMSC-1084, Newsletter: sending test email contains empty body,add error 
messages to the log file when sending a newsletter does not work


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


Index: NewsletterGenerator.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher/NewsletterGenerator.java,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -b -r1.11 -r1.11.2.1
--- NewsletterGenerator.java21 Jul 2008 12:52:40 -  1.11
+++ NewsletterGenerator.java14 Oct 2008 07:46:13 -  1.11.2.1
@@ -57,7 +57,7 @@
 
  return (inputString);
   } catch (Exception e) {
- log.debug(Error when try to get content from + urlPath, e);
+ log.error(Error when try to get content from + urlPath, e);
   }
 
   return inputString;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

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

2008-10-14 Thread nikkoyin

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

Modified Files:
NewsletterGenerator.java 
Log Message:
CMSC-1084, Newsletter: sending test email contains empty body,add error 
messages to the log file when sending a newsletter does not work


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


Index: NewsletterGenerator.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher/NewsletterGenerator.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- NewsletterGenerator.java21 Jul 2008 12:52:40 -  1.11
+++ NewsletterGenerator.java14 Oct 2008 07:49:55 -  1.12
@@ -57,7 +57,7 @@
 
  return (inputString);
   } catch (Exception e) {
- log.debug(Error when try to get content from + urlPath, e);
+ log.error(Error when try to get content from + urlPath, e);
   }
 
   return inputString;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/sitemanagement/src/webapp/WEB-INF struts-site.xml

2008-09-27 Thread nikkoyin

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

Modified Files:
struts-site.xml 
Log Message:
CMSC-798,Possible to create two or more sites with the same Staging domain, 
Live domain. Removal of 1 site will make all other (same) sites result in a 
404. Add my-validate to modify validator


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


Index: struts-site.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/WEB-INF/struts-site.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- struts-site.xml 28 Jul 2008 14:51:42 -  1.9
+++ struts-site.xml 27 Sep 2008 06:42:52 -  1.10
@@ -18,6 +18,10 @@
 !-- == Global Forward Definitions 
=== --
 !-- == Action Mapping Definitions 
=== --
 action-mappings
+!-- == Ajax Definitions === 
--
+   action path=/editors/site/SelectSiteName 
type=com.finalist.cmsc.navigation.forms.SelectSiteNameAction
+   unknown=false validate=false
+   /action
 !--  Site management  --
 
 action path=/editors/site/SiteCreate 
type=com.finalist.cmsc.navigation.forms.SiteCreate
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

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

2008-09-27 Thread nikkoyin

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

Modified Files:
wizard.xsl 
Log Message:
CMSC-798,Possible to create two or more sites with the same Staging domain, 
Live domain. Removal of 1 site will make all other (same) sites result in a 
404. Add my-validate to modify validator


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


Index: wizard.xsl
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl/wizard.xsl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- wizard.xsl  3 Jun 2008 14:18:30 -   1.13
+++ wizard.xsl  27 Sep 2008 06:42:52 -  1.14
@@ -97,7 +97,9 @@
   /xsl:template
 
   xsl:template name=extrajavascript
+script type=text/javascript 
src={$ew_context}/js/prototype.jsxsl:commenthelp IE/xsl:comment/script
 script type=text/javascript 
src={$ew_context}{$templatedir}javascript/override.jsxsl:commenthelp 
IE/xsl:comment/script
+script type=text/javascript 
src={$ew_context}{$templatedir}javascript/my-validator.jsxsl:commenthelp 
IE/xsl:comment/script
 script type=text/javascript
   var isWebmaster = xsl:value-of select=$WEBMASTER/;
 /script
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/javascript my-validator.js

2008-09-27 Thread nikkoyin

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

Added Files:
my-validator.js 
Log Message:
CMSC-798,Possible to create two or more sites with the same Staging domain, 
Live domain. Removal of 1 site will make all other (same) sites result in a 
404. Add my-validate to modify validator


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


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

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

2008-09-27 Thread nikkoyin

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

Added Files:
SelectSiteNameAction.java 
Log Message:
CMSC-798,Possible to create two or more sites with the same Staging domain, 
Live domain. Removal of 1 site will make all other (same) sites result in a 
404. Add my-validate to modify validator


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


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

[MMBASE CVS] contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/site edit_site.xml

2008-09-27 Thread nikkoyin

Update of 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/site
In directory 
james.mmbase.org:/tmp/cvs-serv16674/sitemanagement/src/webapp/editors/config/site

Modified Files:
edit_site.xml 
Log Message:
CMSC-798,Possible to create two or more sites with the same Staging domain, 
Live domain. Removal of 1 site will make all other (same) sites result in a 
404. Add my-validate to modify validator


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/site
See also: http://www.mmbase.org/jira/browse/CMSC-798


Index: edit_site.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/site/edit_site.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- edit_site.xml   8 Aug 2007 09:26:33 -   1.6
+++ edit_site.xml   27 Sep 2008 06:42:52 -  1.7
@@ -6,7 +6,7 @@
 
field name=stagingfragment dtmaxlength=40
dtpattern=^[a-zA-Z0-9][a-zA-Z0-9_.-]{0,38}[a-zA-Z0-9]$
-   dtrequired=true
+   dtrequired=true hide=ajax
prompt xml:lang=enStaging domain/prompt
prompt xml:lang=nlStaging domein/prompt
/field
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/site edit_site.xml

2008-09-26 Thread nikkoyin

Update of 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/site
In directory 
james.mmbase.org:/tmp/cvs-serv12707/sitemanagement/src/webapp/editors/config/site

Modified Files:
  Tag: b1_5
edit_site.xml 
Log Message:
CMSC-798,Possible to create two or more sites with the same Staging domain, 
Live domain. Removal of 1 site will make all other (same) sites result in a 
404. Add my-validate to modify validator


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/site
See also: http://www.mmbase.org/jira/browse/CMSC-798


Index: edit_site.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/site/edit_site.xml,v
retrieving revision 1.6
retrieving revision 1.6.4.1
diff -u -b -r1.6 -r1.6.4.1
--- edit_site.xml   8 Aug 2007 09:26:33 -   1.6
+++ edit_site.xml   27 Sep 2008 02:50:45 -  1.6.4.1
@@ -6,7 +6,7 @@
 
field name=stagingfragment dtmaxlength=40
dtpattern=^[a-zA-Z0-9][a-zA-Z0-9_.-]{0,38}[a-zA-Z0-9]$
-   dtrequired=true
+   dtrequired=true hide=ajax
prompt xml:lang=enStaging domain/prompt
prompt xml:lang=nlStaging domein/prompt
/field
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/javascript my-validator.js

2008-09-26 Thread nikkoyin

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

Added Files:
  Tag: b1_5
my-validator.js 
Log Message:
CMSC-798,Possible to create two or more sites with the same Staging domain, 
Live domain. Removal of 1 site will make all other (same) sites result in a 
404. Add my-validate to modify validator


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


my-validator.js is new

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

[MMBASE CVS] contributions/CMSContainer/cmsc/sitemanagement/src/webapp/WEB-INF struts-site.xml

2008-09-26 Thread nikkoyin

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

Modified Files:
  Tag: b1_5
struts-site.xml 
Log Message:
CMSC-798,Possible to create two or more sites with the same Staging domain, 
Live domain. Removal of 1 site will make all other (same) sites result in a 
404. Add my-validate to modify validator


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


Index: struts-site.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/WEB-INF/struts-site.xml,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -b -r1.9 -r1.9.2.1
--- struts-site.xml 28 Jul 2008 14:51:42 -  1.9
+++ struts-site.xml 27 Sep 2008 02:50:45 -  1.9.2.1
@@ -18,6 +18,10 @@
 !-- == Global Forward Definitions 
=== --
 !-- == Action Mapping Definitions 
=== --
 action-mappings
+   !-- == Ajax Definitions === --
+   action path=/editors/site/SelectSiteName 
type=com.finalist.cmsc.navigation.forms.SelectSiteNameAction
+   unknown=false validate=false
+   /action
 !--  Site management  --
 
 action path=/editors/site/SiteCreate 
type=com.finalist.cmsc.navigation.forms.SiteCreate
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

< 1 2 3 4 >

101 - 200 of 323 matches

Mail list logo