[MMBASE CVS] speeltuin/ernst/tagfileparser .classpath
Update of /var/cvs/speeltuin/ernst/tagfileparser In directory james.mmbase.org:/tmp/cvs-serv1313 Modified Files: .classpath Log Message: work in progress See also: http://cvs.mmbase.org/viewcvs/speeltuin/ernst/tagfileparser Index: .classpath === RCS file: /var/cvs/speeltuin/ernst/tagfileparser/.classpath,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- .classpath 9 Jul 2008 10:07:48 - 1.2 +++ .classpath 15 Jul 2008 06:54:23 - 1.3 @@ -6,5 +6,6 @@ + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] speeltuin/ernst/tagfileparser/test/resources/tags sometag.tag somefragment.tagf
Update of /var/cvs/speeltuin/ernst/tagfileparser/test/resources/tags In directory james.mmbase.org:/tmp/cvs-serv1313/test/resources/tags Added Files: sometag.tag somefragment.tagf Log Message: work in progress See also: http://cvs.mmbase.org/viewcvs/speeltuin/ernst/tagfileparser/test/resources/tags sometag.tag is new somefragment.tagf is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] speeltuin/ernst/tagfileparser/test log4j.properties
Update of /var/cvs/speeltuin/ernst/tagfileparser/test In directory james.mmbase.org:/tmp/cvs-serv1313/test Added Files: log4j.properties Log Message: work in progress See also: http://cvs.mmbase.org/viewcvs/speeltuin/ernst/tagfileparser/test log4j.properties is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] speeltuin/ernst/tagfileparser/src/nl/vpro/tagfileparser/parser/file BasicTagParser.java AbstractTagParser.java TagParser.java
Update of
/var/cvs/speeltuin/ernst/tagfileparser/src/nl/vpro/tagfileparser/parser/file
In directory
james.mmbase.org:/tmp/cvs-serv1313/src/nl/vpro/tagfileparser/parser/file
Modified Files:
BasicTagParser.java AbstractTagParser.java TagParser.java
Log Message:
work in progress
See also:
http://cvs.mmbase.org/viewcvs/speeltuin/ernst/tagfileparser/src/nl/vpro/tagfileparser/parser/file
Index: BasicTagParser.java
===
RCS file:
/var/cvs/speeltuin/ernst/tagfileparser/src/nl/vpro/tagfileparser/parser/file/BasicTagParser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- BasicTagParser.java 9 Jul 2008 10:07:45 - 1.1
+++ BasicTagParser.java 15 Jul 2008 06:54:23 - 1.2
@@ -24,6 +24,7 @@
public BasicTagParser(){
setIncludeExtension("tagf");
+ setTagExtension("tag");
addElementParser(new TagDirectiveParser());
addElementParser(new VariableDirectiveParser());
addElementParser(new AttributeDirectiveParser());
Index: AbstractTagParser.java
===
RCS file:
/var/cvs/speeltuin/ernst/tagfileparser/src/nl/vpro/tagfileparser/parser/file/AbstractTagParser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- AbstractTagParser.java 9 Jul 2008 10:07:45 - 1.1
+++ AbstractTagParser.java 15 Jul 2008 06:54:23 - 1.2
@@ -7,8 +7,11 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.commons.logging.*;
+import org.apache.log4j.spi.LoggerFactory;
import nl.vpro.tagfileparser.model.TagInfo;
import nl.vpro.tagfileparser.parser.BasicTagParserException;
@@ -18,7 +21,8 @@
* This abstract Tag parser will has all the plumbing for parsing tag files.
* Concrete implementations should do the following:
*
- * Set a tag file extension type. Tag files are checked for this extension
before they are parsed.
+ * Set a tag file extension type. Tag files are checked for this extension
+ * before they are parsed.
* Set an include file extension type. includes like
* <[EMAIL PROTECTED] file="somefile.[includeExtension]" %> will
be resolved and included. If no include extension is set, no includes will be
resolved
* Register any number of instances of the [EMAIL PROTECTED]
ElementParser} type. they are used to parse the different elements of the tag
file.
@@ -27,6 +31,7 @@
*
*/
public class AbstractTagParser implements TagParser {
+ private static final Log log =
LogFactory.getLog(AbstractTagParser.class);
private List elementParsers = new
ArrayList();
private String includeExtension = null;
@@ -36,6 +41,7 @@
private Matcher matcher, fileNameMatcher;
protected final void addElementParser(ElementParser elementParser) {
+ log.debug("adding element parser: " + elementParser);
elementParsers.add(elementParser);
}
@@ -54,6 +60,7 @@
includePattern = Pattern.compile("<[EMAIL
PROTECTED]"[\\w\\.-]+\\." + includeExtension
+ "\"\\s*%>");
includeNamePattern =
Pattern.compile("file\\s*=\\s*\"([\\w\\.-]+)\"");
+ log.debug(String.format("setting include pattern: '%s'",
includePattern.pattern()));
}
protected final void setTagExtension(String tagExtension) {
@@ -63,17 +70,21 @@
/**
* @see
nl.vpro.tagfileparser.parser.file.TagParser#parseTag(java.io.File)
* @throws BasicTagParserException
-* when something goes wrong reading the tag file, or a
tagfile with the wrong extension is fed into it.
+* when something goes wrong reading the tag file, or a
tagfile
+* with the wrong extension is fed into it.
*/
public final TagInfo parseTag(File tagFile) {
TagInfo tagInfo;
if (tagExtension != null &&
tagFile.getName().endsWith(tagExtension)) {
+ log.info(String.format("Parsing tagfile '%s'",
tagFile.getName()));
tagInfo = new TagInfo(resolveTagName(tagFile));
// first: create the file reader.
List tagFileLines = createTagFileLines(tagFile);
+ log.debug(String.format("%s lines in tag file %s",
tagFileLines.size(), tagFile.getName()));
// let all the element parsers parse the tag file
for (ElementParser elementParser : elementParsers) {
+ log.debug(String.format("applying element
parser '%s'", elementParser.toString()));
[MMBASE CVS] speeltuin/ernst/tagfileparser/src/nl/vpro/tagfileparser/parser DirectiveParser.java RegexpParser.java
Update of
/var/cvs/speeltuin/ernst/tagfileparser/src/nl/vpro/tagfileparser/parser
In directory james.mmbase.org:/tmp/cvs-serv1313/src/nl/vpro/tagfileparser/parser
Modified Files:
DirectiveParser.java RegexpParser.java
Log Message:
work in progress
See also:
http://cvs.mmbase.org/viewcvs/speeltuin/ernst/tagfileparser/src/nl/vpro/tagfileparser/parser
Index: DirectiveParser.java
===
RCS file:
/var/cvs/speeltuin/ernst/tagfileparser/src/nl/vpro/tagfileparser/parser/DirectiveParser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- DirectiveParser.java9 Jul 2008 10:07:48 - 1.2
+++ DirectiveParser.java15 Jul 2008 06:54:23 - 1.3
@@ -23,7 +23,7 @@
*the name of the directive you want to parse
*/
public DirectiveParser(String directive) {
- super("^[\\s]*<[EMAIL PROTECTED]" + directive, "%>[\\s]*$",
false);
+ super("^[\\s]*<[EMAIL PROTECTED]" + fixDirective(directive),
"%>[\\s]*$", false);
}
@Override
@@ -34,52 +34,41 @@
// make one string for each attribute-value pair, assuming
// that there might be whitespaces surrounding the equals
operator
- Pattern attPattern = Pattern
- .compile("[a-zA-Z0-9_\\-]+\\s*=\\s*\"[^\"]*\"");
+ Pattern attPattern =
Pattern.compile("[a-zA-Z0-9_\\-]+\\s*=\\s*\"[^\"]*\"");
Matcher attMatcher = attPattern.matcher(line);
int start = 0;
while (attMatcher.find(start)) {
- String attString = line.substring(attMatcher.start(),
attMatcher
- .end());
+ String attString = line.substring(attMatcher.start(),
attMatcher.end());
attributeFound(createAttribute(attString));
start = attMatcher.end();
}
}
/**
-* @param attributeString
-* @return
-* @throws IllegalAttributeException
-* when the give string could not be parsed to a name value
-* pair.
+* Template method that will be called when the directive is found.
*/
- private Attribute createAttribute(String attributeString) {
- StringTokenizer tokenizer = new
StringTokenizer(attributeString, "=",
- false);
- if (tokenizer.countTokens() == 2) {
- String aName = tokenizer.nextToken().trim();
- String aValue = tokenizer.nextToken().trim();
- // trim the quotes from the attribute value;
- aValue = aValue.substring(1, aValue.length() - 1);
- return new Attribute(aName, aValue);
- }
- throw new IllegalAttributeException(
- "illegal string format for attribute and value:
["
- + attributeString + "]");
- }
+ protected abstract void directiveFound();
+
+ /**
+* Template method that will be called when an attribute is found.
+*
+* @param name
+* @param value
+*/
+ protected abstract void attributeFound(Attribute attribute);
/**
+* Remove the <%\@ and %> bits from the line
*
* @param line
*/
- String cleanup(String line) {
+ private final String cleanup(String line) {
line = line.trim();
if (line.startsWith("<%@")) {
line = line.substring(3, line.length());
} else {
- throw new RuntimeException(
- "Line did not start with expected
'<%@'. [" + line + "]");
+ throw new BasicTagParserException("Line did not start
with expected '<%@'. [" + line + "]");
}
if (line.endsWith("%>")) {
line = line.substring(0, line.length() - 2);
@@ -89,17 +78,30 @@
}
/**
-* Template method that will be called when the directive is found.
+* @param attributeString
+* @return
+* @throws IllegalAttributeException
+* when the give string could not be parsed to a name value
+* pair.
*/
- protected abstract void directiveFound();
+ private final Attribute createAttribute(String attributeString) {
+ StringTokenizer tokenizer = new
StringTokenizer(attributeString, "=", false);
+ if (tokenizer.countTokens() == 2) {
+ String aName = tokenizer.nextToken().trim();
+ String aValue = tokenizer.nextToken(
[MMBASE CVS] speeltuin/ernst/tagfileparser/src/nl/vpro/util StringUtil.java
Update of /var/cvs/speeltuin/ernst/tagfileparser/src/nl/vpro/util
In directory james.mmbase.org:/tmp/cvs-serv1313/src/nl/vpro/util
Modified Files:
StringUtil.java
Log Message:
work in progress
See also:
http://cvs.mmbase.org/viewcvs/speeltuin/ernst/tagfileparser/src/nl/vpro/util
Index: StringUtil.java
===
RCS file:
/var/cvs/speeltuin/ernst/tagfileparser/src/nl/vpro/util/StringUtil.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- StringUtil.java 23 Jun 2008 10:20:11 - 1.1
+++ StringUtil.java 15 Jul 2008 06:54:23 - 1.2
@@ -1,12 +1,15 @@
package nl.vpro.util;
-import java.util.logging.Logger;
+
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
public class StringUtil {
- private static final Logger log =
Logger.getLogger(StringUtil.class.getName());
+ private static final Log log =
LogFactory.getLog(StringUtil.class.getName());
/**
* This method is like [EMAIL PROTECTED] String#startsWith(String)} but
it takes a
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] speeltuin/ernst/tagfileparser/test/nl/vpro/tagfileparser/parser TestBase.java DirectiveParserTest.java
Update of
/var/cvs/speeltuin/ernst/tagfileparser/test/nl/vpro/tagfileparser/parser
In directory
james.mmbase.org:/tmp/cvs-serv1313/test/nl/vpro/tagfileparser/parser
Modified Files:
TestBase.java DirectiveParserTest.java
Log Message:
work in progress
See also:
http://cvs.mmbase.org/viewcvs/speeltuin/ernst/tagfileparser/test/nl/vpro/tagfileparser/parser
Index: TestBase.java
===
RCS file:
/var/cvs/speeltuin/ernst/tagfileparser/test/nl/vpro/tagfileparser/parser/TestBase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- TestBase.java 9 Jul 2008 10:07:45 - 1.2
+++ TestBase.java 15 Jul 2008 06:54:23 - 1.3
@@ -9,6 +9,8 @@
import java.util.Iterator;
import java.util.List;
+import java.io.*;
+
import junit.framework.TestCase;
/**
@@ -25,25 +27,27 @@
/**
* Reads a file as resource from the classpath, and creates a
BufferedReader for it.
-* @param name
+* @param resourceName
* @return
*/
- protected BufferedReader loadFile(String name){
- InputStream is =
this.getClass().getClassLoader().getResourceAsStream(name);
+ protected BufferedReader loadFileAsReader(String resourceName){
+ InputStream is =
this.getClass().getClassLoader().getResourceAsStream(resourceName);
if(is == null){
- throw new RuntimeException("resource with name
'"+name+"' not found");
+ throw new RuntimeException("resource with name
'"+resourceName+"' not found");
}
BufferedReader r = new BufferedReader(new InputStreamReader(is,
Charset.forName("UTF-8")));
return r;
}
+
+
/**
* Reads the resource of given name, and creates a line iterator for it.
* @param filename
* @return
*/
protected Iterator createFileIterator(String filename){
- BufferedReader br = loadFile(filename);
+ BufferedReader br = loadFileAsReader(filename);
List result = new ArrayList();
String l;
try {
Index: DirectiveParserTest.java
===
RCS file:
/var/cvs/speeltuin/ernst/tagfileparser/test/nl/vpro/tagfileparser/parser/DirectiveParserTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- DirectiveParserTest.java23 Jun 2008 10:20:11 - 1.1
+++ DirectiveParserTest.java15 Jul 2008 06:54:23 - 1.2
@@ -10,12 +10,6 @@
public class DirectiveParserTest extends TestCase {
- public void testCleanup(){
- String line ="<%@ test foo=\"bar\"%>";
- DirectiveParser tdp = createParser(null, null);
- assertEquals("test foo=\"bar\"", tdp.cleanup(line));
- }
-
public void testParser(){
String line ="<%@ test foo =\"bar\" name= \"disco\"
hi=\"ho \" empty=\"\" %>";
final List attributes = new ArrayList();
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] speeltuin/ernst/tagfileparser/test/nl/vpro/tagfileparser/parser/file BasicTagParserTest.java
Update of
/var/cvs/speeltuin/ernst/tagfileparser/test/nl/vpro/tagfileparser/parser/file
In directory
james.mmbase.org:/tmp/cvs-serv1313/test/nl/vpro/tagfileparser/parser/file
Modified Files:
BasicTagParserTest.java
Log Message:
work in progress
See also:
http://cvs.mmbase.org/viewcvs/speeltuin/ernst/tagfileparser/test/nl/vpro/tagfileparser/parser/file
Index: BasicTagParserTest.java
===
RCS file:
/var/cvs/speeltuin/ernst/tagfileparser/test/nl/vpro/tagfileparser/parser/file/BasicTagParserTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- BasicTagParserTest.java 9 Jul 2008 10:07:48 - 1.1
+++ BasicTagParserTest.java 15 Jul 2008 06:54:23 - 1.2
@@ -1,10 +1,31 @@
package nl.vpro.tagfileparser.parser.file;
+import java.io.File;
+
+import nl.vpro.tagfileparser.model.TagInfo;
import nl.vpro.tagfileparser.parser.TestBase;
public class BasicTagParserTest extends TestBase {
public void testParser(){
- TagParser parser = new BasicTagParser();
+ TagParser tagParser = new BasicTagParser();
+ String root = new File(".").getAbsolutePath();
+ root = root.substring(0, root.lastIndexOf("/"));
+
+ String tagFilePath = root + "/test/resources/tags/sometag.tag";
+ File tagFile = new File(tagFilePath);
+ if(!tagFile.isFile() || !tagFile.canRead()){
+ throw new RuntimeException(String.format("can not find
file: %s", tagFilePath));
+ }
+
+ TagInfo tagInfo = tagParser.parseTag(tagFile);
+
+ //test the attributes
+ assertEquals(1, tagInfo.getVariables().size());
+ //assertEquals("name",
tagInfo.getAttributes().get(0).getName());
+
+ //test the variables
+
+ //test the tag
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] speeltuin/ernst/tagfileparser/test/resources - New directory
Update of /var/cvs/speeltuin/ernst/tagfileparser/test/resources In directory james.mmbase.org:/tmp/cvs-serv1235/test/resources Log Message: Directory /var/cvs/speeltuin/ernst/tagfileparser/test/resources added to the repository See also: http://cvs.mmbase.org/viewcvs/speeltuin/ernst/tagfileparser/test/resources ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] speeltuin/ernst/tagfileparser/test/resources/tags - New directory
Update of /var/cvs/speeltuin/ernst/tagfileparser/test/resources/tags In directory james.mmbase.org:/tmp/cvs-serv1235/test/resources/tags Log Message: Directory /var/cvs/speeltuin/ernst/tagfileparser/test/resources/tags added to the repository See also: http://cvs.mmbase.org/viewcvs/speeltuin/ernst/tagfileparser/test/resources/tags ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/framework Framework.java
Update of /var/cvs/src/org/mmbase/framework
In directory james.mmbase.org:/tmp/cvs-serv32752
Modified Files:
Framework.java
Log Message:
javadoc
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/framework
Index: Framework.java
===
RCS file: /var/cvs/src/org/mmbase/framework/Framework.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- Framework.java 25 Apr 2008 14:35:12 - 1.53
+++ Framework.java 15 Jul 2008 05:53:29 - 1.54
@@ -29,7 +29,7 @@
* @author Michiel Meeuwissen
* @author Nico Klasens
* @author André van Toly
- * @version $Id: Framework.java,v 1.53 2008/04/25 14:35:12 andre Exp $
+ * @version $Id: Framework.java,v 1.54 2008/07/15 05:53:29 michiel Exp $
* @since MMBase-1.9
*/
public abstract class Framework {
@@ -52,7 +52,7 @@
/**
- * Return the framework, or null if there is no framework defined in
mmbaseroot.xml
+ * Returns the framework. Never null.
* @return the framework
*/
public static Framework getInstance() {
___
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
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
In directory
james.mmbase.org:/tmp/cvs-serv31196/src/java/com/finalist/cmsc/services/community/person
Modified Files:
PersonHibernateService.java PersonService.java
Log Message:
CMSC-947) Improve the newletter import/export into a generic community
import/export,add Xtream in project.xml
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-947
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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- PersonHibernateService.java 4 Jul 2008 08:04:20 - 1.8
+++ PersonHibernateService.java 15 Jul 2008 04:39:16 - 1.9
@@ -9,18 +9,25 @@
*/
package com.finalist.cmsc.services.community.person;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.hibernate.Criteria;
import org.hibernate.criterion.Example;
+import org.hibernate.criterion.MatchMode;
import org.hibernate.criterion.Restrictions;
import org.hibernate.criterion.MatchMode;
import org.springframework.beans.factory.annotation.Required;
+import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import com.finalist.cmsc.services.HibernateService;
+import com.finalist.cmsc.services.community.domain.PersonExportImportVO;
+import com.finalist.cmsc.services.community.preferences.Preference;
+import com.finalist.cmsc.services.community.preferences.PreferenceService;
+import com.finalist.cmsc.services.community.security.Authentication;
import com.finalist.cmsc.services.community.security.AuthenticationService;
/**
@@ -29,6 +36,11 @@
public class PersonHibernateService extends HibernateService implements
PersonService {
private AuthenticationService authenticationService;
+private PreferenceService preferenceService;
+ @Required
+ public void setPreferenceService(PreferenceService preferenceService) {
+ this.preferenceService = preferenceService;
+ }
/** [EMAIL PROTECTED] */
@Transactional(readOnly = true)
@@ -153,4 +165,92 @@
}
return person;
}
+ @Transactional
+ public void createPerson(Person person) {
+ getSession().save(person);
+
+ }/*
+ @Transactional
+ public int batchClean(String type, String condition) {
+
+ return 0;
+ }*/
+ @Transactional(propagation = Propagation.REQUIRED)
+ public void batchClean(){
+ List persons = getAllPersons();
+ for (Person tempPerson : persons) {
+ long authenticationId =
tempPerson.getAuthenticationId();
+
preferenceService.batchCleanByAuthenticationId(authenticationId);
+
+ }
+ String hqlDeletePerson = "delete Person";
+ String hqlDeleteAuthentication = "delete Authentication";
+ getSession().createQuery(hqlDeleteAuthentication)
+.executeUpdate();
+ getSession().createQuery(hqlDeletePerson)
+ .executeUpdate();
+
+
+
+ }
+ @Transactional(propagation = Propagation.REQUIRED)
+ public void deleteRelationRecord(Long id) {
+ //long id = dataPerson.getAuthenticationId();
+ preferenceService.batchCleanByAuthenticationId(id);
+ authenticationService.deleteAuthentication(id);
+ deletePersonByAuthenticationId(id);
+ }
+ @Transactional(propagation = Propagation.REQUIRED)
+ @SuppressWarnings("unchecked")
+ public void creatRelationRecord(PersonExportImportVO xperson) {
+ Authentication authentication = xperson.getAuthentication();
+ authentication =
authenticationService.createAuthentication(authentication);
+ Person person = new Person();
+ converPersonPropertis(xperson, person);
+ person.setAuthenticationId(authentication.getId());
+ createPerson(person);
+ String userId = xperson.getAuthentication().getUserId();
+ List preferences = xperson.getPreferences();
+ for (Preference preference : preferences) {
+ preferenceService.createPreference(preference, userId);
+ }
+ }
+ @Transactional(readOnly = true)
+ public List getAllXPerson() {
+
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/webapp/WEB-INF spring-community.xml struts-community.xml
Update of /var/cvs/contributions/CMSContainer_Modules/community/src/webapp/WEB-INF In directory james.mmbase.org:/tmp/cvs-serv31196/src/webapp/WEB-INF Modified Files: spring-community.xml struts-community.xml Log Message: CMSC-947) Improve the newletter import/export into a generic community import/export,add Xtream in project.xml See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/WEB-INF See also: http://www.mmbase.org/jira/browse/CMSC-947 Index: spring-community.xml === RCS file: /var/cvs/contributions/CMSContainer_Modules/community/src/webapp/WEB-INF/spring-community.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -b -r1.6 -r1.7 --- spring-community.xml10 Jun 2008 11:55:03 - 1.6 +++ spring-community.xml15 Jul 2008 04:39:16 - 1.7 @@ -55,7 +55,7 @@ p:sessionFactory-ref="sessionFactory"/> - + @@ -70,5 +70,10 @@ + + + + + Index: struts-community.xml === RCS file: /var/cvs/contributions/CMSContainer_Modules/community/src/webapp/WEB-INF/struts-community.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -b -r1.6 -r1.7 --- struts-community.xml10 Jun 2008 11:55:03 - 1.6 +++ struts-community.xml15 Jul 2008 04:39:16 - 1.7 @@ -6,6 +6,7 @@ + @@ -54,6 +55,13 @@ + + + + + ___ 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/security Authentication.java AuthenticationHibernateService.java AuthenticationService.java
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security
In directory
james.mmbase.org:/tmp/cvs-serv31196/src/java/com/finalist/cmsc/services/community/security
Modified Files:
Authentication.java AuthenticationHibernateService.java
AuthenticationService.java
Log Message:
CMSC-947) Improve the newletter import/export into a generic community
import/export,add Xtream in project.xml
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security
See also: http://www.mmbase.org/jira/browse/CMSC-947
Index: Authentication.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security/Authentication.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- Authentication.java 31 Mar 2008 19:49:01 - 1.3
+++ Authentication.java 15 Jul 2008 04:39:16 - 1.4
@@ -131,5 +131,9 @@
return true;
}
+ public void setAuthorities(Set authorities) {
+ this.authorities = authorities;
+ }
+
}
Index: AuthenticationHibernateService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security/AuthenticationHibernateService.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- AuthenticationHibernateService.java 31 Mar 2008 19:49:01 - 1.7
+++ AuthenticationHibernateService.java 15 Jul 2008 04:39:16 - 1.8
@@ -125,6 +125,7 @@
return authentication == null ? null : authentication.getId();
}
+ @Transactional(readOnly = true)
private Authentication findAuthenticationByUserId(String userId) {
Criteria criteria =
getSession().createCriteria(Authentication.class).add(Restrictions.eq("userId",
userId));
return findAuthenticationByCriteria(criteria);
@@ -179,4 +180,8 @@
public Authentication getAuthenticationById(Long authenticationId) {
return (Authentication) getSession().get(Authentication.class,
authenticationId);
}
+ @Transactional
+ public Authentication createAuthentication(Authentication
authentication) {
+ return createAuthentication(authentication.getUserId(),
authentication.getPassword());
+ }
}
Index: AuthenticationService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security/AuthenticationService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- AuthenticationService.java 31 Mar 2008 19:49:01 - 1.5
+++ AuthenticationService.java 15 Jul 2008 04:39:16 - 1.6
@@ -133,4 +133,5 @@
* @return Authentication
*/
Authentication getAuthenticationById(Long authenticationId);
+ public Authentication createAuthentication(Authentication authentication) ;
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/resources cmsc-community.properties cmsc-community_nl.properties
Update of /var/cvs/contributions/CMSContainer_Modules/community/resources
In directory james.mmbase.org:/tmp/cvs-serv31196/resources
Modified Files:
cmsc-community.properties cmsc-community_nl.properties
Log Message:
CMSC-947) Improve the newletter import/export into a generic community
import/export,add Xtream in project.xml
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/resources
See also: http://www.mmbase.org/jira/browse/CMSC-947
Index: cmsc-community.properties
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/resources/cmsc-community.properties,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- cmsc-community.properties 11 Jun 2008 10:07:36 - 1.13
+++ cmsc-community.properties 15 Jul 2008 04:39:16 - 1.14
@@ -63,3 +63,13 @@
community.preference.update.success = Community preference updated
successfully!
community.preference.delete.conform = Delete the community preference?
community.preference.new = New Preference
\ No newline at end of file
+community.data.title = Community Data
+community.data.export = Export all community data
+community.data.import = Import community data
+community.data.import.option.pre = You have choose to
+community.data.import.option.clean = clean all existing users before import
+community.data.import.option.override = override current existing users
+community.data.import.option.add = only add new users
+community.data.import.option.back = are you sure?
+community.data.import.option = You have choose to {0}, are you sure?
+community.datafile.import.success = SUCCEED
Index: cmsc-community_nl.properties
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/resources/cmsc-community_nl.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- cmsc-community_nl.properties11 Jun 2008 10:13:30 - 1.9
+++ cmsc-community_nl.properties15 Jul 2008 04:39:16 - 1.10
@@ -63,3 +63,12 @@
community.preference.update.success = Community voorkeur succesvol geupdate!
community.preference.delete.conform = Verwijder de community voorkeur?
community.preference.new = Nieuwe voorkeur
\ No newline at end of file
+community.data.title = Community Data
+community.data.export = Export all community data
+community.data.import = Import community data
+community.data.import.option.pre = Er is gekozen voor het
+community.data.import.option.clean = verwijderen van alle gebruikers voor de
import
+community.data.import.option.clean.override = overschrijven bestaande
gebruikers
+community.data.import.option.clean.add = alleen toevoegen van nieuwe gebruikers
+community.data.import.option.back = weet u dit zeker?
+community.data.import.option =Er is gekozen voor het {0}, weet u dit zeker?
___
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/preferences PreferenceHibernateService.java PreferenceService.java
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/preferences
In directory
james.mmbase.org:/tmp/cvs-serv31196/src/java/com/finalist/cmsc/services/community/preferences
Modified Files:
PreferenceHibernateService.java PreferenceService.java
Log Message:
CMSC-947) Improve the newletter import/export into a generic community
import/export,add Xtream in project.xml
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/preferences
See also: http://www.mmbase.org/jira/browse/CMSC-947
Index: PreferenceHibernateService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/preferences/PreferenceHibernateService.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- PreferenceHibernateService.java 7 Jul 2008 20:52:35 - 1.7
+++ PreferenceHibernateService.java 15 Jul 2008 04:39:16 - 1.8
@@ -18,6 +18,8 @@
import org.apache.commons.lang.StringUtils;
import org.hibernate.Criteria;
import org.hibernate.HibernateException;
+import org.hibernate.Session;
+import org.hibernate.criterion.MatchMode;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
import org.springframework.beans.factory.annotation.Required;
@@ -75,6 +77,21 @@
}
return modulePreferenceMap;
}
+/** [EMAIL PROTECTED] */
+@Transactional(readOnly = true)
+public List getListPreferencesByUserId(String userId){
+ Long authenticationId =
authenticationService.getAuthenticationIdForUserId(userId);
+Criteria criteria = getSession().createCriteria(Preference.class);
+criteria.add(Restrictions.eq("authenticationId", authenticationId));
+List List = criteria.list();
+List preferenceList = new ArrayList();
+for (Iterator iter = List.iterator(); iter.hasNext();) {
+ Preference p =new Preference();
+ p = (Preference) iter.next();
+ preferenceList.add(p);
+}
+ return preferenceList;
+ }
/** [EMAIL PROTECTED] */
@Transactional(readOnly = true)
@@ -224,6 +241,10 @@
public void createPreference(PreferenceVO preference) {
createPreference(preference.getModule(),preference.getUserId(),preference.getKey(),preference.getValue());
}
+@Transactional
+public void createPreference(Preference preference,String userId) {
+
createPreference(preference.getModule(),userId,preference.getKey(),preference.getValue());
+}
@Transactional
public void updatePreference(PreferenceVO preferenceVO) {
@@ -242,6 +263,10 @@
Preference preference = (Preference)getSession().get(Preference.class,
Long.parseLong(number));
getSession().delete(preference);
}
+public void deletePreference(long number) {
+Preference preference = (Preference)getSession().get(Preference.class,
number);
+ getSession().delete(preference);
+ }
@Transactional(readOnly = true)
public List getAllUserIds() {
@@ -299,9 +324,15 @@
dest.add(preferenceVO);
}
}
-
+ @Transactional
private String getUserIdByAuthenticationId(Long authenticationId){
Authentication authentication =
authenticationService.getAuthenticationById(authenticationId);
return authentication.getUserId();
}
+ @Transactional
+ public void batchCleanByAuthenticationId(long authenticationId) {
+ String hqlDelete = "delete Preference where authenticationid
=:authenticationId";
+ getSession().createQuery(hqlDelete).setLong("authenticationId",
authenticationId).executeUpdate();
+
+ }
}
Index: PreferenceService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/preferences/PreferenceService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- PreferenceService.java 10 Jun 2008 11:53:11 - 1.4
+++ PreferenceService.java 15 Jul 2008 04:39:16 - 1.5
@@ -65,4 +65,8 @@
public void deletePreference(String number) ;
public List getAllUserIds();
public int getTotalCount(PreferenceVO preference);
+ List getListPreferencesByUserId(String userId);
+ void createPreference(Preference preferences, String userId);
+ void deletePreference(long number);
+ void batchCleanByAuthenticationId(long authenticationId);
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community project.xml
Update of /var/cvs/contributions/CMSContainer_Modules/community
In directory james.mmbase.org:/tmp/cvs-serv31196
Modified Files:
project.xml
Log Message:
CMSC-947) Improve the newletter import/export into a generic community
import/export,add Xtream in project.xml
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community
See also: http://www.mmbase.org/jira/browse/CMSC-947
Index: project.xml
===
RCS file: /var/cvs/contributions/CMSContainer_Modules/community/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- project.xml 29 Jan 2008 14:58:34 - 1.4
+++ project.xml 15 Jul 2008 04:39:15 - 1.5
@@ -140,6 +140,13 @@
${war.bundle}
+
+
+ com.thoughtworks.xstream
+ xstream
+ 1.2
+ jar
+
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules modulesmenu.jsp
Update of /var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules In directory james.mmbase.org:/tmp/cvs-serv31155 Modified Files: modulesmenu.jsp Log Message: CMSC-947, Improve the newletter import/export into a generic community import/export,change jsp See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules See also: http://www.mmbase.org/jira/browse/CMSC-947 Index: modulesmenu.jsp === RCS file: /var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -b -r1.20 -r1.21 --- modulesmenu.jsp 10 Jun 2008 11:59:29 - 1.20 +++ modulesmenu.jsp 15 Jul 2008 04:38:05 - 1.21 @@ -48,6 +48,12 @@ + + + + + + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/edit-webapp/resources cmsc.properties
Update of /var/cvs/contributions/CMSContainer/cmsc/edit-webapp/resources In directory james.mmbase.org:/tmp/cvs-serv31115 Modified Files: cmsc.properties Log Message: CMSC-947,Improve the newletter import/export into a generic community import/export,add properties,EXportImportAction and form,change some seviceand pojo See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/resources See also: http://www.mmbase.org/jira/browse/CMSC-947 Index: cmsc.properties === RCS file: /var/cvs/contributions/CMSContainer/cmsc/edit-webapp/resources/cmsc.properties,v retrieving revision 1.34 retrieving revision 1.35 diff -u -b -r1.34 -r1.35 --- cmsc.properties 14 Jul 2008 09:39:03 - 1.34 +++ cmsc.properties 15 Jul 2008 04:37:09 - 1.35 @@ -113,6 +113,7 @@ modules.community=Community modules.subsite=Sub Sites modules.community.reference=Community Preferences +modules.community.data=Community Data dump.title=Dump Default Data dump.help.1=This page can be used to dump the framework data to MMBase default data files somewhere on the file systems of the server. ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions - Imported sources
Update of /var/cvs/contributions In directory james.mmbase.org:/tmp/cvs-serv29240 Log Message: Status: Vendor Tag: tcvs-vendor Release Tags: tcvs-release No conflicts created by this import See also: http://cvs.mmbase.org/viewcvs/contributions ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] html/mmbase/components/x change.jspx create.jspx
Update of /var/cvs/html/mmbase/components/x
In directory james.mmbase.org:/tmp/cvs-serv14906
Modified Files:
change.jspx create.jspx
Log Message:
javascript was changed a bit
See also: http://cvs.mmbase.org/viewcvs/html/mmbase/components/x
Index: change.jspx
===
RCS file: /var/cvs/html/mmbase/components/x/change.jspx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- change.jspx 27 Jun 2008 12:41:40 - 1.6
+++ change.jspx 14 Jul 2008 17:52:07 - 1.7
@@ -14,7 +14,7 @@
TODO: Some way to edit relations? NODE-field editor?
- $Id: change.jspx,v 1.6 2008/06/27 12:41:40 michiel Exp $
+ $Id: change.jspx,v 1.7 2008/07/14 17:52:07 michiel Exp $
-->
init
@@ -30,7 +30,7 @@
validator.validateHook = function(valid) {
document.getElementById('okbutton').disabled =
this.invalidElements != 0;
}
-validator.setup(window,
document.getElementById("${requestScope.componentId}"));
+
validator.setup(document.getElementById("${requestScope.componentId}"));
readonly
Index: create.jspx
===
RCS file: /var/cvs/html/mmbase/components/x/create.jspx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- create.jspx 27 Jun 2008 12:41:40 - 1.6
+++ create.jspx 14 Jul 2008 17:52:07 - 1.7
@@ -16,12 +16,12 @@
document.getElementById('okbutton').disabled = this.invalidElements !=
0;
}
- validator.setup(window,
document.getElementById("${requestScope.componentId}"));
+ validator.setup(document.getElementById("${requestScope.componentId}"));
nodemanager,only?
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] html/mmbase/edit/basic login.jsp page_base.jsp
Update of /var/cvs/html/mmbase/edit/basic
In directory james.mmbase.org:/tmp/cvs-serv14602
Modified Files:
login.jsp page_base.jsp
Log Message:
avoid javascript error on login page
See also: http://cvs.mmbase.org/viewcvs/html/mmbase/edit/basic
Index: login.jsp
===
RCS file: /var/cvs/html/mmbase/edit/basic/login.jsp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- login.jsp 16 Aug 2005 17:11:56 - 1.13
+++ login.jsp 14 Jul 2008 17:43:00 - 1.14
@@ -5,6 +5,7 @@
Login
+
Index: page_base.jsp
===
RCS file: /var/cvs/html/mmbase/edit/basic/page_base.jsp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- page_base.jsp 14 Jul 2008 17:34:35 - 1.35
+++ page_base.jsp 14 Jul 2008 17:43:00 - 1.36
@@ -10,6 +10,7 @@
"/>
+if (typeof(MMBaseValidator) != "undefined") {
var validator = new MMBaseValidator();
validator.logEnabled = false;
validator.traceEnabled = false;
@@ -22,5 +23,6 @@
}
validator.lang = '${config.lang}';
validator.setup(document);
+}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] html/mmbase/edit/basic change_node.jsp create_node.jsp new_relation.jsp page_base.jsp search_node_with_type.jsp
Update of /var/cvs/html/mmbase/edit/basic
In directory james.mmbase.org:/tmp/cvs-serv14240
Modified Files:
change_node.jsp create_node.jsp new_relation.jsp page_base.jsp
search_node_with_type.jsp
Log Message:
various improvements (javascript mainly)
See also: http://cvs.mmbase.org/viewcvs/html/mmbase/edit/basic
Index: change_node.jsp
===
RCS file: /var/cvs/html/mmbase/edit/basic/change_node.jsp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- change_node.jsp 14 Jul 2008 17:17:50 - 1.39
+++ change_node.jsp 14 Jul 2008 17:34:35 - 1.40
@@ -16,19 +16,6 @@
-
-var validator = new MMBaseValidator();
-validator.logEnabled = false;
-validator.traceEnabled = false;
-validator.sessionName = '${config.session}';
-validator.prefetchNodeManager('<%=thisNode.getNodeManager().getName()%>');
-validator.validateHook = function() {
- document.getElementById('okbutton').disabled = this.invalidElements !=
0;
- document.getElementById('savebutton').disabled = this.invalidElements
!= 0;
-}
-validator.lang = '${config.lang}';
-validator.setup(document);
-
<%
if (urlStack.size() == 0) {
Index: create_node.jsp
===
RCS file: /var/cvs/html/mmbase/edit/basic/create_node.jsp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- create_node.jsp 4 Jul 2008 16:08:22 - 1.19
+++ create_node.jsp 14 Jul 2008 17:34:35 - 1.20
@@ -11,16 +11,6 @@
-
-var validator = new MMBaseValidator();
-validator.prefetchNodeManager('${node_type}');
-validator.validateHook = function(valid) {
- document.getElementById('okbutton').disabled = this.invalidElements !=
0;
-}
-validator.lang = '${config.lang}';
-validator.setup(document);
-
-
Index: new_relation.jsp
===
RCS file: /var/cvs/html/mmbase/edit/basic/new_relation.jsp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- new_relation.jsp14 Jul 2008 17:15:24 - 1.23
+++ new_relation.jsp14 Jul 2008 17:34:35 - 1.24
@@ -22,6 +22,8 @@
yes
+
+
@@ -78,7 +80,7 @@
-
+
<%= toHtml(urlStack, request) %>
@@ -91,7 +93,7 @@
-
+
Index: page_base.jsp
===
RCS file: /var/cvs/html/mmbase/edit/basic/page_base.jsp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- page_base.jsp 13 Aug 2007 08:30:58 - 1.34
+++ page_base.jsp 14 Jul 2008 17:34:35 - 1.35
@@ -9,4 +9,18 @@
%>
"/>
+
+var validator = new MMBaseValidator();
+validator.logEnabled = false;
+validator.traceEnabled = false;
+validator.sessionName = '${config.session}';
+validator.validateHook = function() {
+ var okbutton = document.getElementById('okbutton');
+ if (okbutton != null) okbutton.disabled = this.invalidElements != 0;
+ var savebutton = document.getElementById('savebutton');
+ if (savebutton != null) savebutton.disabled = this.invalidElements != 0;
+}
+validator.lang = '${config.lang}';
+validator.setup(document);
+
Index: search_node_with_type.jsp
===
RCS file: /var/cvs/html/mmbase/edit/basic/search_node_with_type.jsp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] html/mmbase/edit/basic/css base.css
Update of /var/cvs/html/mmbase/edit/basic/css
In directory james.mmbase.org:/tmp/cvs-serv14240/css
Modified Files:
base.css
Log Message:
various improvements (javascript mainly)
See also: http://cvs.mmbase.org/viewcvs/html/mmbase/edit/basic/css
Index: base.css
===
RCS file: /var/cvs/html/mmbase/edit/basic/css/base.css,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- base.css2 Oct 2007 11:11:53 - 1.9
+++ base.css14 Jul 2008 17:34:35 - 1.10
@@ -10,9 +10,7 @@
width: 100%;
}
-.invalid {
- background-color: #ffcfcf;
-}
+
/* submit buttons */
.buttons {
text-align: right
@@ -38,20 +36,24 @@
input {
}
+.mm_validate.invalid {
+ background-color: #ffcfcf;
+}
+
.mm_check_error {
background-color: yellow;
}
.mm_check_error span {
+ display: inline;
+ border-left: none;
+ padding-left: 0ex;
+}
+.mm_check_error span:not(:first-child) {
display: none; /* show only first child */
border-left: solid #aaa 3px;
padding-left: 1ex;
margin-right: 1ex;
}
-.mm_check_error span:first-child {
- display: inline;
- border-left: none;
- padding-left: 0ex;
-}
/* footers */
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] html/mmbase/edit/basic change_node.jsp
Update of /var/cvs/html/mmbase/edit/basic
In directory james.mmbase.org:/tmp/cvs-serv13803
Modified Files:
change_node.jsp
Log Message:
validator not working
See also: http://cvs.mmbase.org/viewcvs/html/mmbase/edit/basic
Index: change_node.jsp
===
RCS file: /var/cvs/html/mmbase/edit/basic/change_node.jsp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- change_node.jsp 21 Dec 2007 13:45:47 - 1.38
+++ change_node.jsp 14 Jul 2008 17:17:50 - 1.39
@@ -27,7 +27,7 @@
document.getElementById('savebutton').disabled = this.invalidElements
!= 0;
}
validator.lang = '${config.lang}';
-validator.setup(window);
+validator.setup(document);
<%
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] html/mmbase/edit/basic new_relation.jsp
Update of /var/cvs/html/mmbase/edit/basic In directory james.mmbase.org:/tmp/cvs-serv13726 Modified Files: new_relation.jsp Log Message: making relations was broken See also: http://cvs.mmbase.org/viewcvs/html/mmbase/edit/basic Index: new_relation.jsp === RCS file: /var/cvs/html/mmbase/edit/basic/new_relation.jsp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -b -r1.22 -r1.23 --- new_relation.jsp9 Feb 2007 17:14:16 - 1.22 +++ new_relation.jsp14 Jul 2008 17:15:24 - 1.23 @@ -16,7 +16,8 @@ <%= toHtml(urlStack, request) %> - + yes yes ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/util ResourceLoader.java ApplicationContextReader.java
Update of /var/cvs/src/org/mmbase/util
In directory james.mmbase.org:/tmp/cvs-serv10476
Modified Files:
Tag: MMBase-1_8
ResourceLoader.java ApplicationContextReader.java
Log Message:
backported MMB-1598
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util
See also: http://www.mmbase.org/jira/browse/MMB-1598
Index: ResourceLoader.java
===
RCS file: /var/cvs/src/org/mmbase/util/ResourceLoader.java,v
retrieving revision 1.39.2.6
retrieving revision 1.39.2.7
diff -u -b -r1.39.2.6 -r1.39.2.7
--- ResourceLoader.java 23 Jun 2008 12:42:25 - 1.39.2.6
+++ ResourceLoader.java 14 Jul 2008 15:22:32 - 1.39.2.7
@@ -97,7 +97,7 @@
* For property-files, the java-unicode-escaping is undone on loading, and
applied on saving, so there is no need to think of that.
* @author Michiel Meeuwissen
* @since MMBase-1.8
- * @version $Id: ResourceLoader.java,v 1.39.2.6 2008/06/23 12:42:25 michiel
Exp $
+ * @version $Id: ResourceLoader.java,v 1.39.2.7 2008/07/14 15:22:32 michiel
Exp $
*/
public class ResourceLoader extends ClassLoader {
@@ -334,6 +334,8 @@
log.warn("mmbase.config system property is masked by
mmbase.config servlet context parameter");
}
+configRoot.roots.add(configRoot.new
ApplicationContextFileURLStreamHandler());
+
if (configPath != null) {
if (servletContext != null) {
// take into account that configpath can start at
webrootdir
@@ -345,6 +347,7 @@
configRoot.roots.add(configRoot.new FileURLStreamHandler(new
File(configPath), true));
}
+
if (servletContext != null) {
String s = servletContext.getRealPath(RESOURCE_ROOT);
if (s != null) {
@@ -475,6 +478,8 @@
Object o = i.next();
if (o instanceof FileURLStreamHandler) {
roots.add(new FileURLStreamHandler((FileURLStreamHandler) o));
+} else if (o instanceof ApplicationContextFileURLStreamHandler) {
+roots.add(new ApplicationContextFileURLStreamHandler());
} else if (o instanceof NodeURLStreamHandler) {
roots.add(new NodeURLStreamHandler((NodeURLStreamHandler) o));
} else if (o instanceof ServletResourceURLStreamHandler) {
@@ -911,8 +916,11 @@
Iterator i = roots.iterator();
while (i.hasNext()) {
Object o = i.next();
-if (o instanceof FileURLStreamHandler) {
-result.add(((FileURLStreamHandler) o).getFile(name));
+if (o instanceof AbstractFileURLStreamHandler) {
+File f = ((AbstractFileURLStreamHandler) o).getFile(name);
+if (f != null) {
+result.add(((AbstractFileURLStreamHandler)
o).getFile(name));
+}
}
}
return result;
@@ -1090,46 +1098,24 @@
abstract Set getPaths(Set results, Pattern pattern, boolean
recursive, boolean directories);
}
+//
+// Files
-protected class FileURLStreamHandler extends PathURLStreamHandler {
-private File fileRoot;
-private boolean writeable;
-FileURLStreamHandler(File root, boolean w) {
-fileRoot = root;
+protected abstract class AbstractFileURLStreamHandler extends
PathURLStreamHandler {
+protected final boolean writeable;
+AbstractFileURLStreamHandler(boolean w) {
writeable = w;
-
-}
-FileURLStreamHandler(FileURLStreamHandler f) {
-fileRoot = f.fileRoot;
-writeable = f.writeable;
}
-public File getFile(String name) {
-if (name != null && name.startsWith("file:")) {
-try {
-return new File(new URI(name)); // hff, how cumbersome, to
translate an URL to a File
-} catch (URISyntaxException use) {
-log.warn(use);
-}
-}
-String fileName = fileRoot + ResourceLoader.this.context.getPath()
+ (name == null ? "" : name);
-if (! File.separator.equals("/")) { // windows compatibility
-fileName = fileName.replace('/', File.separator.charAt(0)); //
er
-}
-return new File(fileName);
-}
-public String getName(URL u) {
-int l = (fileRoot +
ResourceLoader.this.context.getPath()).length();
-String path = u.getPath();
-return l < path.length() ? path.substring(l) : path;
-}
public URLConnection openConnection(String name) {
URL u;
try {
if (name.startsWith("file:")) {
u = new URL(null, name, this);
} else {
-
[MMBASE CVS] documentation/administrators configuration.xml
Update of /var/cvs/documentation/administrators In directory james.mmbase.org:/tmp/cvs-serv10281 Modified Files: configuration.xml Log Message: I forgot that it _is_ possible to override builde properties too. Documented dhtat See also: http://cvs.mmbase.org/viewcvs/documentation/administrators Index: configuration.xml === RCS file: /var/cvs/documentation/administrators/configuration.xml,v retrieving revision 1.29 retrieving revision 1.30 diff -u -b -r1.29 -r1.30 --- configuration.xml 11 Jul 2008 22:25:29 - 1.29 +++ configuration.xml 14 Jul 2008 15:16:46 - 1.30 @@ -7,7 +7,7 @@ 2006-06-24 -$Id: configuration.xml,v 1.29 2008/07/11 22:25:29 michiel Exp $ +$Id: configuration.xml,v 1.30 2008/07/14 15:16:46 michiel Exp $ @@ -267,6 +267,11 @@ Any mmbase module property can be overridden in the application context. + + +Any mmbase builder property can be overridden in the application context. + + We give an example of a context xml as may be used in tomcat. ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Demo/i18n-demo/maven-base project.properties
Update of /var/cvs/contributions/CMSContainer_Demo/i18n-demo/maven-base In directory james.mmbase.org:/tmp/cvs-serv10068/i18n-demo/maven-base Modified Files: Tag: b1_4 project.properties Log Message: CMSC-889 Relation to Contentelement can't order CMSC-386 animated gif and scaling mmbase version 1.8.6-20080718 See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/i18n-demo/maven-base See also: http://www.mmbase.org/jira/browse/CMSC-889 See also: http://www.mmbase.org/jira/browse/CMSC-386 Index: project.properties === RCS file: /var/cvs/contributions/CMSContainer_Demo/i18n-demo/maven-base/project.properties,v retrieving revision 1.2.2.17 retrieving revision 1.2.2.18 diff -u -b -r1.2.2.17 -r1.2.2.18 --- project.properties 27 Jun 2008 09:25:25 - 1.2.2.17 +++ project.properties 14 Jul 2008 15:11:39 - 1.2.2.18 @@ -10,7 +10,7 @@ cmsc.version=1.4.9-SNAPSHOT cmscportlets.version=1.4.9-SNAPSHOT cmscmodules.version=1.4.9-SNAPSHOT -mmbase.version=1.8.6-20080502 +mmbase.version=1.8.6-20080719 # maven build does not yet generate a rmmci. Did not create one by hand mmbasermmci.version=1.8.2-20061020 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Demo/www.cmscontainer.org/maven-base project.properties
Update of /var/cvs/contributions/CMSContainer_Demo/www.cmscontainer.org/maven-base In directory james.mmbase.org:/tmp/cvs-serv10068/www.cmscontainer.org/maven-base Modified Files: Tag: b1_4 project.properties Log Message: CMSC-889 Relation to Contentelement can't order CMSC-386 animated gif and scaling mmbase version 1.8.6-20080718 See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/www.cmscontainer.org/maven-base See also: http://www.mmbase.org/jira/browse/CMSC-889 See also: http://www.mmbase.org/jira/browse/CMSC-386 Index: project.properties === RCS file: /var/cvs/contributions/CMSContainer_Demo/www.cmscontainer.org/maven-base/project.properties,v retrieving revision 1.3.2.16 retrieving revision 1.3.2.17 diff -u -b -r1.3.2.16 -r1.3.2.17 --- project.properties 27 Jun 2008 09:25:25 - 1.3.2.16 +++ project.properties 14 Jul 2008 15:11:39 - 1.3.2.17 @@ -11,7 +11,7 @@ cmscportlets.version=1.4.9-SNAPSHOT cmscmodules.version=1.4.9-SNAPSHOT luceus.version=0.42 -mmbase.version=1.8.6-20080502 +mmbase.version=1.8.6-20080719 # maven build does not yet generate a rmmci. Did not create one by hand mmbasermmci.version=1.8.2-20061020 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Demo/demo.cmscontainer.org/maven-base project.properties
Update of /var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/maven-base In directory james.mmbase.org:/tmp/cvs-serv10068/demo.cmscontainer.org/maven-base Modified Files: Tag: b1_4 project.properties Log Message: CMSC-889 Relation to Contentelement can't order CMSC-386 animated gif and scaling mmbase version 1.8.6-20080718 See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/maven-base See also: http://www.mmbase.org/jira/browse/CMSC-889 See also: http://www.mmbase.org/jira/browse/CMSC-386 Index: project.properties === RCS file: /var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/maven-base/project.properties,v retrieving revision 1.8.2.17 retrieving revision 1.8.2.18 diff -u -b -r1.8.2.17 -r1.8.2.18 --- project.properties 27 Jun 2008 09:25:25 - 1.8.2.17 +++ project.properties 14 Jul 2008 15:11:39 - 1.8.2.18 @@ -10,7 +10,7 @@ cmsc.version=1.4.9-SNAPSHOT cmscportlets.version=1.4.9-SNAPSHOT cmscmodules.version=1.4.9-SNAPSHOT -mmbase.version=1.8.6-20080502 +mmbase.version=1.8.6-20080719 # maven build does not yet generate a rmmci. Did not create one by hand mmbasermmci.version=1.8.2-20061020 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/maven-base project.properties
Update of /var/cvs/contributions/CMSContainer_Modules/maven-base In directory james.mmbase.org:/tmp/cvs-serv10031/maven-base Modified Files: project.properties Log Message: CMSC-889 Relation to Contentelement can't order CMSC-386 animated gif and scaling mmbase version 1.8.6-20080718 See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/maven-base See also: http://www.mmbase.org/jira/browse/CMSC-889 See also: http://www.mmbase.org/jira/browse/CMSC-386 Index: project.properties === RCS file: /var/cvs/contributions/CMSContainer_Modules/maven-base/project.properties,v retrieving revision 1.29 retrieving revision 1.30 diff -u -b -r1.29 -r1.30 --- project.properties 2 May 2008 12:01:53 - 1.29 +++ project.properties 14 Jul 2008 15:11:31 - 1.30 @@ -9,7 +9,7 @@ cmscmodules.version=1.5-SNAPSHOT cmsc.version=1.5-SNAPSHOT -mmbase.version=1.8.6-20080502 +mmbase.version=1.8.6-20080719 # maven build does not yet generate a rmmci. Did not create one by hand mmbasermmci.version=1.8.2-20061020 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules .classpath
Update of /var/cvs/contributions/CMSContainer_Modules In directory james.mmbase.org:/tmp/cvs-serv10031 Modified Files: .classpath Log Message: CMSC-889 Relation to Contentelement can't order CMSC-386 animated gif and scaling mmbase version 1.8.6-20080718 See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules See also: http://www.mmbase.org/jira/browse/CMSC-889 See also: http://www.mmbase.org/jira/browse/CMSC-386 Index: .classpath === RCS file: /var/cvs/contributions/CMSContainer_Modules/.classpath,v retrieving revision 1.23 retrieving revision 1.24 diff -u -b -r1.23 -r1.24 --- .classpath 30 Jun 2008 14:06:44 - 1.23 +++ .classpath 14 Jul 2008 15:11:31 - 1.24 @@ -105,7 +105,7 @@ - + http://www.mmbase.org/development/api/1.8/"/> @@ -115,27 +115,27 @@ http://www.mmbase.org/development/api/1.8/"/> - + http://www.mmbase.org/development/api/1.8/"/> - + http://www.mmbase.org/development/api/1.8/"/> - + http://www.mmbase.org/development/api/1.8/"/> - + http://www.mmbase.org/development/api/1.8/"/> - + http://www.mmbase.org/development/api/1.8/"/> ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/maven-base project.properties
Update of /var/cvs/contributions/CMSContainer_Modules/maven-base In directory james.mmbase.org:/tmp/cvs-serv9982/maven-base Modified Files: Tag: b1_4 project.properties Log Message: CMSC-889 Relation to Contentelement can't order CMSC-386 animated gif and scaling mmbase version 1.8.6-20080718 See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/maven-base See also: http://www.mmbase.org/jira/browse/CMSC-889 See also: http://www.mmbase.org/jira/browse/CMSC-386 Index: project.properties === RCS file: /var/cvs/contributions/CMSContainer_Modules/maven-base/project.properties,v retrieving revision 1.23.2.21 retrieving revision 1.23.2.22 diff -u -b -r1.23.2.21 -r1.23.2.22 --- project.properties 27 Jun 2008 09:25:40 - 1.23.2.21 +++ project.properties 14 Jul 2008 15:11:14 - 1.23.2.22 @@ -9,7 +9,7 @@ cmscmodules.version=1.4.9-SNAPSHOT cmsc.version=1.4.9-SNAPSHOT -mmbase.version=1.8.6-20080502 +mmbase.version=1.8.6-20080719 # maven build does not yet generate a rmmci. Did not create one by hand mmbasermmci.version=1.8.2-20061020 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules .classpath
Update of /var/cvs/contributions/CMSContainer_Modules In directory james.mmbase.org:/tmp/cvs-serv9982 Modified Files: Tag: b1_4 .classpath Log Message: CMSC-889 Relation to Contentelement can't order CMSC-386 animated gif and scaling mmbase version 1.8.6-20080718 See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules See also: http://www.mmbase.org/jira/browse/CMSC-889 See also: http://www.mmbase.org/jira/browse/CMSC-386 Index: .classpath === RCS file: /var/cvs/contributions/CMSContainer_Modules/.classpath,v retrieving revision 1.15.2.8 retrieving revision 1.15.2.9 diff -u -b -r1.15.2.8 -r1.15.2.9 --- .classpath 30 Jun 2008 14:03:22 - 1.15.2.8 +++ .classpath 14 Jul 2008 15:11:14 - 1.15.2.9 @@ -105,7 +105,7 @@ - + http://www.mmbase.org/development/api/1.8/"/> @@ -115,32 +115,32 @@ http://www.mmbase.org/development/api/1.8/"/> - + http://www.mmbase.org/development/api/1.8/"/> - + http://www.mmbase.org/development/api/1.8/"/> - + http://www.mmbase.org/development/api/1.8/"/> - + http://www.mmbase.org/development/api/1.8/"/> - + http://www.mmbase.org/development/api/1.8/"/> - + http://www.mmbase.org/development/api/1.8/"/> ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets .classpath
Update of /var/cvs/contributions/CMSContainer_Portlets In directory james.mmbase.org:/tmp/cvs-serv9938 Modified Files: .classpath Log Message: CMSC-889 Relation to Contentelement can't order CMSC-386 animated gif and scaling mmbase version 1.8.6-20080718 See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets See also: http://www.mmbase.org/jira/browse/CMSC-889 See also: http://www.mmbase.org/jira/browse/CMSC-386 Index: .classpath === RCS file: /var/cvs/contributions/CMSContainer_Portlets/.classpath,v retrieving revision 1.26 retrieving revision 1.27 diff -u -b -r1.26 -r1.27 --- .classpath 30 Jun 2008 14:05:21 - 1.26 +++ .classpath 14 Jul 2008 15:11:06 - 1.27 @@ -96,7 +96,7 @@ - + http://www.mmbase.org/development/api/1.8/"/> @@ -106,27 +106,27 @@ http://www.mmbase.org/development/api/1.8/"/> - + http://www.mmbase.org/development/api/1.8/"/> - + http://www.mmbase.org/development/api/1.8/"/> - + http://www.mmbase.org/development/api/1.8/"/> - + http://www.mmbase.org/development/api/1.8/"/> - + http://www.mmbase.org/development/api/1.8/"/> ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/maven-base project.properties
Update of /var/cvs/contributions/CMSContainer_Portlets/maven-base In directory james.mmbase.org:/tmp/cvs-serv9938/maven-base Modified Files: project.properties Log Message: CMSC-889 Relation to Contentelement can't order CMSC-386 animated gif and scaling mmbase version 1.8.6-20080718 See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/maven-base See also: http://www.mmbase.org/jira/browse/CMSC-889 See also: http://www.mmbase.org/jira/browse/CMSC-386 Index: project.properties === RCS file: /var/cvs/contributions/CMSContainer_Portlets/maven-base/project.properties,v retrieving revision 1.20 retrieving revision 1.21 diff -u -b -r1.20 -r1.21 --- project.properties 2 May 2008 12:01:47 - 1.20 +++ project.properties 14 Jul 2008 15:11:06 - 1.21 @@ -10,7 +10,7 @@ cmscportlets.version=1.5-SNAPSHOT cmsc.version=1.5-SNAPSHOT -mmbase.version=1.8.6-20080502 +mmbase.version=1.8.6-20080719 # maven build does not yet generate a rmmci. Did not create one by hand mmbasermmci.version=1.8.2-20061020 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Templates/double/maven-base project.properties
Update of /var/cvs/contributions/CMSContainer_Templates/double/maven-base In directory james.mmbase.org:/tmp/cvs-serv9899/double/maven-base Modified Files: Tag: b1_4 project.properties Log Message: CMSC-889 Relation to Contentelement can't order CMSC-386 animated gif and scaling mmbase version 1.8.6-20080718 See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Templates/double/maven-base See also: http://www.mmbase.org/jira/browse/CMSC-889 See also: http://www.mmbase.org/jira/browse/CMSC-386 Index: project.properties === RCS file: /var/cvs/contributions/CMSContainer_Templates/double/maven-base/project.properties,v retrieving revision 1.3.2.10 retrieving revision 1.3.2.11 diff -u -b -r1.3.2.10 -r1.3.2.11 --- project.properties 27 Jun 2008 09:25:49 - 1.3.2.10 +++ project.properties 14 Jul 2008 15:10:56 - 1.3.2.11 @@ -11,7 +11,7 @@ cmscportlets.version=1.4.9-SNAPSHOT cmscmodules.version=1.4.9-SNAPSHOT -mmbase.version=1.8.6-20080502 +mmbase.version=1.8.6-20080719 # maven build does not yet generate a rmmci. Did not create one by hand mmbasermmci.version=1.8.2-20061020 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Templates/single/maven-base project.properties
Update of /var/cvs/contributions/CMSContainer_Templates/single/maven-base In directory james.mmbase.org:/tmp/cvs-serv9899/single/maven-base Modified Files: Tag: b1_4 project.properties Log Message: CMSC-889 Relation to Contentelement can't order CMSC-386 animated gif and scaling mmbase version 1.8.6-20080718 See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Templates/single/maven-base See also: http://www.mmbase.org/jira/browse/CMSC-889 See also: http://www.mmbase.org/jira/browse/CMSC-386 Index: project.properties === RCS file: /var/cvs/contributions/CMSContainer_Templates/single/maven-base/project.properties,v retrieving revision 1.2.2.10 retrieving revision 1.2.2.11 diff -u -b -r1.2.2.10 -r1.2.2.11 --- project.properties 1 Jul 2008 08:52:13 - 1.2.2.10 +++ project.properties 14 Jul 2008 15:10:56 - 1.2.2.11 @@ -10,7 +10,7 @@ cmsc.version=1.4.9-SNAPSHOT cmscportlets.version=1.4.9-SNAPSHOT cmscmodules.version=1.4.9-SNAPSHOT -mmbase.version=1.8.6-20080502 +mmbase.version=1.8.6-20080719 # maven build does not yet generate a rmmci. Did not create one by hand mmbasermmci.version=1.8.2-20061020 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Demo/i18n-demo/maven-base project.properties
Update of /var/cvs/contributions/CMSContainer_Demo/i18n-demo/maven-base In directory james.mmbase.org:/tmp/cvs-serv9848/i18n-demo/maven-base Modified Files: project.properties Log Message: CMSC-889 Relation to Contentelement can't order CMSC-386 animated gif and scaling mmbase version 1.8.6-20080718 See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/i18n-demo/maven-base See also: http://www.mmbase.org/jira/browse/CMSC-889 See also: http://www.mmbase.org/jira/browse/CMSC-386 Index: project.properties === RCS file: /var/cvs/contributions/CMSContainer_Demo/i18n-demo/maven-base/project.properties,v retrieving revision 1.8 retrieving revision 1.9 diff -u -b -r1.8 -r1.9 --- project.properties 2 May 2008 12:01:01 - 1.8 +++ project.properties 14 Jul 2008 15:10:38 - 1.9 @@ -10,7 +10,7 @@ cmsc.version=1.5-SNAPSHOT cmscportlets.version=1.5-SNAPSHOT cmscmodules.version=1.5-SNAPSHOT -mmbase.version=1.8.6-20080502 +mmbase.version=1.8.6-20080719 # maven build does not yet generate a rmmci. Did not create one by hand mmbasermmci.version=1.8.2-20061020 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Demo/demo.cmscontainer.org/maven-base project.properties
Update of /var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/maven-base In directory james.mmbase.org:/tmp/cvs-serv9848/demo.cmscontainer.org/maven-base Modified Files: project.properties Log Message: CMSC-889 Relation to Contentelement can't order CMSC-386 animated gif and scaling mmbase version 1.8.6-20080718 See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/maven-base See also: http://www.mmbase.org/jira/browse/CMSC-889 See also: http://www.mmbase.org/jira/browse/CMSC-386 Index: project.properties === RCS file: /var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/maven-base/project.properties,v retrieving revision 1.14 retrieving revision 1.15 diff -u -b -r1.14 -r1.15 --- project.properties 2 May 2008 12:01:01 - 1.14 +++ project.properties 14 Jul 2008 15:10:38 - 1.15 @@ -10,7 +10,7 @@ cmsc.version=1.5-SNAPSHOT cmscportlets.version=1.5-SNAPSHOT cmscmodules.version=1.5-SNAPSHOT -mmbase.version=1.8.6-20080502 +mmbase.version=1.8.6-20080719 # maven build does not yet generate a rmmci. Did not create one by hand mmbasermmci.version=1.8.2-20061020 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Demo/www.cmscontainer.org/maven-base project.properties
Update of /var/cvs/contributions/CMSContainer_Demo/www.cmscontainer.org/maven-base In directory james.mmbase.org:/tmp/cvs-serv9848/www.cmscontainer.org/maven-base Modified Files: project.properties Log Message: CMSC-889 Relation to Contentelement can't order CMSC-386 animated gif and scaling mmbase version 1.8.6-20080718 See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/www.cmscontainer.org/maven-base See also: http://www.mmbase.org/jira/browse/CMSC-889 See also: http://www.mmbase.org/jira/browse/CMSC-386 Index: project.properties === RCS file: /var/cvs/contributions/CMSContainer_Demo/www.cmscontainer.org/maven-base/project.properties,v retrieving revision 1.9 retrieving revision 1.10 diff -u -b -r1.9 -r1.10 --- project.properties 2 May 2008 12:01:01 - 1.9 +++ project.properties 14 Jul 2008 15:10:38 - 1.10 @@ -11,7 +11,7 @@ cmscportlets.version=1.5-SNAPSHOT cmscmodules.version=1.5-SNAPSHOT luceus.version=0.42 -mmbase.version=1.8.6-20080502 +mmbase.version=1.8.6-20080719 # maven build does not yet generate a rmmci. Did not create one by hand mmbasermmci.version=1.8.2-20061020 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Templates/double/maven-base project.properties
Update of /var/cvs/contributions/CMSContainer_Templates/double/maven-base In directory james.mmbase.org:/tmp/cvs-serv9812/double/maven-base Modified Files: project.properties Log Message: CMSC-889 Relation to Contentelement can't order CMSC-386 animated gif and scaling mmbase version 1.8.6-20080718 See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Templates/double/maven-base See also: http://www.mmbase.org/jira/browse/CMSC-889 See also: http://www.mmbase.org/jira/browse/CMSC-386 Index: project.properties === RCS file: /var/cvs/contributions/CMSContainer_Templates/double/maven-base/project.properties,v retrieving revision 1.6 retrieving revision 1.7 diff -u -b -r1.6 -r1.7 --- project.properties 23 Jun 2008 08:34:53 - 1.6 +++ project.properties 14 Jul 2008 15:10:30 - 1.7 @@ -11,7 +11,7 @@ cmscportlets.version=1.5-SNAPSHOT cmscmodules.version=1.5-SNAPSHOT -mmbase.version=1.8.6-20080502 +mmbase.version=1.8.6-20080719 # maven build does not yet generate a rmmci. Did not create one by hand mmbasermmci.version=1.8.2-20061020 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Templates/single/maven-base project.properties
Update of /var/cvs/contributions/CMSContainer_Templates/single/maven-base In directory james.mmbase.org:/tmp/cvs-serv9812/single/maven-base Modified Files: project.properties Log Message: CMSC-889 Relation to Contentelement can't order CMSC-386 animated gif and scaling mmbase version 1.8.6-20080718 See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Templates/single/maven-base See also: http://www.mmbase.org/jira/browse/CMSC-889 See also: http://www.mmbase.org/jira/browse/CMSC-386 Index: project.properties === RCS file: /var/cvs/contributions/CMSContainer_Templates/single/maven-base/project.properties,v retrieving revision 1.5 retrieving revision 1.6 diff -u -b -r1.5 -r1.6 --- project.properties 23 Jun 2008 08:34:53 - 1.5 +++ project.properties 14 Jul 2008 15:10:30 - 1.6 @@ -10,7 +10,7 @@ cmsc.version=1.5-SNAPSHOT cmscportlets.version=1.5-SNAPSHOT cmscmodules.version=1.5-SNAPSHOT -mmbase.version=1.8.6-20080502 +mmbase.version=1.8.6-20080719 # maven build does not yet generate a rmmci. Did not create one by hand mmbasermmci.version=1.8.2-20061020 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer .classpath
Update of /var/cvs/contributions/CMSContainer In directory james.mmbase.org:/tmp/cvs-serv9776 Modified Files: Tag: b1_4 .classpath Log Message: CMSC-889 Relation to Contentelement can't order CMSC-386 animated gif and scaling mmbase version 1.8.6-20080718 See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer See also: http://www.mmbase.org/jira/browse/CMSC-889 See also: http://www.mmbase.org/jira/browse/CMSC-386 Index: .classpath === RCS file: /var/cvs/contributions/CMSContainer/.classpath,v retrieving revision 1.11.2.6 retrieving revision 1.11.2.7 diff -u -b -r1.11.2.6 -r1.11.2.7 --- .classpath 30 Jun 2008 14:04:37 - 1.11.2.6 +++ .classpath 14 Jul 2008 15:10:21 - 1.11.2.7 @@ -99,7 +99,7 @@ - + http://www.mmbase.org/development/api/1.8/"/> @@ -109,27 +109,27 @@ http://www.mmbase.org/development/api/1.8/"/> - + http://www.mmbase.org/development/api/1.8/"/> - + http://www.mmbase.org/development/api/1.8/"/> - + http://www.mmbase.org/development/api/1.8/"/> - + http://www.mmbase.org/development/api/1.8/"/> - + http://www.mmbase.org/development/api/1.8/"/> ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/maven-base project.properties
Update of /var/cvs/contributions/CMSContainer/maven-base In directory james.mmbase.org:/tmp/cvs-serv9776/maven-base Modified Files: Tag: b1_4 project.properties Log Message: CMSC-889 Relation to Contentelement can't order CMSC-386 animated gif and scaling mmbase version 1.8.6-20080718 See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/maven-base See also: http://www.mmbase.org/jira/browse/CMSC-889 See also: http://www.mmbase.org/jira/browse/CMSC-386 Index: project.properties === RCS file: /var/cvs/contributions/CMSContainer/maven-base/project.properties,v retrieving revision 1.22.2.21 retrieving revision 1.22.2.22 diff -u -b -r1.22.2.21 -r1.22.2.22 --- project.properties 27 Jun 2008 09:25:55 - 1.22.2.21 +++ project.properties 14 Jul 2008 15:10:20 - 1.22.2.22 @@ -8,7 +8,7 @@ maven.multiproject.type=mmbase-module cmsc.version=1.4.9-SNAPSHOT -mmbase.version=1.8.6-20080502 +mmbase.version=1.8.6-20080719 # maven build does not yet generate a rmmci. Did not create one by hand mmbasermmci.version=1.8.2-20061020 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer .classpath
Update of /var/cvs/contributions/CMSContainer In directory james.mmbase.org:/tmp/cvs-serv9736 Modified Files: .classpath Log Message: CMSC-889 Relation to Contentelement can't order CMSC-386 animated gif and scaling mmbase version 1.8.6-20080718 See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer See also: http://www.mmbase.org/jira/browse/CMSC-889 See also: http://www.mmbase.org/jira/browse/CMSC-386 Index: .classpath === RCS file: /var/cvs/contributions/CMSContainer/.classpath,v retrieving revision 1.21 retrieving revision 1.22 diff -u -b -r1.21 -r1.22 --- .classpath 30 Jun 2008 14:04:18 - 1.21 +++ .classpath 14 Jul 2008 15:10:13 - 1.22 @@ -94,7 +94,7 @@ - + http://www.mmbase.org/development/api/1.8/"/> @@ -104,27 +104,27 @@ http://www.mmbase.org/development/api/1.8/"/> - + http://www.mmbase.org/development/api/1.8/"/> - + http://www.mmbase.org/development/api/1.8/"/> - + http://www.mmbase.org/development/api/1.8/"/> - + http://www.mmbase.org/development/api/1.8/"/> - + http://www.mmbase.org/development/api/1.8/"/> ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/maven-base project.properties
Update of /var/cvs/contributions/CMSContainer/maven-base In directory james.mmbase.org:/tmp/cvs-serv9736/maven-base Modified Files: project.properties Log Message: CMSC-889 Relation to Contentelement can't order CMSC-386 animated gif and scaling mmbase version 1.8.6-20080718 See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/maven-base See also: http://www.mmbase.org/jira/browse/CMSC-889 See also: http://www.mmbase.org/jira/browse/CMSC-386 Index: project.properties === RCS file: /var/cvs/contributions/CMSContainer/maven-base/project.properties,v retrieving revision 1.28 retrieving revision 1.29 diff -u -b -r1.28 -r1.29 --- project.properties 2 May 2008 12:01:18 - 1.28 +++ project.properties 14 Jul 2008 15:10:13 - 1.29 @@ -8,7 +8,7 @@ maven.multiproject.type=mmbase-module cmsc.version=1.5-SNAPSHOT -mmbase.version=1.8.6-20080502 +mmbase.version=1.8.6-20080719 # maven build does not yet generate a rmmci. Did not create one by hand mmbasermmci.version=1.8.2-20061020 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets .classpath
Update of /var/cvs/contributions/CMSContainer_Portlets In directory james.mmbase.org:/tmp/cvs-serv9699 Modified Files: Tag: b1_4 .classpath Log Message: CMSC-889 Relation to Contentelement can't order CMSC-386 animated gif and scaling mmbase version 1.8.6-20080718 See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets See also: http://www.mmbase.org/jira/browse/CMSC-889 See also: http://www.mmbase.org/jira/browse/CMSC-386 Index: .classpath === RCS file: /var/cvs/contributions/CMSContainer_Portlets/.classpath,v retrieving revision 1.15.2.7 retrieving revision 1.15.2.8 diff -u -b -r1.15.2.7 -r1.15.2.8 --- .classpath 30 Jun 2008 14:06:01 - 1.15.2.7 +++ .classpath 14 Jul 2008 15:10:06 - 1.15.2.8 @@ -94,7 +94,7 @@ - + http://www.mmbase.org/development/api/1.8/"/> @@ -104,32 +104,32 @@ http://www.mmbase.org/development/api/1.8/"/> - + http://www.mmbase.org/development/api/1.8/"/> - + http://www.mmbase.org/development/api/1.8/"/> - + http://www.mmbase.org/development/api/1.8/"/> - + http://www.mmbase.org/development/api/1.8/"/> - + http://www.mmbase.org/development/api/1.8/"/> - + http://www.mmbase.org/development/api/1.8/"/> ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/maven-base project.properties
Update of /var/cvs/contributions/CMSContainer_Portlets/maven-base In directory james.mmbase.org:/tmp/cvs-serv9699/maven-base Modified Files: Tag: b1_4 project.properties Log Message: CMSC-889 Relation to Contentelement can't order CMSC-386 animated gif and scaling mmbase version 1.8.6-20080718 See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/maven-base See also: http://www.mmbase.org/jira/browse/CMSC-889 See also: http://www.mmbase.org/jira/browse/CMSC-386 Index: project.properties === RCS file: /var/cvs/contributions/CMSContainer_Portlets/maven-base/project.properties,v retrieving revision 1.14.2.21 retrieving revision 1.14.2.22 diff -u -b -r1.14.2.21 -r1.14.2.22 --- project.properties 27 Jun 2008 09:25:19 - 1.14.2.21 +++ project.properties 14 Jul 2008 15:10:06 - 1.14.2.22 @@ -10,7 +10,7 @@ cmscportlets.version=1.4.9-SNAPSHOT cmsc.version=1.4.9-SNAPSHOT -mmbase.version=1.8.6-20080502 +mmbase.version=1.8.6-20080719 # maven build does not yet generate a rmmci. Did not create one by hand mmbasermmci.version=1.8.2-20061020 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/crontab/blocks index.jspx
Update of /var/cvs/applications/crontab/blocks
In directory james.mmbase.org:/tmp/cvs-serv8004
Modified Files:
index.jspx
Log Message:
MMB-1677
See also: http://cvs.mmbase.org/viewcvs/applications/crontab/blocks
See also: http://www.mmbase.org/jira/browse/MMB-1677
Index: index.jspx
===
RCS file: /var/cvs/applications/crontab/blocks/index.jspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- index.jspx 14 Jul 2008 13:58:20 - 1.1
+++ index.jspx 14 Jul 2008 13:59:23 - 1.2
@@ -60,6 +60,9 @@
type
time
running
+last run started on
+cost of last run (ms)
+# runs
class
configuration
@@ -96,6 +99,9 @@
+ ${cronentry.lastRun}
+ ${cronentry.lastCost}
+ ${cronentry.count}
${cronentry.className}
${cronentry.configuration}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/crontab/templates component.jspx
Update of /var/cvs/applications/crontab/templates In directory james.mmbase.org:/tmp/cvs-serv7906/templates Removed Files: component.jspx Log Message: moved block jsp to blocks See also: http://cvs.mmbase.org/viewcvs/applications/crontab/templates ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/crontab/config/components crontab.xml
Update of /var/cvs/applications/crontab/config/components In directory james.mmbase.org:/tmp/cvs-serv7906/config/components Modified Files: crontab.xml Log Message: moved block jsp to blocks See also: http://cvs.mmbase.org/viewcvs/applications/crontab/config/components Index: crontab.xml === RCS file: /var/cvs/applications/crontab/config/components/crontab.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- crontab.xml 18 Jul 2007 11:03:52 - 1.3 +++ crontab.xml 14 Jul 2008 13:58:20 - 1.4 @@ -14,7 +14,7 @@ name="crontab" mimetype="text/html" > Administrates the mmbase crontab - + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/crontab/blocks index.jspx
Update of /var/cvs/applications/crontab/blocks In directory james.mmbase.org:/tmp/cvs-serv7906/blocks Added Files: index.jspx Log Message: moved block jsp to blocks See also: http://cvs.mmbase.org/viewcvs/applications/crontab/blocks index.jspx is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/crontab build.xml
Update of /var/cvs/applications/crontab In directory james.mmbase.org:/tmp/cvs-serv7864 Modified Files: build.xml Log Message: simplified See also: http://cvs.mmbase.org/viewcvs/applications/crontab Index: build.xml === RCS file: /var/cvs/applications/crontab/build.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- build.xml 7 Oct 2006 13:02:40 - 1.2 +++ build.xml 14 Jul 2008 13:58:06 - 1.3 @@ -1,6 +1,5 @@ - - + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/crontab/blocks - New directory
Update of /var/cvs/applications/crontab/blocks In directory james.mmbase.org:/tmp/cvs-serv7726/blocks Log Message: Directory /var/cvs/applications/crontab/blocks added to the repository See also: http://cvs.mmbase.org/viewcvs/applications/crontab/blocks ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/crontab/templates index.jspx
Update of /var/cvs/applications/crontab/templates
In directory james.mmbase.org:/tmp/cvs-serv7656
Modified Files:
Tag: MMBase-1_8
index.jspx
Log Message:
MMB-1677
See also: http://cvs.mmbase.org/viewcvs/applications/crontab/templates
See also: http://www.mmbase.org/jira/browse/MMB-1677
Index: index.jspx
===
RCS file: /var/cvs/applications/crontab/templates/index.jspx,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -b -r1.3 -r1.3.2.1
--- index.jspx 7 Jun 2006 15:32:15 - 1.3
+++ index.jspx 14 Jul 2008 13:54:08 - 1.3.2.1
@@ -63,6 +63,9 @@
type
time
running
+last run started on
+cost of last run (ms)
+# runs
class
configuration
@@ -99,6 +102,9 @@
+ ${cronentry.lastRun}
+ ${cronentry.lastCost}
+ ${cronentry.count}
${cronentry.className}
${cronentry.configuration}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/crontab/config/applications/MMBaseCrontabApp/builders cronjobs.xml
Update of /var/cvs/applications/crontab/config/applications/MMBaseCrontabApp/builders In directory james.mmbase.org:/tmp/cvs-serv7581/builders Modified Files: Tag: MMBase-1_8 cronjobs.xml Log Message: MMB-1677 See also: http://cvs.mmbase.org/viewcvs/applications/crontab/config/applications/MMBaseCrontabApp/builders See also: http://www.mmbase.org/jira/browse/MMB-1677 Index: cronjobs.xml === RCS file: /var/cvs/applications/crontab/config/applications/MMBaseCrontabApp/builders/cronjobs.xml,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -u -b -r1.4.2.2 -r1.4.2.3 --- cronjobs.xml21 Sep 2007 12:16:00 - 1.4.2.2 +++ cronjobs.xml14 Jul 2008 13:52:20 - 1.4.2.3 @@ -107,6 +107,17 @@ + + + http://www.mmbase.org/xmlns/datatypes"; /> + + + + http://www.mmbase.org/xmlns/datatypes"; /> + + + http://www.mmbase.org/xmlns/datatypes"; /> + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/crontab/src/org/mmbase/applications/crontab/builders CronJobs.java
Update of
/var/cvs/applications/crontab/src/org/mmbase/applications/crontab/builders
In directory james.mmbase.org:/tmp/cvs-serv7527/builders
Modified Files:
Tag: MMBase-1_8
CronJobs.java
Log Message:
lowered log
See also:
http://cvs.mmbase.org/viewcvs/applications/crontab/src/org/mmbase/applications/crontab/builders
Index: CronJobs.java
===
RCS file:
/var/cvs/applications/crontab/src/org/mmbase/applications/crontab/builders/CronJobs.java,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -b -r1.2.2.3 -r1.2.2.4
--- CronJobs.java 14 Jul 2008 13:43:54 - 1.2.2.3
+++ CronJobs.java 14 Jul 2008 13:52:03 - 1.2.2.4
@@ -111,10 +111,10 @@
if (changed.contains("classfile") ||
changed.contains("name") ||
changed.contains("type")) {
-log.warn("Changed fields " + changed);
+log.debug("Changed fields " + changed);
cronDaemon.remove(entry);
} else {
-log.warn("Ignored " + node);
+log.debug("Ignored " + node);
return retval;
}
} else {
@@ -123,7 +123,7 @@
}
}
try {
-log.info("Replacing cronentry " + entry);
+log.debug("Replacing cronentry " + entry);
Node n = getCloud().getNode(node.getNumber());
cronDaemon.add(new NodeCronEntry(n));
} catch (Exception e) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/crontab/src/org/mmbase/applications/crontab TestCronJob.java
Update of /var/cvs/applications/crontab/src/org/mmbase/applications/crontab
In directory james.mmbase.org:/tmp/cvs-serv7527
Modified Files:
Tag: MMBase-1_8
TestCronJob.java
Log Message:
lowered log
See also:
http://cvs.mmbase.org/viewcvs/applications/crontab/src/org/mmbase/applications/crontab
Index: TestCronJob.java
===
RCS file:
/var/cvs/applications/crontab/src/org/mmbase/applications/crontab/TestCronJob.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- TestCronJob.java14 Jul 2008 13:43:54 - 1.1.2.1
+++ TestCronJob.java14 Jul 2008 13:52:03 - 1.1.2.2
@@ -25,8 +25,8 @@
log.info("found cloud " + cloud.getUser().getIdentifier() + "/" +
cloud.getUser().getRank());
try {
log.info("sleeping");
-//Thread.sleep(130 * 1000);
-Thread.sleep(130);
+Thread.sleep(130 * 1000);
+//Thread.sleep(130);
log.info("sleeped");
} catch (Exception e) {}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/crontab/src/org/mmbase/applications/crontab/modules CrontabModule.java
Update of
/var/cvs/applications/crontab/src/org/mmbase/applications/crontab/modules
In directory james.mmbase.org:/tmp/cvs-serv7427/modules
Modified Files:
CrontabModule.java
Log Message:
MMB-1677
See also:
http://cvs.mmbase.org/viewcvs/applications/crontab/src/org/mmbase/applications/crontab/modules
See also: http://www.mmbase.org/jira/browse/MMB-1677
Index: CrontabModule.java
===
RCS file:
/var/cvs/applications/crontab/src/org/mmbase/applications/crontab/modules/CrontabModule.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- CrontabModule.java 21 Jun 2007 15:50:22 - 1.12
+++ CrontabModule.java 14 Jul 2008 13:51:36 - 1.13
@@ -19,7 +19,7 @@
* Starts a crontab for MMBase as a Module.
*
* @author Michiel Meeuwissen
- * @version $Id: CrontabModule.java,v 1.12 2007/06/21 15:50:22 nklasens Exp $
+ * @version $Id: CrontabModule.java,v 1.13 2008/07/14 13:51:36 michiel Exp $
*/
public class CrontabModule extends WatchedReloadableModule {
@@ -149,7 +149,7 @@
};
{
-addFunction(listFunction);
+Function f = addFunction(listFunction);
}
protected final static Parameter ENTRY = new
Parameter("entry", String.class, true);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/crontab/src/org/mmbase/applications/crontab/builders NodeCronEntry.java CronJobs.java
Update of
/var/cvs/applications/crontab/src/org/mmbase/applications/crontab/builders
In directory james.mmbase.org:/tmp/cvs-serv7427/builders
Modified Files:
CronJobs.java
Added Files:
NodeCronEntry.java
Log Message:
MMB-1677
See also:
http://cvs.mmbase.org/viewcvs/applications/crontab/src/org/mmbase/applications/crontab/builders
See also: http://www.mmbase.org/jira/browse/MMB-1677
Index: CronJobs.java
===
RCS file:
/var/cvs/applications/crontab/src/org/mmbase/applications/crontab/builders/CronJobs.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- CronJobs.java 5 Feb 2007 14:39:10 - 1.5
+++ CronJobs.java 14 Jul 2008 13:51:36 - 1.6
@@ -11,13 +11,14 @@
import org.mmbase.bridge.*;
import org.mmbase.module.core.*;
import org.mmbase.util.logging.*;
+import java.util.*;
/**
* Builder that holds cronjobs and listens to changes.
* The builder also starts the CronDeamon. on startup the list of cronjobs is
loaded into memory.
* The builder uses the bridge to get a cloud using class security.
* @author Kees Jongenburger
- * @version $Id: CronJobs.java,v 1.5 2007/02/05 14:39:10 michiel Exp $
+ * @version $Id: CronJobs.java,v 1.6 2008/07/14 13:51:36 michiel Exp $
*/
public class CronJobs extends MMObjectBuilder implements Runnable {
@@ -50,7 +51,7 @@
Node node = nodeIterator.nextNode();
CronEntry entry = null;
try {
-entry = createCronEntry(node);
+entry = new NodeCronEntry(node);
NodeList servers = node.getRelatedNodes("mmservers");
if (servers.size() > 0) {
String machineName = MMBase.getMMBase().getMachineName();
@@ -88,7 +89,7 @@
try {
if (cronDaemon != null) {
Node node = getCloud().getNode(number);
-cronDaemon.add(createCronEntry(node));
+cronDaemon.add(new NodeCronEntry(node));
}
} catch (Exception e) {
throw new RuntimeException("error while creating cron entry with
id " + number + " error " + e.getMessage(), e);
@@ -100,17 +101,32 @@
* Commits a cronjob to the database.
* On commit of a cronjob, the job is first removed from the cronDeamon
and a new cronEntry is created and added to the CronDaemon.
*/
-public boolean commit(MMObjectNode objectNodenode) {
-boolean retval = super.commit(objectNodenode);
-Node node = getCloud().getNode(objectNodenode.getNumber());
+public boolean commit(MMObjectNode node) {
+Set changed = node.getChanged();
+boolean retval = super.commit(node);
CronEntry entry = cronDaemon.getCronEntry("" + node.getNumber());
if (entry == null) {
log.warn("cron entry with ID " + node.getNumber() + " was not
found. this usualy means it was invalid");
} else {
+if (entry instanceof NodeCronEntry) {
+if (changed.contains("classfile") ||
+changed.contains("name") ||
+changed.contains("type")) {
+log.debug("Changed fields " + changed);
cronDaemon.remove(entry);
+} else {
+log.debug("Ignored " + node);
+return retval;
+}
+} else {
+log.warn("How come, " + entry + " is not a node-entry");
+cronDaemon.remove(entry);
+}
}
try {
-cronDaemon.add(createCronEntry(node));
+log.debug("Replacing cronentry " + entry);
+Node n = getCloud().getNode(node.getNumber());
+cronDaemon.add(new NodeCronEntry(n));
} catch (Exception e) {
throw new RuntimeException("error while creating cron entry with
id " + node.getNumber() + " error " + e.getMessage());
}
@@ -129,15 +145,6 @@
}
}
-private CronEntry createCronEntry(Node node) throws Exception {
-// should consider getRelatedNodes("mmservers") for the last argument
of CronEntry
-return new CronEntry("" + node.getNumber(),
- node.getStringValue("crontime"),
- node.getStringValue("name"),
- node.getStringValue("classfile"),
- node.getStringValue("config"),
- node.getIntValue("type"));
-}
private Cloud getCloud() {
return LocalContext.getCloudContext().getCloud("mmbase");
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/crontab/src/org/mmbase/applications/crontab CronEntry.java Interruptable.java
Update of /var/cvs/applications/crontab/src/org/mmbase/applications/crontab
In directory james.mmbase.org:/tmp/cvs-serv7427
Modified Files:
CronEntry.java Interruptable.java
Log Message:
MMB-1677
See also:
http://cvs.mmbase.org/viewcvs/applications/crontab/src/org/mmbase/applications/crontab
See also: http://www.mmbase.org/jira/browse/MMB-1677
Index: CronEntry.java
===
RCS file:
/var/cvs/applications/crontab/src/org/mmbase/applications/crontab/CronEntry.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- CronEntry.java 23 Feb 2007 10:52:10 - 1.10
+++ CronEntry.java 14 Jul 2008 13:51:36 - 1.11
@@ -18,7 +18,7 @@
*
* @author Kees Jongenburger
* @author Michiel Meeuwissen
- * @version $Id: CronEntry.java,v 1.10 2007/02/23 10:52:10 michiel Exp $
+ * @version $Id: CronEntry.java,v 1.11 2008/07/14 13:51:36 michiel Exp $
*/
public class CronEntry {
@@ -65,10 +65,12 @@
private final String id;
private final String name;
private final String className;
-private final String cronTime;
+protected final String cronTime;
private String configuration = null;
-private int count = 0;
+protected Date lastRun = new Date(0);
+protected int count = 0;
+protected int lastCost = -1;
private final CronEntryField second = new CronEntryField(); // 0-59
private final CronEntryField minute = new CronEntryField(); // 0-59
@@ -162,12 +164,19 @@
}
public boolean kick() {
+final Date start = new Date();
+Runnable ready = new Runnable() {
+public void run() {
+CronEntry.this.incCount();
+CronEntry.this.setLastCost((int) (new Date().getTime() -
start.getTime()));
+}
+};
switch (type) {
case SHORT_JOB_TYPE :
{
-count++;
try {
-Interruptable thread = new Interruptable(cronJob,
threads);
+setLastRun(new Date());
+Interruptable thread = new Interruptable(cronJob,
threads, ready);
thread.run();
} catch (Throwable t) {
log.error("Error during cron-job " + this +" : " +
t.getClass().getName() + " " + t.getMessage() + "\n" + Logging.stackTrace(t));
@@ -181,8 +190,8 @@
// fall through
case CANBEMORE_JOB_TYPE :
default :
-count++;
-Interruptable thread = new Interruptable(cronJob, threads);
+setLastRun(start);
+Interruptable thread = new Interruptable(cronJob, threads,
ready);
org.mmbase.util.ThreadPools.jobsExecutor.execute(thread);
return true;
}
@@ -228,6 +237,26 @@
public String getClassName() {
return className;
}
+public Date getLastRun() {
+return lastRun;
+}
+
+protected void setLastRun(Date d) {
+lastRun = d;
+setLastCost(-1);
+}
+public int getCount() {
+return count;
+}
+protected void incCount() {
+count++;
+}
+public int getLastCost() {
+return lastCost;
+}
+protected void setLastCost(int s) {
+lastCost = s;
+}
boolean mustRun(Date date) {
String machineName = MMBase.getMMBase().getMachineName();
Index: Interruptable.java
===
RCS file:
/var/cvs/applications/crontab/src/org/mmbase/applications/crontab/Interruptable.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- Interruptable.java 11 Jun 2007 12:30:53 - 1.4
+++ Interruptable.java 14 Jul 2008 13:51:36 - 1.5
@@ -15,7 +15,7 @@
* if the job does sleeps (InterruptedException) or check
Thread.isInterrupted().
* @author Michiel Meeuwissen
* @since MMBase-1.8
- * @version $Id: Interruptable.java,v 1.4 2007/06/11 12:30:53 michiel Exp $
+ * @version $Id: Interruptable.java,v 1.5 2008/07/14 13:51:36 michiel Exp $
*/
public class Interruptable implements Runnable {
@@ -24,15 +24,21 @@
private Date startTime;
private final Runnable runnable;
private final Collection collection;
+private final Runnable ready;
+
+public Interruptable(Runnable run, Collection col) {
+this(run, col, null);
+}
/**
* @param run The runnable wrapped by this Interrupted, which is to be
executed in [EMAIL PROTECTED] #run}.
* @param col A modifiable collection or null If not null,
this interruptable is
*added to it just before running, and removed from it just
after running.
*/
-public Interruptable(Runnable run, Collection col) {
+public Interruptable(Runnable run, C
[MMBASE CVS] applications/crontab/src/org/mmbase/applications/crontab CronEntry.java Interruptable.java TestCronJob.java
Update of /var/cvs/applications/crontab/src/org/mmbase/applications/crontab
In directory james.mmbase.org:/tmp/cvs-serv7169
Modified Files:
Tag: MMBase-1_8
CronEntry.java Interruptable.java TestCronJob.java
Log Message:
MMB-1677
See also:
http://cvs.mmbase.org/viewcvs/applications/crontab/src/org/mmbase/applications/crontab
See also: http://www.mmbase.org/jira/browse/MMB-1677
Index: CronEntry.java
===
RCS file:
/var/cvs/applications/crontab/src/org/mmbase/applications/crontab/CronEntry.java,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -b -r1.6.2.1 -r1.6.2.2
--- CronEntry.java 16 Feb 2007 21:11:44 - 1.6.2.1
+++ CronEntry.java 14 Jul 2008 13:43:54 - 1.6.2.2
@@ -16,7 +16,7 @@
*
* @author Kees Jongenburger
* @author Michiel Meeuwissen
- * @version $Id: CronEntry.java,v 1.6.2.1 2007/02/16 21:11:44 michiel Exp $
+ * @version $Id: CronEntry.java,v 1.6.2.2 2008/07/14 13:43:54 michiel Exp $
*/
public class CronEntry {
@@ -61,10 +61,12 @@
private final String id;
private final String name;
private final String className;
-private final String cronTime;
+protected final String cronTime;
private String configuration = null;
-private int count = 0;
+protected Date lastRun = new Date(0);
+protected int count = 0;
+protected int lastCost = -1;
private final CronEntryField second = new CronEntryField(); // 0-59
private final CronEntryField minute = new CronEntryField(); // 0-59
@@ -94,6 +96,8 @@
this.cronTime = cronTime;
this.configuration = configuration;
this.type = type;
+setCronTime(cronTime);
+
Runnable runnable = (Runnable) Class.forName(className).newInstance();
if (! (runnable instanceof CronJob)) {
@@ -101,8 +105,6 @@
} else {
cronJob = (CronJob) runnable;
}
-
-setCronTime(cronTime);
}
public void init() {
@@ -144,12 +146,19 @@
}
public boolean kick() {
+final Date start = new Date();
+Runnable ready = new Runnable() {
+public void run() {
+CronEntry.this.incCount();
+CronEntry.this.setLastCost((int) (new Date().getTime() -
start.getTime()));
+}
+};
switch (type) {
case SHORT_JOB_TYPE :
{
-count++;
try {
-Interruptable thread = new Interruptable(cronJob,
threads);
+setLastRun(new Date());
+Interruptable thread = new Interruptable(cronJob,
threads, ready);
thread.run();
} catch (Throwable t) {
log.error("Error during cron-job " + this +" : " +
t.getClass().getName() + " " + t.getMessage() + "\n" + Logging.stackTrace(t));
@@ -163,8 +172,8 @@
// fall through
case CANBEMORE_JOB_TYPE :
default :
-count++;
-Interruptable thread = new Interruptable(cronJob, threads);
+setLastRun(start);
+Interruptable thread = new Interruptable(cronJob, threads,
ready);
org.mmbase.util.ThreadPools.jobsExecutor.execute(thread);
return true;
}
@@ -211,6 +220,26 @@
return className;
}
+public Date getLastRun() {
+return lastRun;
+}
+protected void setLastRun(Date d) {
+lastRun = d;
+setLastCost(-1);
+}
+public int getCount() {
+return count;
+}
+protected void incCount() {
+count++;
+}
+public int getLastCost() {
+return lastCost;
+}
+protected void setLastCost(int s) {
+lastCost = s;
+}
+
boolean mustRun(Date date) {
Calendar cal = Calendar.getInstance();
cal.setTime(date);
Index: Interruptable.java
===
RCS file:
/var/cvs/applications/crontab/src/org/mmbase/applications/crontab/Interruptable.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -b -r1.2 -r1.2.2.1
--- Interruptable.java 27 Jan 2006 20:35:16 - 1.2
+++ Interruptable.java 14 Jul 2008 13:43:54 - 1.2.2.1
@@ -23,9 +23,15 @@
private Date startTime;
private final Runnable runnable;
private final Collection collection;
+private final Runnable ready;
+
public Interruptable(Runnable run, Collection col) {
+this(run, col, null);
+}
+public Interruptable(Runnable run, Collection col, Runnable r) {
runnable = run;
collection = col;
+ready = r;
}
public void run() {
@@ -35,6 +41,7 @@
startTime = new Date();
try {
runnable.run();
+i
[MMBASE CVS] applications/crontab/src/org/mmbase/applications/crontab/builders NodeCronEntry.java CronJobs.java
Update of
/var/cvs/applications/crontab/src/org/mmbase/applications/crontab/builders
In directory james.mmbase.org:/tmp/cvs-serv7169/builders
Modified Files:
Tag: MMBase-1_8
CronJobs.java
Added Files:
Tag: MMBase-1_8
NodeCronEntry.java
Log Message:
MMB-1677
See also:
http://cvs.mmbase.org/viewcvs/applications/crontab/src/org/mmbase/applications/crontab/builders
See also: http://www.mmbase.org/jira/browse/MMB-1677
NodeCronEntry.java is new
Index: CronJobs.java
===
RCS file:
/var/cvs/applications/crontab/src/org/mmbase/applications/crontab/builders/CronJobs.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -b -r1.2.2.2 -r1.2.2.3
--- CronJobs.java 17 Nov 2006 13:06:59 - 1.2.2.2
+++ CronJobs.java 14 Jul 2008 13:43:54 - 1.2.2.3
@@ -7,6 +7,7 @@
*/
package org.mmbase.applications.crontab.builders;
+import java.util.*;
import org.mmbase.applications.crontab.*;
import org.mmbase.bridge.*;
import org.mmbase.module.core.*;
@@ -49,7 +50,7 @@
Node node = nodeIterator.nextNode();
CronEntry entry = null;
try {
-entry = createCronEntry(node);
+entry = new NodeCronEntry(node);
NodeList servers = node.getRelatedNodes("mmservers");
if (servers.size() > 0) {
String machineName = MMBase.getMMBase().getMachineName();
@@ -74,7 +75,7 @@
cronDaemon.add(entry);
}
} catch (Exception e) {
-log.warn("did not add cronjob with id " + node.getNumber() + "
because of error " + e.getMessage());
+log.warn("did not add cronjob with id " + node.getNumber() + "
because of error " + e.getMessage(), e);
}
}
}
@@ -87,7 +88,7 @@
try {
if (cronDaemon != null) {
Node node = getCloud().getNode(number);
-cronDaemon.add(createCronEntry(node));
+cronDaemon.add(new NodeCronEntry(node));
}
} catch (Exception e) {
throw new RuntimeException("error while creating cron entry with
id " + number + " error " + e.getMessage(), e);
@@ -99,17 +100,32 @@
* Commits a cronjob to the database.
* On commit of a cronjob, the job is first removed from the cronDeamon
and a new cronEntry is created and added to the CronDaemon.
*/
-public boolean commit(MMObjectNode objectNodenode) {
-boolean retval = super.commit(objectNodenode);
-Node node = getCloud().getNode(objectNodenode.getNumber());
+public boolean commit(MMObjectNode node) {
+Set changed = node.getChanged();
+boolean retval = super.commit(node);
CronEntry entry = cronDaemon.getCronEntry("" + node.getNumber());
if (entry == null) {
log.warn("cron entry with ID " + node.getNumber() + " was not
found. this usualy means it was invalid");
} else {
+if (entry instanceof NodeCronEntry) {
+if (changed.contains("classfile") ||
+changed.contains("name") ||
+changed.contains("type")) {
+log.warn("Changed fields " + changed);
cronDaemon.remove(entry);
+} else {
+log.warn("Ignored " + node);
+return retval;
+}
+} else {
+log.warn("How come, " + entry + " is not a node-entry");
+cronDaemon.remove(entry);
+}
}
try {
-cronDaemon.add(createCronEntry(node));
+log.info("Replacing cronentry " + entry);
+Node n = getCloud().getNode(node.getNumber());
+cronDaemon.add(new NodeCronEntry(n));
} catch (Exception e) {
throw new RuntimeException("error while creating cron entry with
id " + node.getNumber() + " error " + e.getMessage());
}
@@ -128,9 +144,7 @@
}
}
-private CronEntry createCronEntry(Node node) throws Exception {
-return new CronEntry("" + node.getNumber(),
node.getStringValue("crontime"), node.getStringValue("name"),
node.getStringValue("classfile"),
node.getStringValue("config"),node.getIntValue("type"));
-}
+
private Cloud getCloud() {
return LocalContext.getCloudContext().getCloud("mmbase");
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/crontab/src/org/mmbase/applications/crontab CronDaemon.java
Update of /var/cvs/applications/crontab/src/org/mmbase/applications/crontab
In directory james.mmbase.org:/tmp/cvs-serv7025
Modified Files:
CronDaemon.java
Log Message:
MMB-1679
See also:
http://cvs.mmbase.org/viewcvs/applications/crontab/src/org/mmbase/applications/crontab
See also: http://www.mmbase.org/jira/browse/MMB-1679
Index: CronDaemon.java
===
RCS file:
/var/cvs/applications/crontab/src/org/mmbase/applications/crontab/CronDaemon.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- CronDaemon.java 21 Jun 2007 15:50:21 - 1.14
+++ CronDaemon.java 14 Jul 2008 13:42:36 - 1.15
@@ -8,6 +8,7 @@
package org.mmbase.applications.crontab;
import java.util.*;
+import org.mmbase.util.DynamicDate;
import org.mmbase.util.logging.*;
/**
@@ -17,7 +18,7 @@
*
* @author Kees Jongenburger
* @author Michiel Meeuwissen
- * @version $Id: CronDaemon.java,v 1.14 2007/06/21 15:50:21 nklasens Exp $
+ * @version $Id: CronDaemon.java,v 1.15 2008/07/14 13:42:36 michiel Exp $
*/
public class CronDaemon {
@@ -114,7 +115,15 @@
public void start() {
log.info("Starting CronDaemon");
cronTimer = new Timer(true);
-cronTimer.scheduleAtFixedRate(new TimerTask() { public void run()
{CronDaemon.this.run();} }, 0, 60 * 1000);
+Date first;
+try {
+first = DynamicDate.eval(DynamicDate.getInstance("tominute next
minute"));
+} catch (Exception parseException) {
+log.fatal(parseException); // could not happen
+first = new Date();
+}
+log.debug("First run at " + first);
+cronTimer.scheduleAtFixedRate(new TimerTask() { public void run()
{CronDaemon.this.run();} }, first, 60 * 1000);
}
/**
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/crontab/src/org/mmbase/applications/crontab CronDaemon.java
Update of /var/cvs/applications/crontab/src/org/mmbase/applications/crontab
In directory james.mmbase.org:/tmp/cvs-serv6937
Modified Files:
Tag: MMBase-1_8
CronDaemon.java
Log Message:
MMB-1679
See also:
http://cvs.mmbase.org/viewcvs/applications/crontab/src/org/mmbase/applications/crontab
See also: http://www.mmbase.org/jira/browse/MMB-1679
Index: CronDaemon.java
===
RCS file:
/var/cvs/applications/crontab/src/org/mmbase/applications/crontab/CronDaemon.java,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -b -r1.8.2.1 -r1.8.2.2
--- CronDaemon.java 7 Sep 2006 15:48:48 - 1.8.2.1
+++ CronDaemon.java 14 Jul 2008 13:41:11 - 1.8.2.2
@@ -7,6 +7,7 @@
*/
package org.mmbase.applications.crontab;
+import org.mmbase.util.DynamicDate;
import java.util.*;
import org.mmbase.util.logging.*;
@@ -117,7 +118,15 @@
public void start() {
log.info("Starting CronDaemon");
cronTimer = new Timer(true);
-cronTimer.scheduleAtFixedRate(new TimerTask() { public void run()
{CronDaemon.this.run();} }, 0, 60 * 1000);
+Date first;
+try {
+first = DynamicDate.eval(DynamicDate.getInstance("tominute next
minute"));
+} catch (Exception parseException) {
+log.fatal(parseException); // could not happen
+first = new Date();
+}
+log.debug("First run at " + first);
+cronTimer.scheduleAtFixedRate(new TimerTask() { public void run()
{CronDaemon.this.run();} }, first, 60 * 1000);
}
/**
@@ -159,7 +168,7 @@
Date currentMinute = new Date(now / 6 * 6);
if (log.isDebugEnabled()) {
-log.debug("Checking for " + currentMinute);
+log.debug("Checking for " + new Date() + " " + currentMinute);
}
// remove jobs which were scheduled for removal
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/util/images ImageMagickImageConverter.java
Update of /var/cvs/src/org/mmbase/util/images
In directory james.mmbase.org:/tmp/cvs-serv5220/src/org/mmbase/util/images
Modified Files:
Tag: MMBase-1_8
ImageMagickImageConverter.java
Log Message:
MMB-1678 Animated gifs are corrupted easily when scaled with ImageMagick
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/images
See also: http://www.mmbase.org/jira/browse/MMB-1678
Index: ImageMagickImageConverter.java
===
RCS file:
/var/cvs/src/org/mmbase/util/images/Attic/ImageMagickImageConverter.java,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -b -r1.4.2.3 -r1.4.2.4
--- ImageMagickImageConverter.java 24 Jul 2007 16:26:39 - 1.4.2.3
+++ ImageMagickImageConverter.java 14 Jul 2008 12:30:14 - 1.4.2.4
@@ -9,16 +9,16 @@
*/
package org.mmbase.util.images;
-import java.util.*;
import java.io.*;
-import java.util.regex.*;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.mmbase.util.Encode;
import org.mmbase.util.externalprocess.CommandLauncher;
import org.mmbase.util.externalprocess.ProcessException;
-import org.mmbase.util.Encode;
-
-import org.mmbase.util.logging.Logging;
import org.mmbase.util.logging.Logger;
+import org.mmbase.util.logging.Logging;
/**
* Converts images using ImageMagick.
@@ -27,7 +27,7 @@
* @author Michiel Meeuwissen
* @author Nico Klasens
* @author Jaco de Groot
- * @version $Id: ImageMagickImageConverter.java,v 1.4.2.3 2007/07/24 16:26:39
michiel Exp $
+ * @version $Id: ImageMagickImageConverter.java,v 1.4.2.4 2008/07/14 12:30:14
nklasens Exp $
*/
public class ImageMagickImageConverter implements ImageConverter {
private static final Logger log =
Logging.getLoggerInstance(ImageMagickImageConverter.class);
@@ -50,11 +50,12 @@
// private static String CONVERT_LC_ALL= "LC_ALL=en_US.UTF-8"; I don't
know how to change it.
+protected List excludeFormats = new ArrayList();
/**
- * This function initalises this class
- * @param params a Map of Strings containing
informationn, this should contain the key's
- * ImageConvert.ConverterRoot and
ImageConvert.ConverterCommand specifing the converter root, and it can also
contain
+ * This function initializes this class
+ * @param params a Map of Strings containing
information, this should contain the key's
+ * ImageConvert.ConverterRoot and
ImageConvert.ConverterCommand specifying the converter root, and it can also
contain
* ImageConvert.DefaultImageFormat which can also be 'asis'.
*/
public void init(Map params) {
@@ -72,6 +73,15 @@
converterCommand = tmp;
}
+tmp = (String) params.get("ImageConvert.ExcludeFormats");
+if (tmp != null && ! tmp.equals("")) {
+StringTokenizer tokenizer = new StringTokenizer(tmp, " ,");
+while (tokenizer.hasMoreTokens()) {
+String token = tokenizer.nextToken();
+excludeFormats.add(token);
+}
+}
+
if(System.getProperty("os.name") != null &&
System.getProperty("os.name").startsWith("Windows")) {
// on the windows system, we _can_ assume the it uses .exe as
extention...
// otherwise the check on existance of the program will fail.
@@ -173,14 +183,23 @@
/**
* This functions converts an image by the given parameters
* @param input an array of byte which represents the
original image
+ * @param sourceFormat original image format
* @param commands a List of Strings containing
commands which are operations on the image which will be returned.
- * ImageConvert.converterRoot and
ImageConvert.converterCommand specifing the converter root
+ * ImageConvert.converterRoot and
ImageConvert.converterCommand specifying the converter root
* @return an array of bytes containing the new converted
image.
- *
*/
public byte[] convertImage(byte[] input, String sourceFormat, List
commands) {
+if (input == null) {
+log.error("Converting an empty image does not make sense.");
+return input;
+}
+if (excludeFormats.contains(sourceFormat)) {
+log.debug("Conversion is excluded for image format: " +
sourceFormat);
+return input;
+}
+
byte[] pict = null;
-if (commands != null && input != null) {
+if (commands != null && !commands.isEmpty()) {
ParseResult parsedCommands = getConvertCommands(commands);
if (parsedCommands.format.equals("asis")) {
if (sourceFormat != null) {
@@ -191,11 +210,27 @@
}
}
+if ("gif".equals(parsedCommands.format)) {
+if (isAnimated(input)) {
+
[MMBASE CVS] applications/resources/src/org/mmbase/module/builders Images.java
Update of /var/cvs/applications/resources/src/org/mmbase/module/builders
In directory
james.mmbase.org:/tmp/cvs-serv5180/applications/resources/src/org/mmbase/module/builders
Modified Files:
Images.java
Log Message:
MMB-1678 Animated gifs are corrupted easily when scaled with ImageMagick
See also:
http://cvs.mmbase.org/viewcvs/applications/resources/src/org/mmbase/module/builders
See also: http://www.mmbase.org/jira/browse/MMB-1678
Index: Images.java
===
RCS file:
/var/cvs/applications/resources/src/org/mmbase/module/builders/Images.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- Images.java 13 Nov 2007 16:42:07 - 1.8
+++ Images.java 14 Jul 2008 12:30:08 - 1.9
@@ -32,7 +32,7 @@
* @author Daniel Ockeloen
* @author Rico Jansen
* @author Michiel Meeuwissen
- * @version $Id: Images.java,v 1.8 2007/11/13 16:42:07 michiel Exp $
+ * @version $Id: Images.java,v 1.9 2008/07/14 12:30:08 nklasens Exp $
*/
public class Images extends AbstractImages {
@@ -132,6 +132,9 @@
return Integer.valueOf(getCachedNode(node, (String)
args.get(0)).getNumber());
} else if ("cachednode".equals(function)) {
try {
+if (args == null || args.size() < 1) {
+throw new RuntimeException("Images cache functions needs 1
argument (now: " + args + ")");
+}
return getCachedNode(node, (String) args.get(0));
} catch (Exception e) {
log.error(e.getMessage());
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/resources/src/org/mmbase/util/images ImageMagickImageConverter.java ImageConverter.java AbstractImageConverter.java
Update of /var/cvs/applications/resources/src/org/mmbase/util/images
In directory
james.mmbase.org:/tmp/cvs-serv5180/applications/resources/src/org/mmbase/util/images
Modified Files:
ImageMagickImageConverter.java ImageConverter.java
AbstractImageConverter.java
Log Message:
MMB-1678 Animated gifs are corrupted easily when scaled with ImageMagick
See also:
http://cvs.mmbase.org/viewcvs/applications/resources/src/org/mmbase/util/images
See also: http://www.mmbase.org/jira/browse/MMB-1678
Index: ImageMagickImageConverter.java
===
RCS file:
/var/cvs/applications/resources/src/org/mmbase/util/images/ImageMagickImageConverter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- ImageMagickImageConverter.java 24 Jul 2007 16:27:58 - 1.8
+++ ImageMagickImageConverter.java 14 Jul 2008 12:30:07 - 1.9
@@ -9,16 +9,16 @@
*/
package org.mmbase.util.images;
-import java.util.*;
-import java.util.regex.*;
import java.io.*;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.mmbase.util.Encode;
import org.mmbase.util.externalprocess.CommandLauncher;
import org.mmbase.util.externalprocess.ProcessException;
-import org.mmbase.util.Encode;
-
-import org.mmbase.util.logging.Logging;
import org.mmbase.util.logging.Logger;
+import org.mmbase.util.logging.Logging;
/**
* Converts images using ImageMagick.
@@ -27,7 +27,7 @@
* @author Michiel Meeuwissen
* @author Nico Klasens
* @author Jaco de Groot
- * @version $Id: ImageMagickImageConverter.java,v 1.8 2007/07/24 16:27:58
michiel Exp $
+ * @version $Id: ImageMagickImageConverter.java,v 1.9 2008/07/14 12:30:07
nklasens Exp $
*/
public class ImageMagickImageConverter extends AbstractImageConverter
implements ImageConverter {
private static final Logger log =
Logging.getLoggerInstance(ImageMagickImageConverter.class);
@@ -54,11 +54,12 @@
protected String host = "localhost";
protected int port = 1679;
+protected List excludeFormats = new ArrayList();
/**
- * This function initalises this class
- * @param params a Map of Strings containing
informationn, this should contain the key's
- * ImageConvert.ConverterRoot and
ImageConvert.ConverterCommand specifing the converter root, and it can also
contain
+ * This function initializes this class
+ * @param params a Map of Strings containing
information, this should contain the key's
+ * ImageConvert.ConverterRoot and
ImageConvert.ConverterCommand specifying the converter root, and it can also
contain
* ImageConvert.DefaultImageFormat which can also be 'asis'.
*/
public void init(Map params) {
@@ -85,6 +86,15 @@
port = Integer.parseInt(tmp);
}
+tmp = params.get("ImageConvert.ExcludeFormats");
+if (tmp != null && ! tmp.equals("")) {
+StringTokenizer tokenizer = new StringTokenizer(tmp, " ,");
+while (tokenizer.hasMoreTokens()) {
+String token = tokenizer.nextToken();
+excludeFormats.add(token);
+}
+}
+
tmp = params.get("ImageConvert.Method");
if (tmp != null && ! tmp.equals("")) {
if (tmp.equals("launcher")) {
@@ -238,19 +248,23 @@
/**
* This functions converts an image by the given parameters
* @param input an array of byte which represents the
original image
+ * @param sourceFormat original image format
* @param commands a List of Strings containing
commands which are operations on the image which will be returned.
- * ImageConvert.converterRoot and
ImageConvert.converterCommand specifing the converter root
+ * ImageConvert.converterRoot and
ImageConvert.converterCommand specifying the converter root
* @return an array of bytes containing the new converted
image.
- *
*/
public byte[] convertImage(byte[] input, String sourceFormat, List
commands) {
-byte[] pict = null;
if (input == null) {
log.error("Converting an empty image does not make sense.");
-return pict;
+return input;
+}
+if (excludeFormats.contains(sourceFormat)) {
+log.debug("Conversion is excluded for image format: " +
sourceFormat);
+return input;
}
-if (commands != null) {
+byte[] pict = null;
+if (commands != null && !commands.isEmpty()) {
ParseResult parsedCommands = getConvertCommands(commands);
if (parsedCommands.format.equals("asis") && sourceFormat != null) {
parsedCommands.format = sourceFormat;
@@ -258,6 +272,12 @@
if (log.isDebugEnabled()) {
log.debug("Converting image (" + input.length
[MMBASE CVS] contributions/CMSContainer_Modules/publish-remote/src/java/com/finalist/cmsc/publish PagePublisher.java
Update of
/var/cvs/contributions/CMSContainer_Modules/publish-remote/src/java/com/finalist/cmsc/publish
In directory
james.mmbase.org:/tmp/cvs-serv4354/publish-remote/src/java/com/finalist/cmsc/publish
Modified Files:
PagePublisher.java
Log Message:
CMSC-1016 Only publish contentelements with pages when they are accepted
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/publish-remote/src/java/com/finalist/cmsc/publish
See also: http://www.mmbase.org/jira/browse/CMSC-1016
Index: PagePublisher.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/publish-remote/src/java/com/finalist/cmsc/publish/PagePublisher.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- PagePublisher.java 16 May 2008 11:45:45 - 1.10
+++ PagePublisher.java 14 Jul 2008 11:59:38 - 1.11
@@ -17,7 +17,8 @@
import org.mmbase.storage.search.Step;
import com.finalist.cmsc.mmbase.TypeUtil;
-import com.finalist.cmsc.navigation.*;
+import com.finalist.cmsc.navigation.PagesUtil;
+import com.finalist.cmsc.navigation.PortletUtil;
import com.finalist.cmsc.repository.ContentElementUtil;
import com.finalist.cmsc.repository.RepositoryUtil;
import com.finalist.cmsc.services.publish.Publish;
@@ -66,6 +67,9 @@
}
if (ContentElementUtil.isContentElement(valueNode)) {
if (!isPublished(valueNode)) {
+ if (Workflow.hasWorkflow(valueNode) &&
!Workflow.mayPublish(valueNode)) {
+ continue;
+ }
NodeList channels =
RepositoryUtil.getContentChannelsForContent(valueNode);
for (Iterator iter = channels.iterator();
iter.hasNext();) {
Node channel = iter.next();
@@ -89,16 +93,24 @@
NodeList contentNodes = getContentElements(valueNode, date);
for (Iterator iter = contentNodes.iterator();
iter.hasNext();) {
Node contentElement = iter.next();
+
+boolean hasWorkflow = Workflow.hasWorkflow(contentElement);
+if (!hasWorkflow || (hasWorkflow &&
Workflow.isAccepted(contentElement))) {
addContentBlock(nodes, contentElement);
}
}
+}
else {
NodeList contentNodes = getContentElements(valueNode, date);
for (Iterator iter = contentNodes.iterator();
iter.hasNext();) {
Node contentElement = iter.next();
if (!isPublished(contentElement)) {
+ boolean hasWorkflow = Workflow.hasWorkflow(contentElement);
+ if (!hasWorkflow || (hasWorkflow &&
Workflow.isAccepted(contentElement))) {
addContentBlock(nodes, contentElement);
}
+
+}
}
}
}
@@ -128,9 +140,6 @@
}
protected void addContentBlock(Map nodes, Node content) {
-if (Workflow.hasWorkflow(content) && !Workflow.mayPublish(content)) {
- return;
-}
Date contentPublishDate =
content.getDateValue(ContentElementUtil.PUBLISHDATE_FIELD);
List contentBlockNodes = findContentBlockNodes(content);
for (Node contentNode : contentBlockNodes) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/services/workflow WorkflowServiceMMBaseImpl.java
Update of
/var/cvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/services/workflow
In directory
james.mmbase.org:/tmp/cvs-serv4354/workflow/src/java/com/finalist/cmsc/services/workflow
Modified Files:
WorkflowServiceMMBaseImpl.java
Log Message:
CMSC-1016 Only publish contentelements with pages when they are accepted
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/services/workflow
See also: http://www.mmbase.org/jira/browse/CMSC-1016
Index: WorkflowServiceMMBaseImpl.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/services/workflow/WorkflowServiceMMBaseImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- WorkflowServiceMMBaseImpl.java 26 Nov 2007 11:42:15 - 1.7
+++ WorkflowServiceMMBaseImpl.java 14 Jul 2008 11:59:38 - 1.8
@@ -24,51 +24,60 @@
public class WorkflowServiceMMBaseImpl extends WorkflowService {
+ @Override
public Node create(Node node, String remark) {
return getManager(node).createFor(node, remark);
}
+ @Override
public Node create(Node node, String remark, List nodeList) {
return getManager(node).createFor(node, remark, nodeList);
}
+ @Override
public void finish(Node node, String remark) {
getManager(node).finishWriting(node, remark);
}
+ @Override
public void accept(Node node, String remark) {
if (isAcceptedStepEnabled()) {
getManager(node).accept(node, remark);
}
else {
- getManager(node).complete(node);
+ getManager(node).finishWriting(node, remark);
}
}
+ @Override
public void reject(Node node, String remark) {
getManager(node).reject(node, remark);
}
+ @Override
public void publish(Node node) throws WorkflowException {
getManager(node).publish(node);
}
+ @Override
public void publish(Node node, List publishNumbers) throws
WorkflowException {
getManager(node).publish(node, publishNumbers);
}
+ @Override
public void complete(Node node) {
getManager(node).complete(node);
}
+ @Override
public void remove(Node node) {
getManager(node).remove(node);
}
@@ -134,6 +143,7 @@
}
+ @Override
public boolean isWorkflowElement(Node node) {
Cloud cloud = node.getCloud();
return getContentWorkflow(cloud).isWorkflowElement(node, false)
@@ -204,17 +214,34 @@
}
+ @Override
+ public boolean isAccepted(Node node) {
+ if (hasWorkflow(node)) {
+ String status = getStatus(node);
+ if (isAcceptedStepEnabled()) {
+return WorkflowManager.STATUS_PUBLISHED.equals(status)
+ || WorkflowManager.STATUS_APPROVED.equals(status);
+ }
+ else {
+return WorkflowManager.STATUS_PUBLISHED.equals(status);
+ }
+ }
+ return true;
+ }
+
+
+ @Override
protected Log getLogger() {
return LogFactory.getLog(WorkflowServiceMMBaseImpl.class);
}
+ @Override
public WorkflowStatusInfo getStatusInfo(Cloud cloud) {
Query statusQuery = WorkflowManager.createStatusQuery(cloud);
NodeList statusList = cloud.getList(statusQuery);
- WorkflowStatusInfo ststusInfo = new WorkflowStatusInfo(statusList);
- return ststusInfo;
+ return new WorkflowStatusInfo(statusList);
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/workflow Workflow.java DummyWorkflowService.java WorkflowService.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/workflow
In directory
james.mmbase.org:/tmp/cvs-serv4324/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/workflow
Modified Files:
Workflow.java DummyWorkflowService.java WorkflowService.java
Log Message:
CMSC-1016 Only publish contentelements with pages when they are accepted
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/workflow
See also: http://www.mmbase.org/jira/browse/CMSC-1016
Index: Workflow.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/workflow/Workflow.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- Workflow.java 26 Nov 2007 11:43:46 - 1.5
+++ Workflow.java 14 Jul 2008 11:59:32 - 1.6
@@ -135,4 +135,9 @@
public static boolean isAllowedToPublish(Node node) {
return cService.isAllowedToPublish(node);
}
+
+
+ public static boolean isAccepted(Node node) {
+ return cService.isAccepted(node);
+ }
}
Index: DummyWorkflowService.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/workflow/DummyWorkflowService.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- DummyWorkflowService.java 26 Nov 2007 11:43:46 - 1.6
+++ DummyWorkflowService.java 14 Jul 2008 11:59:32 - 1.7
@@ -12,10 +12,10 @@
import java.util.ArrayList;
import java.util.List;
-import org.mmbase.bridge.Cloud;
-import org.mmbase.bridge.Node;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.mmbase.bridge.Cloud;
+import org.mmbase.bridge.Node;
import com.finalist.cmsc.security.UserRole;
@@ -148,6 +148,12 @@
@Override
+ public boolean isAccepted(Node node) {
+ return true;
+ }
+
+
+ @Override
protected Log getLogger() {
return LogFactory.getLog(DummyWorkflowService.class);
}
Index: WorkflowService.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/workflow/WorkflowService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- WorkflowService.java26 Nov 2007 11:43:46 - 1.4
+++ WorkflowService.java14 Jul 2008 11:59:32 - 1.5
@@ -11,13 +11,13 @@
import java.util.List;
+import org.apache.commons.logging.Log;
import org.mmbase.bridge.Cloud;
import org.mmbase.bridge.Node;
-import org.apache.commons.logging.Log;
import com.finalist.cmsc.security.UserRole;
-import com.finalist.cmsc.services.Service;
import com.finalist.cmsc.services.Properties;
+import com.finalist.cmsc.services.Service;
public abstract class WorkflowService extends Service {
protected boolean acceptedStepEnabled;
@@ -86,6 +86,9 @@
public abstract boolean isAllowedToPublish(Node node);
+ public abstract boolean isAccepted(Node node);
+
+
@Override
protected void init(Properties properties) throws Exception {
@@ -109,7 +112,7 @@
this.acceptedStepEnabled = acceptedStepEnabled;
}
-
protected abstract Log getLogger();
+
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-dynamicforms/src/java/com/finalist/portlets/responseform ResponseFormPortlet.java EmailSender.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/src/java/com/finalist/portlets/responseform
In directory
james.mmbase.org:/tmp/cvs-serv3766/portlets-dynamicforms/src/java/com/finalist/portlets/responseform
Modified Files:
ResponseFormPortlet.java EmailSender.java
Log Message:
CMSC-1015 Dynamic forms send emails which are marked as spam based on dns
spf records
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/src/java/com/finalist/portlets/responseform
See also: http://www.mmbase.org/jira/browse/CMSC-1015
Index: ResponseFormPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/src/java/com/finalist/portlets/responseform/ResponseFormPortlet.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- ResponseFormPortlet.java4 Jul 2008 16:23:34 - 1.16
+++ ResponseFormPortlet.java14 Jul 2008 11:45:18 - 1.17
@@ -11,41 +11,22 @@
import java.io.IOException;
import java.io.UnsupportedEncodingException;
-import java.util.Arrays;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import javax.activation.DataSource;
import javax.mail.MessagingException;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletException;
-import javax.portlet.PortletMode;
-import javax.portlet.PortletPreferences;
-import javax.portlet.PortletSession;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import javax.portlet.*;
import net.sf.mmapps.commons.bridge.RelationUtil;
-import org.apache.commons.lang.StringUtils;
import net.sf.mmapps.modules.cloudprovider.CloudProvider;
import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.FileUploadException;
-import org.apache.commons.fileupload.portlet.*;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-
-import org.mmbase.bridge.Cloud;
-import org.mmbase.bridge.Node;
-import org.mmbase.bridge.NodeIterator;
-import org.mmbase.bridge.NodeList;
-import org.mmbase.bridge.NodeManager;
+import org.apache.commons.fileupload.portlet.PortletFileUpload;
+import org.apache.commons.lang.StringUtils;
+import org.mmbase.bridge.*;
import org.mmbase.bridge.util.SearchUtil;
import org.mmbase.remotepublishing.PublishManager;
import org.mmbase.remotepublishing.util.PublishUtil;
@@ -53,18 +34,18 @@
import com.finalist.cmsc.mmbase.PropertiesUtil;
import com.finalist.cmsc.navigation.ServerUtil;
import com.finalist.cmsc.portlets.ContentPortlet;
-import com.finalist.pluto.portalImpl.core.CmscPortletMode;
public class ResponseFormPortlet extends ContentPortlet {
protected static final String PARAMETER_MAP = "parameterMap";
protected static final String ERRORMESSAGES = "errormessages";
- private static final int DEFAULT_MAXFILESIZE = 2; // default file size in
- // Meg
+ private static final int DEFAULT_MAXFILESIZE = 2; // default file size in
Meg
private static final long MEGABYTE = 1024 * 1024; // 1 Meg
+
+ private static final String ENCODING_UTF8 = "UTF-8";
+
private static final String FIELD_PREFIX = "field_";
- // TODO: use these constants (and clean up this mess)
private static final int TYPE_TEXTBOX = 1;
private static final int TYPE_TEXTAREA = 2;
private static final int TYPE_RADIO = 4;
@@ -78,32 +59,30 @@
private static final String DEFAULT_EMAILREGEX =
"^([a-zA-Z0-9_.-])+@(([a-zA-Z0-9-])+.)+([a-zA-Z0-9]{2,4})+$";
+ @Override
@SuppressWarnings("unchecked")
public void processView(ActionRequest request, ActionResponse response)
throws PortletException, IOException {
Map errorMessages = new Hashtable();
Map parameterMap = new HashMap();
DataSource attachment = processUserRequest(request, errorMessages,
parameterMap);
- String action = request.getParameter(ACTION_PARAM);
- Map formfields = new HashMap();
- StringBuffer data = new StringBuffer();
- if (action == null) {
- response.setPortletMode(CmscPortletMode.EDIT_DEFAULTS);
- }
- else if (action.equals("edit")) {
PortletPreferences preferences = request.getPreferences();
String contentelement = preferences.getValue(CONTENTELEMENT, null);
if (contentelement != null) {
if (parameterMap.size() > 0) {
+
+String userEmailAddress = null;
+StringBuffer data = new StringBuffer();
+Map formfields = new HashMap();
+
CloudProvider cloudProvider =
CloudProviderFactory.getCloudProvider();
Cloud cloud
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-dynamicforms/config/modules savedformmodule.xml
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/config/modules In directory james.mmbase.org:/tmp/cvs-serv3766/portlets-dynamicforms/config/modules Removed Files: savedformmodule.xml Log Message: CMSC-1015 Dynamic forms send emails which are marked as spam based on dns spf records See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/config/modules See also: http://www.mmbase.org/jira/browse/CMSC-1015 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-dynamicforms/src/java/com/finalist/savedform SavedFormModule.java
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/src/java/com/finalist/savedform In directory james.mmbase.org:/tmp/cvs-serv3766/portlets-dynamicforms/src/java/com/finalist/savedform Removed Files: SavedFormModule.java Log Message: CMSC-1015 Dynamic forms send emails which are marked as spam based on dns spf records See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/src/java/com/finalist/savedform See also: http://www.mmbase.org/jira/browse/CMSC-1015 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-dynamicforms/resources/com/finalist/portlets/responseform ResponseFormPortlet_nl.properties ResponseFormPortlet.properties
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/resources/com/finalist/portlets/responseform
In directory
james.mmbase.org:/tmp/cvs-serv3766/portlets-dynamicforms/resources/com/finalist/portlets/responseform
Modified Files:
ResponseFormPortlet_nl.properties
ResponseFormPortlet.properties
Log Message:
CMSC-1015 Dynamic forms send emails which are marked as spam based on dns
spf records
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/resources/com/finalist/portlets/responseform
See also: http://www.mmbase.org/jira/browse/CMSC-1015
Index: ResponseFormPortlet_nl.properties
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/resources/com/finalist/portlets/responseform/ResponseFormPortlet_nl.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- ResponseFormPortlet_nl.properties 25 Jun 2008 13:11:03 - 1.6
+++ ResponseFormPortlet_nl.properties 14 Jul 2008 11:45:18 - 1.7
@@ -25,7 +25,7 @@
view.mandatory=Verplicht
view.formfield.empty=De waarde is verplicht
view.formfield.invalid=De waarde is niet geldig
-view.formfield.maxlength=De maximale lengte van het tekstvlak is {0}
+view.formfield.maxlength=De maximale lengte is {0}
view.error.sendemail=E-mail kon niet worden verzonden, alstublieft later
opnieuw proberen
view.error.filesize=Het bestand is te groot, selecteer alstublieft een ander
bestand
edit.submit=Wijzigingen opslaan
Index: ResponseFormPortlet.properties
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/resources/com/finalist/portlets/responseform/ResponseFormPortlet.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- ResponseFormPortlet.properties 25 Jun 2008 13:11:03 - 1.8
+++ ResponseFormPortlet.properties 14 Jul 2008 11:45:18 - 1.9
@@ -25,7 +25,7 @@
view.mandatory=Mandatory
view.formfield.empty=Please enter a value
view.formfield.invalid=Please enter a valid value
-view.formfield.maxlength=The max length of the TextArea is {0}
+view.formfield.maxlength=The maxlength is {0}
view.error.sendemail=The email could not be sent, please try again later
view.error.filesize=The file is too big, please select another file
edit.submit=Save changes
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-dynamicforms/src/webapp/WEB-INF/templates/view/responseform basic.jsp
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/src/webapp/WEB-INF/templates/view/responseform
In directory
james.mmbase.org:/tmp/cvs-serv3766/portlets-dynamicforms/src/webapp/WEB-INF/templates/view/responseform
Modified Files:
basic.jsp
Log Message:
CMSC-1015 Dynamic forms send emails which are marked as spam based on dns
spf records
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/src/webapp/WEB-INF/templates/view/responseform
See also: http://www.mmbase.org/jira/browse/CMSC-1015
Index: basic.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/src/webapp/WEB-INF/templates/view/responseform/basic.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- basic.jsp 25 Jun 2008 13:11:03 - 1.3
+++ basic.jsp 14 Jul 2008 11:45:18 - 1.4
@@ -1,5 +1,4 @@
<[EMAIL PROTECTED] file="/WEB-INF/templates/portletglobals.jsp"%>
-<%@ page
import="net.sf.mmapps.modules.cloudprovider.CloudProviderFactory,net.sf.mmapps.modules.cloudprovider.CloudProvider,org.mmbase.bridge.*;"%>
@@ -81,9 +80,7 @@
cols="">${fieldvalue}
-
-
-
+
@@ -222,3 +219,5 @@
\ 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-dynamicforms/src/webapp/WEB-INF/templates/view/responseform basic.jsp
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/src/webapp/WEB-INF/templates/view/responseform
In directory
james.mmbase.org:/tmp/cvs-serv3681/portlets-dynamicforms/src/webapp/WEB-INF/templates/view/responseform
Modified Files:
Tag: b1_4
basic.jsp
Log Message:
CMSC-1015 Dynamic forms send emails which are marked as spam based on dns
spf records
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/src/webapp/WEB-INF/templates/view/responseform
See also: http://www.mmbase.org/jira/browse/CMSC-1015
Index: basic.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/src/webapp/WEB-INF/templates/view/responseform/basic.jsp,v
retrieving revision 1.1.6.3
retrieving revision 1.1.6.4
diff -u -b -r1.1.6.3 -r1.1.6.4
--- basic.jsp 25 Jun 2008 13:09:04 - 1.1.6.3
+++ basic.jsp 14 Jul 2008 11:45:10 - 1.1.6.4
@@ -1,5 +1,4 @@
<[EMAIL PROTECTED] file="/WEB-INF/templates/portletglobals.jsp"%>
-<%@ page
import="net.sf.mmapps.modules.cloudprovider.CloudProviderFactory,net.sf.mmapps.modules.cloudprovider.CloudProvider,org.mmbase.bridge.*;"%>
@@ -81,9 +80,7 @@
cols="">${fieldvalue}
-
-
-
+
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-dynamicforms/config/modules savedformmodule.xml
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/config/modules In directory james.mmbase.org:/tmp/cvs-serv3681/portlets-dynamicforms/config/modules Removed Files: Tag: b1_4 savedformmodule.xml Log Message: CMSC-1015 Dynamic forms send emails which are marked as spam based on dns spf records See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/config/modules See also: http://www.mmbase.org/jira/browse/CMSC-1015 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-dynamicforms/resources/com/finalist/portlets/responseform ResponseFormPortlet.properties ResponseFormPortlet_nl.properties
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/resources/com/finalist/portlets/responseform
In directory
james.mmbase.org:/tmp/cvs-serv3681/portlets-dynamicforms/resources/com/finalist/portlets/responseform
Modified Files:
Tag: b1_4
ResponseFormPortlet.properties
ResponseFormPortlet_nl.properties
Log Message:
CMSC-1015 Dynamic forms send emails which are marked as spam based on dns
spf records
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/resources/com/finalist/portlets/responseform
See also: http://www.mmbase.org/jira/browse/CMSC-1015
Index: ResponseFormPortlet.properties
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/resources/com/finalist/portlets/responseform/ResponseFormPortlet.properties,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -b -r1.2.2.3 -r1.2.2.4
--- ResponseFormPortlet.properties 25 Jun 2008 13:09:04 - 1.2.2.3
+++ ResponseFormPortlet.properties 14 Jul 2008 11:45:10 - 1.2.2.4
@@ -25,7 +25,7 @@
view.mandatory=Mandatory
view.formfield.empty=Please enter a value
view.formfield.invalid=Please enter a valid value
-view.formfield.maxlength=The max length of the TextArea is {0}
+view.formfield.maxlength=The maxlength is {0}
view.error.sendemail=The email could not be sent, please try again later
view.error.filesize=The file is too big, please select another file
edit.submit=Save changes
Index: ResponseFormPortlet_nl.properties
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/resources/com/finalist/portlets/responseform/ResponseFormPortlet_nl.properties,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -b -r1.2.2.3 -r1.2.2.4
--- ResponseFormPortlet_nl.properties 25 Jun 2008 13:09:04 - 1.2.2.3
+++ ResponseFormPortlet_nl.properties 14 Jul 2008 11:45:10 - 1.2.2.4
@@ -25,7 +25,7 @@
view.mandatory=Verplicht
view.formfield.empty=De waarde is verplicht
view.formfield.invalid=De waarde is niet geldig
-view.formfield.maxlength=De maximale lengte van het tekstvlak is {0}
+view.formfield.maxlength=De maximale lengte is {0}
view.error.sendemail=E-mail kon niet worden verzonden, alstublieft later
opnieuw proberen
view.error.filesize=Het bestand is te groot, selecteer alstublieft een ander
bestand
edit.submit=Wijzigingen opslaan
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-dynamicforms/src/java/com/finalist/portlets/responseform EmailSender.java ResponseFormPortlet.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/src/java/com/finalist/portlets/responseform
In directory
james.mmbase.org:/tmp/cvs-serv3681/portlets-dynamicforms/src/java/com/finalist/portlets/responseform
Modified Files:
Tag: b1_4
EmailSender.java ResponseFormPortlet.java
Log Message:
CMSC-1015 Dynamic forms send emails which are marked as spam based on dns
spf records
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/src/java/com/finalist/portlets/responseform
See also: http://www.mmbase.org/jira/browse/CMSC-1015
Index: EmailSender.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/src/java/com/finalist/portlets/responseform/EmailSender.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -b -r1.2 -r1.2.2.1
--- EmailSender.java26 Nov 2007 11:42:56 - 1.2
+++ EmailSender.java14 Jul 2008 11:45:10 - 1.2.2.1
@@ -11,11 +11,10 @@
import javax.mail.Multipart;
import javax.mail.Session;
import javax.mail.Transport;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
-import net.sf.mmapps.commons.util.StringUtil;
+import javax.mail.internet.*;
+
+import org.apache.commons.lang.StringUtils;
+
import com.finalist.cmsc.mmbase.PropertiesUtil;
/**
@@ -23,11 +22,12 @@
*
* @author Cati Macarov
*/
-public class EmailSender {
+public final class EmailSender {
- private static Properties props = new Properties();
private static EmailSender instance = null;
- private static String mailHost = null;
+
+ private Properties props = new Properties();
+ private String mailHost = null;
/**
@@ -46,28 +46,49 @@
*/
public static synchronized EmailSender getInstance() {
String tempMailHost = PropertiesUtil.getProperty("mail.smtp.host");
- if ((tempMailHost != null) && (!tempMailHost.equals(mailHost))) {
+ if (instance == null) {
instance = new EmailSender(tempMailHost);
}
- if (instance == null) {
+ else {
+ if ((tempMailHost != null) &&
(!tempMailHost.equals(instance.mailHost))) {
instance = new EmailSender(tempMailHost);
}
+ }
+
return instance;
}
- /*
-* @param emailFrom The email address of the sender @param nameFrom The name
-* of the sender @param toAddresses The list of email addresses of the
-* receivers @param subject The subject of the email @param body The body of
-* the email @param fileName The name of the attachment
+ /**
+* @param emailFrom The email address of the sender
+* @param nameFrom The name of the sender
+* @param toAddresses The list of email addresses of the receivers
+* @param subject The subject of the email
+* @param body The body of the email @param fileName The name of the
attachment
+* @param attachment Binary part to add to the email message
*/
public void sendEmail(String emailFrom, String nameFrom, List
toAddresses, String subject, String body,
- DataSource dataSource) throws UnsupportedEncodingException,
MessagingException {
- if (StringUtil.isEmptyOrWhitespace(emailFrom)) {
+ DataSource attachment) throws UnsupportedEncodingException,
MessagingException {
+ sendEmail(emailFrom, nameFrom, toAddresses, subject, body, attachment,
null);
+ }
+
+
+ /**
+* @param emailFrom The email address of the sender
+* @param nameFrom The name of the sender
+* @param toAddresses The list of email addresses of the receivers
+* @param subject The subject of the email
+* @param body The body of the email @param fileName The name of the
attachment
+* @param attachment Binary part to add to the message
+* @param replyTo Address as reply-to header in the message
+*/
+ public void sendEmail(String emailFrom, String nameFrom, List
toAddresses,
+ String subject, String body, DataSource attachment, String replyTo)
+ throws MessagingException, UnsupportedEncodingException,
AddressException {
+ if (StringUtils.isBlank(emailFrom)) {
emailFrom = PropertiesUtil.getProperty("mail.system.email");
}
- if (StringUtil.isEmptyOrWhitespace(nameFrom)) {
+ if (StringUtils.isBlank(nameFrom)) {
nameFrom = PropertiesUtil.getProperty("mail.system.name");
}
Session session = Session.getInstance(props, null);
@@ -79,7 +100,18 @@
addresses[i] = new InternetAddress(toAddresses.get(i));
}
message.addRecipients(Message.RecipientType.TO, addresses);
+
+ if (StringUtils.isNotBlank(replyTo)) {
+ message.setReplyTo(InternetAddress.parse(replyTo));
+ }
+
message.setSubject(subject);
+ Multipart multipart = cre
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-dynamicforms/src/java/com/finalist/savedform SavedFormModule.java
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/src/java/com/finalist/savedform In directory james.mmbase.org:/tmp/cvs-serv3681/portlets-dynamicforms/src/java/com/finalist/savedform Removed Files: Tag: b1_4 SavedFormModule.java Log Message: CMSC-1015 Dynamic forms send emails which are marked as spam based on dns spf records See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/src/java/com/finalist/savedform See also: http://www.mmbase.org/jira/browse/CMSC-1015 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/portlet search_portletdefinition_definitionrel_portlet.xml
Update of /var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/portlet In directory james.mmbase.org:/tmp/cvs-serv601/cmsc/sitemanagement/src/webapp/editors/config/portlet Modified Files: Tag: b1_4 search_portletdefinition_definitionrel_portlet.xml Log Message: CMSC-1013 Do not show the seach box for portlets in the single definition editwizard See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/portlet See also: http://www.mmbase.org/jira/browse/CMSC-1013 Index: search_portletdefinition_definitionrel_portlet.xml === RCS file: /var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/portlet/search_portletdefinition_definitionrel_portlet.xml,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -b -r1.3.2.1 -r1.3.2.2 --- search_portletdefinition_definitionrel_portlet.xml 2 Jun 2008 16:54:42 - 1.3.2.1 +++ search_portletdefinition_definitionrel_portlet.xml 14 Jul 2008 09:42:21 - 1.3.2.2 @@ -16,15 +16,6 @@ - - Search Portlet - Zoek Portlet - - Title contains - Titel bevat - [title] - - New ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/portlet search_portletdefinition_definitionrel_portlet.xml
Update of /var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/portlet In directory james.mmbase.org:/tmp/cvs-serv564/cmsc/sitemanagement/src/webapp/editors/config/portlet Modified Files: search_portletdefinition_definitionrel_portlet.xml Log Message: CMSC-1013 Do not show the seach box for portlets in the single definition editwizard See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/portlet See also: http://www.mmbase.org/jira/browse/CMSC-1013 Index: search_portletdefinition_definitionrel_portlet.xml === RCS file: /var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/portlet/search_portletdefinition_definitionrel_portlet.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- search_portletdefinition_definitionrel_portlet.xml 2 Jun 2008 16:54:47 - 1.4 +++ search_portletdefinition_definitionrel_portlet.xml 14 Jul 2008 09:42:15 - 1.5 @@ -16,15 +16,6 @@ - - Search Portlet - Zoek Portlet - - Title contains - Titel bevat - [title] - - New ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/edit-webapp/resources cmsc_nl.properties cmsc.properties
Update of /var/cvs/contributions/CMSContainer/cmsc/edit-webapp/resources In directory james.mmbase.org:/tmp/cvs-serv431/cmsc/edit-webapp/resources Modified Files: Tag: b1_4 cmsc_nl.properties cmsc.properties Log Message: CMSC-1012 Memory information is confusing in admindashboard See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/resources See also: http://www.mmbase.org/jira/browse/CMSC-1012 Index: cmsc_nl.properties === RCS file: /var/cvs/contributions/CMSContainer/cmsc/edit-webapp/resources/cmsc_nl.properties,v retrieving revision 1.31.2.2 retrieving revision 1.31.2.3 diff -u -b -r1.31.2.2 -r1.31.2.3 --- cmsc_nl.properties 20 May 2008 09:22:59 - 1.31.2.2 +++ cmsc_nl.properties 14 Jul 2008 09:39:09 - 1.31.2.3 @@ -163,7 +163,8 @@ admindashboard.system.memory.header=Geheugengebruik admindashboard.system.memory.maximum=Maximum -admindashboard.system.memory.total=Gebruikt +admindashboard.system.memory.total=Totaal +admindashboard.system.memory.used=Gebruikt admindashboard.system.memory.free=Vrij admindashboard.system.memory.mb=MB Index: cmsc.properties === RCS file: /var/cvs/contributions/CMSContainer/cmsc/edit-webapp/resources/cmsc.properties,v retrieving revision 1.29.2.2 retrieving revision 1.29.2.3 diff -u -b -r1.29.2.2 -r1.29.2.3 --- cmsc.properties 20 May 2008 09:22:59 - 1.29.2.2 +++ cmsc.properties 14 Jul 2008 09:39:09 - 1.29.2.3 @@ -163,7 +163,8 @@ admindashboard.system.memory.header=Memory Usage admindashboard.system.memory.maximum=Maximum -admindashboard.system.memory.total=Used +admindashboard.system.memory.total=Total +admindashboard.system.memory.used=Used admindashboard.system.memory.free=Free admindashboard.system.memory.mb=MB ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/admindashboard/system memory.jsp
Update of /var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/admindashboard/system In directory james.mmbase.org:/tmp/cvs-serv431/cmsc/edit-webapp/src/webapp/editors/admindashboard/system Modified Files: Tag: b1_4 memory.jsp Log Message: CMSC-1012 Memory information is confusing in admindashboard See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/admindashboard/system See also: http://www.mmbase.org/jira/browse/CMSC-1012 Index: memory.jsp === RCS file: /var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/admindashboard/system/memory.jsp,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -u -b -r1.2 -r1.2.4.1 --- memory.jsp 21 May 2007 18:06:15 - 1.2 +++ memory.jsp 14 Jul 2008 09:39:09 - 1.2.4.1 @@ -12,14 +12,24 @@ + <% + long maxMem = Runtime.getRuntime().maxMemory(); + long totalMem = Runtime.getRuntime().totalMemory(); + long freeMem = Runtime.getRuntime().freeMemory(); + +%> + : - <%=Runtime.getRuntime().maxMemory()/1024/1024%> + <%=maxMem/1024/1024%> : - <%=Runtime.getRuntime().totalMemory()/1024/1024%> + <%=totalMem/1024/1024%> + + : + <%=(totalMem - freeMem)/1024/1024%> : - <%=Runtime.getRuntime().freeMemory()/1024/1024%> + <%=freeMem/1024/1024%> ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/admindashboard/system memory.jsp
Update of /var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/admindashboard/system In directory james.mmbase.org:/tmp/cvs-serv390/cmsc/edit-webapp/src/webapp/editors/admindashboard/system Modified Files: memory.jsp Log Message: CMSC-1012 Memory information is confusing in admindashboard See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/admindashboard/system See also: http://www.mmbase.org/jira/browse/CMSC-1012 Index: memory.jsp === RCS file: /var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/admindashboard/system/memory.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- memory.jsp 21 May 2007 18:06:15 - 1.2 +++ memory.jsp 14 Jul 2008 09:39:03 - 1.3 @@ -12,14 +12,24 @@ + <% + long maxMem = Runtime.getRuntime().maxMemory(); + long totalMem = Runtime.getRuntime().totalMemory(); + long freeMem = Runtime.getRuntime().freeMemory(); + +%> + : - <%=Runtime.getRuntime().maxMemory()/1024/1024%> + <%=maxMem/1024/1024%> : - <%=Runtime.getRuntime().totalMemory()/1024/1024%> + <%=totalMem/1024/1024%> + + : + <%=(totalMem - freeMem)/1024/1024%> : - <%=Runtime.getRuntime().freeMemory()/1024/1024%> + <%=freeMem/1024/1024%> ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/edit-webapp/resources cmsc_nl.properties cmsc.properties
Update of /var/cvs/contributions/CMSContainer/cmsc/edit-webapp/resources In directory james.mmbase.org:/tmp/cvs-serv390/cmsc/edit-webapp/resources Modified Files: cmsc_nl.properties cmsc.properties Log Message: CMSC-1012 Memory information is confusing in admindashboard See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/resources See also: http://www.mmbase.org/jira/browse/CMSC-1012 Index: cmsc_nl.properties === RCS file: /var/cvs/contributions/CMSContainer/cmsc/edit-webapp/resources/cmsc_nl.properties,v retrieving revision 1.35 retrieving revision 1.36 diff -u -b -r1.35 -r1.36 --- cmsc_nl.properties 10 Jun 2008 12:47:23 - 1.35 +++ cmsc_nl.properties 14 Jul 2008 09:39:03 - 1.36 @@ -164,7 +164,8 @@ admindashboard.system.memory.header=Geheugengebruik admindashboard.system.memory.maximum=Maximum -admindashboard.system.memory.total=Gebruikt +admindashboard.system.memory.total=Totaal +admindashboard.system.memory.used=Gebruikt admindashboard.system.memory.free=Vrij admindashboard.system.memory.mb=MB Index: cmsc.properties === RCS file: /var/cvs/contributions/CMSContainer/cmsc/edit-webapp/resources/cmsc.properties,v retrieving revision 1.33 retrieving revision 1.34 diff -u -b -r1.33 -r1.34 --- cmsc.properties 10 Jun 2008 12:47:23 - 1.33 +++ cmsc.properties 14 Jul 2008 09:39:03 - 1.34 @@ -164,7 +164,8 @@ admindashboard.system.memory.header=Memory Usage admindashboard.system.memory.maximum=Maximum -admindashboard.system.memory.total=Used +admindashboard.system.memory.total=Total +admindashboard.system.memory.used=Used admindashboard.system.memory.free=Free admindashboard.system.memory.mb=MB ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository search.jsp
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
In directory
james.mmbase.org:/tmp/cvs-serv32462/cmsc/contentrepository/src/webapp/editors/repository
Modified Files:
Tag: b1_4
search.jsp
Log Message:
CMSC-1011 Repository search screen does not show the correct title for rights
icon
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
See also: http://www.mmbase.org/jira/browse/CMSC-1011
Index: search.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/search.jsp,v
retrieving revision 1.15.2.2
retrieving revision 1.15.2.3
diff -u -b -r1.15.2.2 -r1.15.2.3
--- search.jsp 8 Apr 2008 15:33:57 - 1.15.2.2
+++ search.jsp 14 Jul 2008 09:21:13 - 1.15.2.3
@@ -369,7 +369,7 @@
-
+
@@ -453,7 +453,7 @@
${title}
- " align="top" alt="${channelIconMessage}" />
+ " align="top" alt="${channelIconMessage}"
title="${channelIconMessage}" />
${channelName}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository search.jsp
Update of /var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository In directory james.mmbase.org:/tmp/cvs-serv32436/cmsc/contentrepository/src/webapp/editors/repository Modified Files: search.jsp Log Message: CMSC-1011 Repository search screen does not show the correct title for rights icon See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository See also: http://www.mmbase.org/jira/browse/CMSC-1011 Index: search.jsp === RCS file: /var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/search.jsp,v retrieving revision 1.29 retrieving revision 1.30 diff -u -b -r1.29 -r1.30 --- search.jsp 11 Jul 2008 09:12:09 - 1.29 +++ search.jsp 14 Jul 2008 09:21:06 - 1.30 @@ -379,7 +379,7 @@ - + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmscImpl/war-live/src/webapp/WEB-INF/config/applications basecontentelements.xml
Update of /var/cvs/contributions/CMSContainer/cmscImpl/war-live/src/webapp/WEB-INF/config/applications In directory james.mmbase.org:/tmp/cvs-serv32320/cmscImpl/war-live/src/webapp/WEB-INF/config/applications Modified Files: Tag: v1_3 basecontentelements.xml Log Message: The mailform builder has been deprecated and is removed. See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmscImpl/war-live/src/webapp/WEB-INF/config/applications Index: basecontentelements.xml === RCS file: /var/cvs/contributions/CMSContainer/cmscImpl/war-live/src/webapp/WEB-INF/config/applications/Attic/basecontentelements.xml,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -b -r1.1 -r1.1.2.1 --- basecontentelements.xml 21 May 2007 18:41:05 - 1.1 +++ basecontentelements.xml 14 Jul 2008 09:17:22 - 1.1.2.1 @@ -12,7 +12,6 @@ faqcategory faqitem link - mailform @@ -31,7 +30,6 @@ - ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/alias/src/java/com/finalist/cmsc/alias AliasNavigationRenderer.java
Update of
/var/cvs/contributions/CMSContainer_Modules/alias/src/java/com/finalist/cmsc/alias
In directory
james.mmbase.org:/tmp/cvs-serv32002/alias/src/java/com/finalist/cmsc/alias
Modified Files:
AliasNavigationRenderer.java
Log Message:
CMSC-907 - reverted commit, because we need this call.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/alias/src/java/com/finalist/cmsc/alias
See also: http://www.mmbase.org/jira/browse/CMSC-907
Index: AliasNavigationRenderer.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/alias/src/java/com/finalist/cmsc/alias/AliasNavigationRenderer.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- AliasNavigationRenderer.java7 Jul 2008 20:52:35 - 1.13
+++ AliasNavigationRenderer.java14 Jul 2008 09:02:37 - 1.14
@@ -15,6 +15,7 @@
import com.finalist.cmsc.navigation.*;
import com.finalist.cmsc.portalImpl.InternalDispatchNavigationRequest;
import com.finalist.cmsc.services.sitemanagement.SiteManagement;
+import com.finalist.pluto.portalImpl.core.PortalEnvironment;
import com.finalist.pluto.portalImpl.core.PortalURL;
public class AliasNavigationRenderer implements NavigationItemRenderer {
@@ -96,7 +97,7 @@
response.setContentType(contentType);
HttpServletRequest aliasRequest = new
InternalDispatchNavigationRequest(request, pageItem);
- //PortalEnvironment aliasEnv = new PortalEnvironment(aliasRequest,
response);
+ PortalEnvironment aliasEnv = new PortalEnvironment(aliasRequest,
response);
manager.render(pageItem, aliasRequest, response, servletConfig);
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/portlets/resources/com/finalist/cmsc/portlets ContentChannelPortlet_zh.properties ContentChannelPortlet_nl.properties ContentChannelPortlet.properties
Update of /var/cvs/contributions/CMSContainer/cmsc/portlets/resources/com/finalist/cmsc/portlets In directory james.mmbase.org:/tmp/cvs-serv31675/cmsc/portlets/resources/com/finalist/cmsc/portlets Modified Files: ContentChannelPortlet_zh.properties ContentChannelPortlet_nl.properties ContentChannelPortlet.properties Log Message: CMSC-1009 - Use: contentchannel order by expiredate instead of expirydate. See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/portlets/resources/com/finalist/cmsc/portlets See also: http://www.mmbase.org/jira/browse/CMSC-1009 Index: ContentChannelPortlet_zh.properties === RCS file: /var/cvs/contributions/CMSContainer/cmsc/portlets/resources/com/finalist/cmsc/portlets/ContentChannelPortlet_zh.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- ContentChannelPortlet_zh.properties 20 Mar 2008 03:22:09 - 1.2 +++ ContentChannelPortlet_zh.properties 14 Jul 2008 08:56:13 - 1.3 @@ -50,7 +50,7 @@ edit_defaults.orderby.creationdate=å建æ¥æ edit_defaults.orderby.lastmodifieddate=ææ°ä¿®æ¹æ¥æ edit_defaults.orderby.publishdate=åå¸æ¥æ -edit_defaults.orderby.expirydate=æåæé +edit_defaults.orderby.expiredate=æåæé edit_defaults.ascending=ååº edit_defaults.descending=éåº Index: ContentChannelPortlet_nl.properties === RCS file: /var/cvs/contributions/CMSContainer/cmsc/portlets/resources/com/finalist/cmsc/portlets/ContentChannelPortlet_nl.properties,v retrieving revision 1.9 retrieving revision 1.10 diff -u -b -r1.9 -r1.10 --- ContentChannelPortlet_nl.properties 9 Jun 2008 08:51:06 - 1.9 +++ ContentChannelPortlet_nl.properties 14 Jul 2008 08:56:13 - 1.10 @@ -50,7 +50,7 @@ edit_defaults.orderby.creationdate=Aanmaakdatum edit_defaults.orderby.lastmodifieddate=Laatste wijziging edit_defaults.orderby.publishdate=Publicatie datum -edit_defaults.orderby.expirydate=Verloopdatum +edit_defaults.orderby.expiredate=Verloopdatum edit_defaults.ascending=Oplopend edit_defaults.descending=Aflopend Index: ContentChannelPortlet.properties === RCS file: /var/cvs/contributions/CMSContainer/cmsc/portlets/resources/com/finalist/cmsc/portlets/ContentChannelPortlet.properties,v retrieving revision 1.7 retrieving revision 1.8 diff -u -b -r1.7 -r1.8 --- ContentChannelPortlet.properties20 Mar 2008 03:22:09 - 1.7 +++ ContentChannelPortlet.properties14 Jul 2008 08:56:13 - 1.8 @@ -15,7 +15,7 @@ edit_defaults.archive.all=- edit_defaults.archive.new=In future (not in archive) edit_defaults.archive.old=In past (in archive) -edit_defaults.orderby=Orderby +edit_defaults.orderby=Order by edit_defaults.direction=Direction edit_defaults.startindex=Start from element edit_defaults.maxelements=Max elements @@ -47,10 +47,10 @@ edit_defaults.orderby.channelposition=Channel position edit_defaults.orderby.title=Title edit_defaults.orderby.description=Description -edit_defaults.orderby.creationdate=Creationdate -edit_defaults.orderby.lastmodifieddate=Lastmodifieddate -edit_defaults.orderby.publishdate=Publishdate -edit_defaults.orderby.expirydate=Expirydate +edit_defaults.orderby.creationdate=Creation date +edit_defaults.orderby.lastmodifieddate=Last modified date +edit_defaults.orderby.publishdate=Publish date +edit_defaults.orderby.expiredate=Expire date edit_defaults.ascending=Ascending edit_defaults.descending=Descending ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults ContentChannel.jsp
Update of /var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults In directory james.mmbase.org:/tmp/cvs-serv31675/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults Modified Files: ContentChannel.jsp Log Message: CMSC-1009 - Use: contentchannel order by expiredate instead of expirydate. See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults See also: http://www.mmbase.org/jira/browse/CMSC-1009 Index: ContentChannel.jsp === RCS file: /var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/ContentChannel.jsp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -b -r1.8 -r1.9 --- ContentChannel.jsp 23 Jun 2008 05:32:27 - 1.8 +++ ContentChannel.jsp 14 Jul 2008 08:56:13 - 1.9 @@ -136,7 +136,7 @@ - + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/portlets/resources/com/finalist/cmsc/portlets ContentChannelPortlet_zh.properties ContentChannelPortlet.properties ContentChannelPortlet_nl.properties
Update of /var/cvs/contributions/CMSContainer/cmsc/portlets/resources/com/finalist/cmsc/portlets In directory james.mmbase.org:/tmp/cvs-serv31629/cmsc/portlets/resources/com/finalist/cmsc/portlets Modified Files: Tag: b1_4 ContentChannelPortlet_zh.properties ContentChannelPortlet.properties ContentChannelPortlet_nl.properties Log Message: CMSC-1009 - Use: contentchannel order by expiredate instead of expirydate. See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/portlets/resources/com/finalist/cmsc/portlets See also: http://www.mmbase.org/jira/browse/CMSC-1009 Index: ContentChannelPortlet_zh.properties === RCS file: /var/cvs/contributions/CMSContainer/cmsc/portlets/resources/com/finalist/cmsc/portlets/ContentChannelPortlet_zh.properties,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -b -r1.1 -r1.1.2.1 --- ContentChannelPortlet_zh.properties 23 Oct 2007 06:54:35 - 1.1 +++ ContentChannelPortlet_zh.properties 14 Jul 2008 08:56:05 - 1.1.2.1 @@ -48,7 +48,7 @@ edit_defaults.orderby.creationdate=å建æ¥æ edit_defaults.orderby.lastmodifieddate=ææ°ä¿®æ¹æ¥æ edit_defaults.orderby.publishdate=åå¸æ¥æ -edit_defaults.orderby.expirydate=æåæé +edit_defaults.orderby.expiredate=æåæé edit_defaults.ascending=ååº edit_defaults.descending=éåº Index: ContentChannelPortlet.properties === RCS file: /var/cvs/contributions/CMSContainer/cmsc/portlets/resources/com/finalist/cmsc/portlets/ContentChannelPortlet.properties,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -b -r1.6 -r1.6.2.1 --- ContentChannelPortlet.properties24 Oct 2007 13:55:18 - 1.6 +++ ContentChannelPortlet.properties14 Jul 2008 08:56:05 - 1.6.2.1 @@ -13,7 +13,7 @@ edit_defaults.archive.all=- edit_defaults.archive.new=In future (not in archive) edit_defaults.archive.old=In past (in archive) -edit_defaults.orderby=Orderby +edit_defaults.orderby=Order by edit_defaults.direction=Direction edit_defaults.startindex=Start from element edit_defaults.maxelements=Max elements @@ -45,10 +45,10 @@ edit_defaults.orderby.channelposition=Channel position edit_defaults.orderby.title=Title edit_defaults.orderby.description=Description -edit_defaults.orderby.creationdate=Creationdate -edit_defaults.orderby.lastmodifieddate=Lastmodifieddate -edit_defaults.orderby.publishdate=Publishdate -edit_defaults.orderby.expirydate=Expirydate +edit_defaults.orderby.creationdate=Creation date +edit_defaults.orderby.lastmodifieddate=Last modified date +edit_defaults.orderby.publishdate=Publish date +edit_defaults.orderby.expiredate=Expire date edit_defaults.ascending=Ascending edit_defaults.descending=Descending Index: ContentChannelPortlet_nl.properties === RCS file: /var/cvs/contributions/CMSContainer/cmsc/portlets/resources/com/finalist/cmsc/portlets/ContentChannelPortlet_nl.properties,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -u -b -r1.6.2.1 -r1.6.2.2 --- ContentChannelPortlet_nl.properties 9 Jun 2008 08:51:11 - 1.6.2.1 +++ ContentChannelPortlet_nl.properties 14 Jul 2008 08:56:05 - 1.6.2.2 @@ -48,7 +48,7 @@ edit_defaults.orderby.creationdate=Aanmaakdatum edit_defaults.orderby.lastmodifieddate=Laatste wijziging edit_defaults.orderby.publishdate=Publicatie datum -edit_defaults.orderby.expirydate=Verloopdatum +edit_defaults.orderby.expiredate=Verloopdatum edit_defaults.ascending=Oplopend edit_defaults.descending=Aflopend ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults ContentChannel.jsp
Update of /var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults In directory james.mmbase.org:/tmp/cvs-serv31629/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults Modified Files: Tag: b1_4 ContentChannel.jsp Log Message: CMSC-1009 - Use: contentchannel order by expiredate instead of expirydate. See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults See also: http://www.mmbase.org/jira/browse/CMSC-1009 Index: ContentChannel.jsp === RCS file: /var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/ContentChannel.jsp,v retrieving revision 1.6 retrieving revision 1.6.6.1 diff -u -b -r1.6 -r1.6.6.1 --- ContentChannel.jsp 7 Mar 2007 19:33:51 - 1.6 +++ ContentChannel.jsp 14 Jul 2008 08:56:05 - 1.6.6.1 @@ -121,7 +121,7 @@ - + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults ContentChannel.jsp
Update of /var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults In directory james.mmbase.org:/tmp/cvs-serv31594/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults Modified Files: Tag: v1_3 ContentChannel.jsp Log Message: CMSC-1009 - Use: contentchannel order by expiredate instead of expirydate. See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults See also: http://www.mmbase.org/jira/browse/CMSC-1009 Index: ContentChannel.jsp === RCS file: /var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/ContentChannel.jsp,v retrieving revision 1.6 retrieving revision 1.6.4.1 diff -u -b -r1.6 -r1.6.4.1 --- ContentChannel.jsp 7 Mar 2007 19:33:51 - 1.6 +++ ContentChannel.jsp 14 Jul 2008 08:55:59 - 1.6.4.1 @@ -121,7 +121,7 @@ - + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults ContentChannel.jsp
Update of /var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults In directory james.mmbase.org:/tmp/cvs-serv31568/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults Modified Files: Tag: v1_2 ContentChannel.jsp Log Message: CMSC-1009 - Use: contentchannel order by expiredate instead of expirydate. See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults See also: http://www.mmbase.org/jira/browse/CMSC-1009 Index: ContentChannel.jsp === RCS file: /var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/ContentChannel.jsp,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -b -r1.6 -r1.6.2.1 --- ContentChannel.jsp 7 Mar 2007 19:33:51 - 1.6 +++ ContentChannel.jsp 14 Jul 2008 08:55:52 - 1.6.2.1 @@ -121,7 +121,7 @@ - + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/taglib/resources/META-INF cmsc-ui.tld
Update of /var/cvs/contributions/CMSContainer/cmsc/taglib/resources/META-INF In directory james.mmbase.org:/tmp/cvs-serv30688/cmsc/taglib/resources/META-INF Removed Files: cmsc-ui.tld Log Message: CMSC-1008 tags moved to edit-webapp See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/taglib/resources/META-INF See also: http://www.mmbase.org/jira/browse/CMSC-1008 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
