[MMBASE SCM] test test
Does it work? -- mihxil' http://meeuw.org nl_NL eo_XX en_US ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] CVSROOT commitinfo
Update of /var/cvs/CVSROOT In directory james.mmbase.org:/tmp/cvs-serv1887 Modified Files: commitinfo Log Message: This should disable all further CVS commits, because migration to SVN will commence now. See also: http://cvs.mmbase.org/viewcvs/CVSROOT Index: commitinfo === RCS file: /var/cvs/CVSROOT/commitinfo,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- commitinfo 8 Apr 2008 08:18:35 - 1.2 +++ commitinfo 1 May 2009 06:10:09 - 1.3 @@ -15,4 +15,5 @@ # in addition to the first matching regex or DEFAULT. +ALL $CVSROOT/CVSROOT/deny.pl ALL $CVSROOT/CVSROOT/xmlvalidate.pl ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/resources/config/builders/resources images.xml
Update of /var/cvs/applications/resources/config/builders/resources In directory james.mmbase.org:/tmp/cvs-serv4081/applications/resources/config/builders/resources Modified Files: images.xml Log Message: updated actual used class See also: http://cvs.mmbase.org/viewcvs/applications/resources/config/builders/resources Index: images.xml === RCS file: /var/cvs/applications/resources/config/builders/resources/images.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -b -r1.11 -r1.12 --- images.xml 24 Apr 2009 15:07:16 - 1.11 +++ images.xml 30 Apr 2009 09:27:07 - 1.12 @@ -70,7 +70,7 @@ !-- convert using ImageMagick example for windows -- !-- -property name=ImageConvertClassorg.mmbase.module.builders.ConvertImageMagick/property +property name=ImageConvertClassorg.mmbase.util.images.ImageMagickImageConverter/property property name=ImageConvert.ConverterCommandconvert.exe/property property name=ImageConvert.ConverterRootC:\Program Files\ImageMagick-5.5.7-Q8\/property -- ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/resources/src/org/mmbase/servlet FileServlet.java
Update of /var/cvs/applications/resources/src/org/mmbase/servlet
In directory
james.mmbase.org:/tmp/cvs-serv4161/applications/resources/src/org/mmbase/servlet
Modified Files:
FileServlet.java
Log Message:
actually disable put if anonymous
See also:
http://cvs.mmbase.org/viewcvs/applications/resources/src/org/mmbase/servlet
Index: FileServlet.java
===
RCS file:
/var/cvs/applications/resources/src/org/mmbase/servlet/FileServlet.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- FileServlet.java24 Apr 2009 08:58:30 - 1.12
+++ FileServlet.java30 Apr 2009 09:28:11 - 1.13
@@ -26,7 +26,7 @@
* Straight-forward filter which can serve files from one directory (the
directory 'files' in the
* mmbase 'datadir') outside the web application root.
*
- * @version $Id: FileServlet.java,v 1.12 2009/04/24 08:58:30 michiel Exp $
+ * @version $Id: FileServlet.java,v 1.13 2009/04/30 09:28:11 michiel Exp $
* @author Michiel Meeuwissen
* @since MMBase-1.9
* @seeAttachmentServlet
@@ -218,13 +218,11 @@
resp.sendError(HttpServletResponse.SC_FORBIDDEN, The file ' +
req.getPathInfo() + ' already exists);
return;
}
-/*
-Cloud cloud = getCloud(readQuery(req.getQueryString()));
-if (cloud.getUser().getRank() == Rank.ANONYMOUS) {
+org.mmbase.bridge.Cloud cloud =
getCloud(readQuery(req.getQueryString()));
+if (cloud.getUser().getRank() == org.mmbase.security.Rank.ANONYMOUS) {
resp.sendError(HttpServletResponse.SC_FORBIDDEN, The file ' +
req.getPathInfo() + ' already exists);
return;
}
-*/
BufferedOutputStream out = new BufferedOutputStream(new
FileOutputStream(file));
BufferedInputStream in = new BufferedInputStream(req.getInputStream());
byte[] buf = new byte[1024];
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/taglib/src/org/mmbase/bridge/jsp/taglib mmbase-taglib.xml
Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib In directory james.mmbase.org:/tmp/cvs-serv4381/applications/taglib/src/org/mmbase/bridge/jsp/taglib Modified Files: mmbase-taglib.xml Log Message: added some documentation See also: http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib Index: mmbase-taglib.xml === RCS file: /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/mmbase-taglib.xml,v retrieving revision 1.452 retrieving revision 1.453 diff -u -b -r1.452 -r1.453 --- mmbase-taglib.xml 9 Mar 2009 18:05:49 - 1.452 +++ mmbase-taglib.xml 30 Apr 2009 09:31:34 - 1.453 @@ -39,7 +39,7 @@ Use one or more possiblevalue tags if you want to list all possible values. Use one or more examplevalue tags is you want to give some example values. -version: $Id: mmbase-taglib.xml,v 1.452 2009/03/09 18:05:49 michiel Exp $ +version: $Id: mmbase-taglib.xml,v 1.453 2009/04/30 09:31:34 michiel Exp $ -- taglib author=MMBase community @@ -94,6 +94,7 @@ description Performs taglib-escaping. /description +see tag=write attribute=escape / nameescape/name function-classorg.mmbase.bridge.jsp.taglib.functions.Functions/function-class function-signaturejava.lang.String escape(java.lang.String, java.lang.Object)/function-signature @@ -9102,6 +9103,9 @@ nameselectnode/name path/META-INF/tags/mm/u/selectnode.tagx/path sinceMMBase-1.9/since +info + Selects a node directly by the value of one of its fields. +/info /tag-file tag-file typemmbase.basic/type ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] all build.xml
Update of /var/cvs/all In directory james.mmbase.org:/tmp/cvs-serv4606 Modified Files: build.xml Log Message: ant should not be used any more See also: http://cvs.mmbase.org/viewcvs/all Index: build.xml === RCS file: /var/cvs/all/build.xml,v retrieving revision 1.178 retrieving revision 1.179 diff -u -b -r1.178 -r1.179 --- build.xml 4 Apr 2009 09:43:31 - 1.178 +++ build.xml 30 Apr 2009 09:36:08 - 1.179 @@ -1,8 +1,10 @@ !-- === +THIS FILE IS DEPRECATED. WE USE MAVEN NOW. PLEASE READ 'README'. + MMBase Build File -$Id: build.xml,v 1.178 2009/04/04 09:43:31 michiel Exp $ +$Id: build.xml,v 1.179 2009/04/30 09:36:08 michiel Exp $ = This build file can be used to build the following from CVS or from the source ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/media/src/org/mmbase/applications/media/urlcomposers/omroep EmbeddedCgiURLComposer.java
Update of /var/cvs/applications/media/src/org/mmbase/applications/media/urlcomposers/omroep In directory james.mmbase.org:/tmp/cvs-serv5129/applications/media/src/org/mmbase/applications/media/urlcomposers/omroep Added Files: EmbeddedCgiURLComposer.java Log Message: it seems that I should have checked in this a few years ago... See also: http://cvs.mmbase.org/viewcvs/applications/media/src/org/mmbase/applications/media/urlcomposers/omroep EmbeddedCgiURLComposer.java is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/richtext/src/org/mmbase/richtext/processors/xml MmxfGetString.java
Update of /var/cvs/applications/richtext/src/org/mmbase/richtext/processors/xml
In directory
james.mmbase.org:/tmp/cvs-serv4282/applications/richtext/src/org/mmbase/richtext/processors/xml
Modified Files:
MmxfGetString.java
Log Message:
solved some deprecation
See also:
http://cvs.mmbase.org/viewcvs/applications/richtext/src/org/mmbase/richtext/processors/xml
Index: MmxfGetString.java
===
RCS file:
/var/cvs/applications/richtext/src/org/mmbase/richtext/processors/xml/MmxfGetString.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- MmxfGetString.java 29 Oct 2008 20:46:37 - 1.17
+++ MmxfGetString.java 30 Apr 2009 09:30:23 - 1.18
@@ -16,7 +16,7 @@
import org.mmbase.util.logging.*;
import org.mmbase.util.*;
import org.mmbase.richtext.transformers.XmlField;
-import org.mmbase.util.xml.XMLWriter;
+import org.mmbase.util.xml.*;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
import javax.xml.parsers.*;
@@ -30,7 +30,7 @@
* This class implements the `get' for `mmxf' fields.
*
* @author Michiel Meeuwissen
- * @version $Id: MmxfGetString.java,v 1.17 2008/10/29 20:46:37 michiel Exp $
+ * @version $Id: MmxfGetString.java,v 1.18 2009/04/30 09:30:23 michiel Exp $
* @since MMBase-1.8
*/
@@ -50,9 +50,9 @@
DocumentBuilderFactory dfactory =
DocumentBuilderFactory.newInstance();
dfactory.setNamespaceAware(true);
DocumentBuilder documentBuilder = dfactory.newDocumentBuilder();
-org.xml.sax.ErrorHandler handler = new XMLErrorHandler();
+org.xml.sax.ErrorHandler handler = new ErrorHandler();
documentBuilder.setErrorHandler(handler);
-documentBuilder.setEntityResolver( new XMLEntityResolver());
+documentBuilder.setEntityResolver( new EntityResolver());
return documentBuilder;
} catch (ParserConfigurationException pce) {
throw new RuntimeException(pce.getMessage(), pce);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] tests/config/builders/resources images.xml
Update of /var/cvs/tests/config/builders/resources In directory james.mmbase.org:/tmp/cvs-serv4717/tests/config/builders/resources Modified Files: images.xml Log Message: corrected class configuraton See also: http://cvs.mmbase.org/viewcvs/tests/config/builders/resources Index: images.xml === RCS file: /var/cvs/tests/config/builders/resources/images.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -b -r1.5 -r1.6 --- images.xml 17 Dec 2005 23:11:12 - 1.5 +++ images.xml 30 Apr 2009 09:37:19 - 1.6 @@ -41,7 +41,7 @@ !-- property name=ImageConvertClassorg.mmbase.module.builders.ConvertJAI/property -- !-- convert using ImageMagick -- -property name=ImageConvertClassorg.mmbase.module.builders.ConvertImageMagick/property +property name=ImageConvertClassorg.mmbase.util.images.ImageMagickImageConverter/property property name=ImageConvert.ConverterCommandconvert/property property name=ImageConvert.ConverterRoot/property ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/lucene/src/org/mmbase/bridge/util AnnotatedNode.java
Update of /var/cvs/contributions/lucene/src/org/mmbase/bridge/util
In directory
james.mmbase.org:/tmp/cvs-serv5667/contributions/lucene/src/org/mmbase/bridge/util
Modified Files:
AnnotatedNode.java
Log Message:
removed unused import
See also:
http://cvs.mmbase.org/viewcvs/contributions/lucene/src/org/mmbase/bridge/util
Index: AnnotatedNode.java
===
RCS file:
/var/cvs/contributions/lucene/src/org/mmbase/bridge/util/AnnotatedNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- AnnotatedNode.java 21 Jul 2008 14:23:23 - 1.1
+++ AnnotatedNode.java 30 Apr 2009 10:06:12 - 1.2
@@ -12,7 +12,6 @@
import java.util.*;
import java.util.concurrent.*;
-import org.mmbase.bridge.util.*;
import org.mmbase.bridge.*;
import org.mmbase.util.logging.*;
@@ -22,7 +21,7 @@
* matter of convience in e.g. JSPs using {...@link #getValue} with a field
name starting with annotation:.
*
* @author Michiel Meeuwissen
- * @version $Id: AnnotatedNode.java,v 1.1 2008/07/21 14:23:23 michiel Exp $
+ * @version $Id: AnnotatedNode.java,v 1.2 2009/04/30 10:06:12 michiel Exp $
* @since MMBase-1.9
*/
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/lucene pom.xml
Update of /var/cvs/contributions/lucene
In directory james.mmbase.org:/tmp/cvs-serv5739
Modified Files:
pom.xml
Log Message:
Added description
See also: http://cvs.mmbase.org/viewcvs/contributions/lucene
Index: pom.xml
===
RCS file: /var/cvs/contributions/lucene/pom.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- pom.xml 20 Feb 2009 17:04:00 - 1.4
+++ pom.xml 30 Apr 2009 10:06:46 - 1.5
@@ -13,6 +13,7 @@
version${mmbase.version}/version
packagingwar/packaging
+ descriptionLucene is an apache product that can index objects. This wraps
it into an mmbase module, to index MMBase queries. It provides/description
dependencies
@@ -77,4 +78,4 @@
/repository
/repositories
-/project
+ /project
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/resources pom.xml
Update of /var/cvs/applications/resources In directory james.mmbase.org:/tmp/cvs-serv5908 Modified Files: pom.xml Log Message: has dependency on servlets See also: http://cvs.mmbase.org/viewcvs/applications/resources Index: pom.xml === RCS file: /var/cvs/applications/resources/pom.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -b -r1.8 -r1.9 --- pom.xml 28 Apr 2009 15:19:35 - 1.8 +++ pom.xml 30 Apr 2009 10:10:17 - 1.9 @@ -34,6 +34,11 @@ version1.1.3/version scopeprovided/scope /dependency +dependency + groupIdjavax.servlet/groupId + artifactIdservlet-api/artifactId + scopeprovided/scope +/dependency /dependencies ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/datatypes BasicDataType.java DataType.java NodeDataType.java XmlDataType.java
Update of /var/cvs/src/org/mmbase/datatypes
In directory james.mmbase.org:/tmp/cvs-serv6077
Modified Files:
BasicDataType.java DataType.java NodeDataType.java
XmlDataType.java
Log Message:
here and there some hackery occured because 'searching' sometimes needs another
cast. Added it to the interface to fix it
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/datatypes
Index: BasicDataType.java
===
RCS file: /var/cvs/src/org/mmbase/datatypes/BasicDataType.java,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- BasicDataType.java 28 Apr 2009 08:44:00 - 1.109
+++ BasicDataType.java 30 Apr 2009 10:15:46 - 1.110
@@ -40,7 +40,7 @@
* @author Pierre van Rooden
* @author Michiel Meeuwissen
* @since MMBase-1.8
- * @version $Id: BasicDataType.java,v 1.109 2009/04/28 08:44:00 michiel Exp $
+ * @version $Id: BasicDataType.java,v 1.110 2009/04/30 10:15:46 michiel Exp $
*/
public class BasicDataTypeC extends AbstractDescriptor implements
DataTypeC, ComparableDataTypeC, Descriptor {
@@ -592,6 +592,13 @@
return requiredRestriction.validate(errors, value, node, field);
}
+/**
+ * @since MMBase-1.9.1
+ */
+public Object castForSearch(final Object value, final Node node, final
Field field) {
+return cast(value, node, field);
+}
+
protected StringBuilder toStringBuilder() {
StringBuilder buf = new StringBuilder();
buf.append(getName() + ( + getTypeAsClass() + (defaultValue != null
? : + defaultValue : ) + ));
@@ -1248,7 +1255,9 @@
}
}
+if (log.isDebugEnabled()) {
log.debug(Checking ' + value + ');
+}
NodeManager nodeManager = field.getNodeManager();
Cloud cloud = nodeManager.getCloud();
if (cloud.getUser().getRank().getInt() Rank.ADMIN_INT) {
Index: DataType.java
===
RCS file: /var/cvs/src/org/mmbase/datatypes/DataType.java,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- DataType.java 30 Apr 2009 09:33:00 - 1.75
+++ DataType.java 30 Apr 2009 10:15:46 - 1.76
@@ -33,7 +33,7 @@
* @author Pierre van Rooden
* @author Michiel Meeuwissen
* @since MMBase-1.8
- * @version $Id: DataType.java,v 1.75 2009/04/30 09:33:00 michiel Exp $
+ * @version $Id: DataType.java,v 1.76 2009/04/30 10:15:46 michiel Exp $
* @param C Class this DataType
*/
@@ -164,6 +164,15 @@
public D D preCast(D value, Node node, Field field);
//public Object preCast(Object value, Node node, Field field);
+
+/**
+ * Sometimes the the representation of the value is a bit different in the
database, or has a
+ * different type. So when constraining a search on the value, casting is
done by this. This may
+ * default to {...@link cast(Object, Node, Field}.
+ * @since MMBase-1.9.1
+ */
+public Object castForSearch(Object value, Node node, Field field);
+
/**
* Returns the default value of this data type.
* @return the default value
Index: NodeDataType.java
===
RCS file: /var/cvs/src/org/mmbase/datatypes/NodeDataType.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- NodeDataType.java 7 Jan 2009 17:54:19 - 1.34
+++ NodeDataType.java 30 Apr 2009 10:15:46 - 1.35
@@ -21,7 +21,7 @@
*
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: NodeDataType.java,v 1.34 2009/01/07 17:54:19 michiel Exp $
+ * @version $Id: NodeDataType.java,v 1.35 2009/04/30 10:15:46 michiel Exp $
* @since MMBase-1.8
*/
public class NodeDataType extends BasicDataTypeNode {
@@ -70,6 +70,12 @@
}
}
+@Override
+public Integer castForSearch(final Object value, final Node node, final
Field field) {
+if (value == null) return -1;
+return org.mmbase.util.Casting.toInteger(value);
+}
+
/**
* Whether the Node of the value must exist
*
Index: XmlDataType.java
===
RCS file: /var/cvs/src/org/mmbase/datatypes/XmlDataType.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- XmlDataType.java7 Apr 2007 17:11:56 - 1.6
+++ XmlDataType.java30 Apr 2009 10:15:46 - 1.7
@@ -8,13 +8,14 @@
*/
package org.mmbase.datatypes;
+import org.mmbase.bridge.*;
/**
* The data associated with 'XML' values ({...@link org.w3c.dom.Document}). At
the moment this class is
* empty, but of course we forsee the possibility for restrictions on
doc-type.
*
* @author Michiel Meeuwissen
- * @version $Id: XmlDataType.java,v 1.6 2007/04/07 17:11
[MMBASE CVS] tests/datatypes/org/mmbase/datatypes DataTypesTest.java
Update of /var/cvs/tests/datatypes/org/mmbase/datatypes
In directory james.mmbase.org:/tmp/cvs-serv6862/datatypes/org/mmbase/datatypes
Modified Files:
DataTypesTest.java
Log Message:
javadoc
See also: http://cvs.mmbase.org/viewcvs/tests/datatypes/org/mmbase/datatypes
Index: DataTypesTest.java
===
RCS file: /var/cvs/tests/datatypes/org/mmbase/datatypes/DataTypesTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- DataTypesTest.java 27 Apr 2009 17:12:34 - 1.4
+++ DataTypesTest.java 30 Apr 2009 10:47:15 - 1.5
@@ -16,14 +16,16 @@
import junit.framework.*;
/**
+ * Test cases for DataTypes which can be done stand alone, with usage of an
actually running MMBase.
*
* @author Michiel Meeuwissen
- * @since MMBase-1.8
+ * @since MMBase-1.9
*/
public class DataTypesTest extends TestCase {
private static boolean setup = false;
public void setUp() throws Exception {
+LocalizedString.setDefault(new Locale(dk));
if (! setup) {
DataTypes.initialize();
setup = true;
@@ -32,9 +34,12 @@
private StringDataType getString() {
DataType? dt = DataTypes.getDataType(string);
-
assertTrue( + dt.getClass(), dt instanceof StringDataType);
-
+return (StringDataType) dt;
+}
+private StringDataType getLine() {
+DataType? dt = DataTypes.getDataType(eline);
+assertTrue( + dt.getClass(), dt instanceof StringDataType);
return (StringDataType) dt;
}
@@ -45,33 +50,50 @@
public void testName() {
assertEquals(string, getString().getName());
assertEquals(clone, getStringClone().getName());
+assertEquals(eline, getLine().getName());
}
public void testGUIName() {
assertEquals(Tekst, getString().getGUIName(new Locale(nl)));
assertEquals(Text, getString().getGUIName(new Locale(en)));
-assertEquals(Tekst, getStringClone().getGUIName(new Locale(nl)));
-assertEquals(Text, getStringClone().getGUIName(new Locale(en)));
+assertEquals(string, getString().getGUIName());
+
+StringDataType clone = getStringClone();
+assertEquals(Tekst, clone.getGUIName(new Locale(nl)));
+assertEquals(Text, clone.getGUIName(new Locale(en)));
+assertEquals(clone, clone.getLocalizedGUIName().getKey());
+assertEquals(clone.getLocalizedGUIName().getDebugString(), clone,
clone.getLocalizedGUIName().get(null));
+assertEquals(clone, getStringClone().getGUIName(null));
+assertEquals(clone, getStringClone().getGUIName());
+
+assertEquals(Tekst, getLine().getGUIName(new Locale(nl)));
+assertEquals(Text, getLine().getGUIName(new Locale(en)));
+assertEquals(eline, getStringClone().getGUIName());
+
}
public void testOrigin() {
assertNull(getString().getOrigin());
assertEquals(getString(), getStringClone().getOrigin());
+assertEquals(getString(), getLine().getOrigin());
}
public void testBaseTypeIdentifier() {
assertEquals(string, getString().getBaseTypeIdentifier());
assertEquals(string, getStringClone().getBaseTypeIdentifier());
+assertEquals(string, getLine().getBaseTypeIdentifier());
}
public void testBaseType() {
assertEquals(Field.TYPE_STRING, getString().getBaseType());
assertEquals(Field.TYPE_STRING, getStringClone().getBaseType());
+assertEquals(Field.TYPE_STRING, getLine().getBaseType());
}
public void testGetTypeAsClass() {
assertEquals(String.class, getString().getTypeAsClass());
assertEquals(String.class, getStringClone().getTypeAsClass());
+assertEquals(String.class, getLine().getTypeAsClass());
}
public void testCheckType() {
@@ -85,8 +107,14 @@
fail();
} catch (IllegalArgumentException iae) {
}
+try {
+getLine().checkType(Integer.valueOf(1));
+fail();
+} catch (IllegalArgumentException iae) {
+}
getString().checkType(foo);
getStringClone().checkType(foo);
+getLine().checkType(foo);
}
public void testCast() {
@@ -94,6 +122,7 @@
assertEquals(foo, getStringClone().cast(foo, null, null));
assertEquals(1, getString().cast(new Integer(1), null, null));
assertEquals(1, getStringClone().cast(new Integer(1), null, null));
+assertEquals(1, getLine().cast(new Integer(1), null, null));
}
@@ -106,6 +135,7 @@
public void testDefaultValue() {
assertNull(getString().getDefaultValue());
assertNull(getStringClone().getDefaultValue());
+assertNull(getLine().getDefaultValue());
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/util/transformers Iso1.java
Update of /var/cvs/src/org/mmbase/util/transformers In directory james.mmbase.org:/tmp/cvs-serv5290/src/org/mmbase/util/transformers Added Files: Iso1.java Log Message: had this pending, it can be usefull to unhtml strings See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/transformers Iso1.java is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/util/xml UtilReader.java
Update of /var/cvs/src/org/mmbase/util/xml
In directory james.mmbase.org:/tmp/cvs-serv4665/src/org/mmbase/util/xml
Modified Files:
UtilReader.java
Log Message:
spacing only
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/xml
Index: UtilReader.java
===
RCS file: /var/cvs/src/org/mmbase/util/xml/UtilReader.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- UtilReader.java 30 Dec 2008 11:02:34 - 1.41
+++ UtilReader.java 30 Apr 2009 09:36:40 - 1.42
@@ -37,7 +37,7 @@
* @since MMBase-1.6.4
* @author Rob Vermeulen
* @author Michiel Meeuwissen
- * @version $Id: UtilReader.java,v 1.41 2008/12/30 11:02:34 michiel Exp $
+ * @version $Id: UtilReader.java,v 1.42 2009/04/30 09:36:40 michiel Exp $
*/
public class UtilReader {
@@ -170,8 +170,8 @@
* Get the properties of this utility.
* @since MMBase-1.8.6
*/
-public PropertiesMapCollectionMap.EntryString,String getMaps() {
-return new PropertiesMapCollectionMap.EntryString,String(maps);
+public PropertiesMapCollectionMap.EntryString, String getMaps() {
+return new PropertiesMapCollectionMap.EntryString, String(maps);
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/richtext/src/org/mmbase/richtext/processors/xml Util.java
Update of /var/cvs/applications/richtext/src/org/mmbase/richtext/processors/xml
In directory
james.mmbase.org:/tmp/cvs-serv4332/applications/richtext/src/org/mmbase/richtext/processors/xml
Modified Files:
Util.java
Log Message:
solved some deprecation
See also:
http://cvs.mmbase.org/viewcvs/applications/richtext/src/org/mmbase/richtext/processors/xml
Index: Util.java
===
RCS file:
/var/cvs/applications/richtext/src/org/mmbase/richtext/processors/xml/Util.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- Util.java 25 Sep 2008 10:17:28 - 1.4
+++ Util.java 30 Apr 2009 09:30:41 - 1.5
@@ -30,7 +30,7 @@
/**
* Utility functions, used by various classes in the package.
* @author Michiel Meeuwissen
- * @version $Id: Util.java,v 1.4 2008/09/25 10:17:28 michiel Exp $
+ * @version $Id: Util.java,v 1.5 2009/04/30 09:30:41 michiel Exp $
*/
public abstract class Util {
@@ -66,10 +66,10 @@
dfactory.setNamespaceAware(true);
DocumentBuilder documentBuilder = dfactory.newDocumentBuilder();
// dont log errors, and try to process as much as possible...
-XMLErrorHandler errorHandler = new XMLErrorHandler(false,
org.mmbase.util.XMLErrorHandler.NEVER);
+org.mmbase.util.xml.ErrorHandler errorHandler = new
org.mmbase.util.xml.ErrorHandler(false, org.mmbase.util.xml.ErrorHandler.NEVER);
documentBuilder.setErrorHandler(errorHandler);
-documentBuilder.setEntityResolver(new XMLEntityResolver(false));
+documentBuilder.setEntityResolver(new
org.mmbase.util.xml.EntityResolver(false));
Document doc = documentBuilder.parse(value);
if (! errorHandler.foundNothing()) {
throw new IllegalArgumentException(xml invalid:\n +
errorHandler.getMessageBuffer() + for xml:\n + value);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/lucene/src/org/mmbase/module/lucene Indexer.java Lucene.java
Update of /var/cvs/contributions/lucene/src/org/mmbase/module/lucene
In directory james.mmbase.org:/tmp/cvs-serv5816/src/org/mmbase/module/lucene
Modified Files:
Indexer.java Lucene.java
Log Message:
conventions only
See also:
http://cvs.mmbase.org/viewcvs/contributions/lucene/src/org/mmbase/module/lucene
Index: Indexer.java
===
RCS file:
/var/cvs/contributions/lucene/src/org/mmbase/module/lucene/Indexer.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- Indexer.java12 Feb 2009 12:34:11 - 1.63
+++ Indexer.java30 Apr 2009 10:07:34 - 1.64
@@ -34,7 +34,7 @@
*
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: Indexer.java,v 1.63 2009/02/12 12:34:11 michiel Exp $
+ * @version $Id: Indexer.java,v 1.64 2009/04/30 10:07:34 michiel Exp $
**/
public class Indexer {
@@ -43,7 +43,7 @@
/**
* An empty index definition that can be used to obtain nodes from the
cloud.
*/
-protected static final MMBaseIndexDefinition nodeLoader = new
MMBaseIndexDefinition();
+static final MMBaseIndexDefinition nodeLoader = new
MMBaseIndexDefinition();
/**
* @since MMBase-1.9
@@ -58,7 +58,9 @@
* @since MMBase-1.9
*/
public static void addField(Document document, Field field, Multiple
multiple) {
-if (multiple == null) multiple = Multiple.ADD;
+if (multiple == null) {
+ multiple = Multiple.ADD;
+}
switch(multiple) {
case FIRST:
if (document.get(field.name()) == null) {
@@ -184,7 +186,9 @@
public Node getNode(Cloud userCloud, Document doc) {
for (IndexDefinition id : queries) {
Node n = id.getNode(userCloud, doc);
-if (n != null) return n;
+if (n != null) {
+ return n;
+}
}
return nodeLoader.getNode(userCloud, doc);
}
@@ -377,7 +381,13 @@
addError(ioe.getMessage());
log.error(ioe);
} finally {
-if (reader != null) try {reader.close(); } catch
(IOException ioe) { log.error(ioe);}
+if (reader != null) {
+ try {
+reader.close();
+ } catch (IOException ioe) {
+log.error(ioe);
+ }
+ }
}
if (mains.size() 0) {
log.debug(Found lucene documents + mains + for node
+ number + which must be updated now);
Index: Lucene.java
===
RCS file:
/var/cvs/contributions/lucene/src/org/mmbase/module/lucene/Lucene.java,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -b -r1.131 -r1.132
--- Lucene.java 4 Mar 2009 18:02:46 - 1.131
+++ Lucene.java 30 Apr 2009 10:07:34 - 1.132
@@ -17,7 +17,6 @@
import javax.sql.DataSource;
import org.mmbase.bridge.*;
-import org.mmbase.bridge.util.Queries;
import org.mmbase.storage.search.*;
import org.mmbase.cache.*;
import org.mmbase.module.ReloadableModule;
@@ -31,12 +30,9 @@
import org.mmbase.util.functions.*;
import org.mmbase.util.logging.*;
import
org.mmbase.storage.implementation.database.DatabaseStorageManagerFactory;
-import org.mmbase.storage.StorageManagerFactory;
import java.util.concurrent.*;
-import org.apache.lucene.store.Directory;
-import org.apache.lucene.analysis.StopAnalyzer;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.queryParser.ParseException;
@@ -48,7 +44,7 @@
*
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: Lucene.java,v 1.131 2009/03/04 18:02:46 sdeboer Exp $
+ * @version $Id: Lucene.java,v 1.132 2009/04/30 10:07:34 michiel Exp $
**/
public class Lucene extends ReloadableModule implements NodeEventListener,
RelationEventListener, IdEventListener, AssignmentEvents.Listener {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/datatypes DataType.java
Update of /var/cvs/src/org/mmbase/datatypes In directory james.mmbase.org:/tmp/cvs-serv4483/src/org/mmbase/datatypes Modified Files: DataType.java Log Message: proposal addition See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/datatypes Index: DataType.java === RCS file: /var/cvs/src/org/mmbase/datatypes/DataType.java,v retrieving revision 1.74 retrieving revision 1.75 diff -u -b -r1.74 -r1.75 --- DataType.java 28 Apr 2009 08:44:00 - 1.74 +++ DataType.java 30 Apr 2009 09:33:00 - 1.75 @@ -33,7 +33,7 @@ * @author Pierre van Rooden * @author Michiel Meeuwissen * @since MMBase-1.8 - * @version $Id: DataType.java,v 1.74 2009/04/28 08:44:00 michiel Exp $ + * @version $Id: DataType.java,v 1.75 2009/04/30 09:33:00 michiel Exp $ * @param C Class this DataType */ @@ -408,6 +408,11 @@ */ public MapString, Handler? getHandlers(); +/** + * @since MMBase-1.9 + */ +//public CollectionRestriction? getRestrictions(); + /** * @since MMBase-1.9.1 @@ -483,6 +488,8 @@ */ public void setEnforceStrength(int v); + + } } ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/media/src/org/mmbase/applications/media Format.java
Update of /var/cvs/applications/media/src/org/mmbase/applications/media
In directory
james.mmbase.org:/tmp/cvs-serv4034/applications/media/src/org/mmbase/applications/media
Modified Files:
Format.java
Log Message:
See also:
http://cvs.mmbase.org/viewcvs/applications/media/src/org/mmbase/applications/media
Index: Format.java
===
RCS file:
/var/cvs/applications/media/src/org/mmbase/applications/media/Format.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- Format.java 3 Sep 2008 21:27:20 - 1.23
+++ Format.java 30 Apr 2009 09:26:38 - 1.24
@@ -9,7 +9,6 @@
package org.mmbase.applications.media;
-import java.io.File;
import java.util.*;
import org.mmbase.util.*;
import org.mmbase.util.xml.DocumentReader;
@@ -25,7 +24,7 @@
* Makes the 'Format' constants available.
*
* @author Michiel Meeuwissen
- * @version $Id: Format.java,v 1.23 2008/09/03 21:27:20 michiel Exp $
+ * @version $Id: Format.java,v 1.24 2009/04/30 09:26:38 michiel Exp $
* @since MMBase-1.7
*/
// See http://www.javaworld.com/javaworld/jw-07-1997/jw-07-enumerated.html
@@ -42,7 +41,7 @@
private static MapString,String mimeMapping = null;
static {
-XMLEntityResolver.registerPublicID(PUBLIC_ID_MIMEMAPPING_1_0,
DTD_MIMEMAPPING_1_0, Format.class);
+
org.mmbase.util.xml.EntityResolver.registerPublicID(PUBLIC_ID_MIMEMAPPING_1_0,
DTD_MIMEMAPPING_1_0, Format.class);
String mimeMappingFile = media/mimemapping.xml;
readMimeMapping(mimeMappingFile);
___
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
Update of /var/cvs/applications/resources/src/org/mmbase/util/images
In directory
james.mmbase.org:/tmp/cvs-serv4240/applications/resources/src/org/mmbase/util/images
Modified Files:
ImageMagickImageConverter.java
Log Message:
logging only
See also:
http://cvs.mmbase.org/viewcvs/applications/resources/src/org/mmbase/util/images
Index: ImageMagickImageConverter.java
===
RCS file:
/var/cvs/applications/resources/src/org/mmbase/util/images/ImageMagickImageConverter.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- ImageMagickImageConverter.java 22 Apr 2009 08:03:58 - 1.16
+++ ImageMagickImageConverter.java 30 Apr 2009 09:29:52 - 1.17
@@ -27,7 +27,7 @@
* @author Michiel Meeuwissen
* @author Nico Klasens
* @author Jaco de Groot
- * @version $Id: ImageMagickImageConverter.java,v 1.16 2009/04/22 08:03:58
michiel Exp $
+ * @version $Id: ImageMagickImageConverter.java,v 1.17 2009/04/30 09:29:52
michiel Exp $
*/
public class ImageMagickImageConverter extends AbstractImageConverter
implements ImageConverter {
private static final Logger log =
Logging.getLoggerInstance(ImageMagickImageConverter.class);
@@ -67,18 +67,18 @@
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
switch (method) {
case METHOD_LAUNCHER: {
-try {
-
-CommandLauncher launcher = new CommandLauncher(ConvertImage);
log.debug(Starting convert);
ListString cmd = new ArrayListString();
for (String arg : args) {
cmd.add(arg);
}
+try {
+
+CommandLauncher launcher = new CommandLauncher(ConvertImage);
launcher.execute(converterPath, cmd.toArray(EMPTY));
launcher.waitAndRead(outputStream, errorStream);
} catch (ProcessException e) {
-log.error(Convert test failed. + converterPath + ( +
e.getMessage() + ));
+log.error(Convert test failed. + converterPath + cmd + (
+ e.getMessage() + ));
}
break;
}
@@ -190,7 +190,7 @@
// now check if the specified ImageConvert.converterRoot does
exist and is a directory
File checkConvDir = new File(converterRoot).getAbsoluteFile();
if (!checkConvDir.exists()) {
-log.error( ImageConvert.ConverterRoot + converterRoot +
in + configFile + does not exist);
+log.error( ImageConvert.ConverterRoot + converterRoot +
in + configFile + does not exist (using any way));
} else if (!checkConvDir.isDirectory()) {
log.error( ImageConvert.ConverterRoot + converterRoot +
in + configFile + is not a directory);
} else {
___
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-serv3953/applications/crontab/src/org/mmbase/applications/crontab/modules
Modified Files:
CrontabModule.java
Log Message:
generics, made also 'maps' of properties available
See also:
http://cvs.mmbase.org/viewcvs/applications/crontab/src/org/mmbase/applications/crontab/modules
Index: CrontabModule.java
===
RCS file:
/var/cvs/applications/crontab/src/org/mmbase/applications/crontab/modules/CrontabModule.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- CrontabModule.java 9 Dec 2008 13:38:49 - 1.20
+++ CrontabModule.java 30 Apr 2009 09:25:36 - 1.21
@@ -21,7 +21,7 @@
* Starts a crontab for MMBase as a Module.
*
* @author Michiel Meeuwissen
- * @version $Id: CrontabModule.java,v 1.20 2008/12/09 13:38:49 michiel Exp $
+ * @version $Id: CrontabModule.java,v 1.21 2009/04/30 09:25:36 michiel Exp $
*/
public class CrontabModule extends WatchedReloadableModule {
@@ -85,7 +85,7 @@
cronDaemon.stop();
}
-protected void addJob(Map.EntryString,String entry) {
+protected void addJob(Map.EntryString, String entry) {
String value = entry.getValue();
String[] tokens = value.trim().split([\n|]);
String times;
@@ -156,15 +156,12 @@
init();
}
-/**
- * @since MMBase-1.8
- */
-private MapString,String utilProperties = new UtilReader(crontab.xml,
new Runnable() { public void run() { reload();}}).getProperties();
+private UtilReader reader = new UtilReader(crontab.xml, new Runnable() {
public void run() { reload();}});
+private MapString, String utilProperties = reader.getProperties();
+private MapString, CollectionMap.EntryString, String utilMaps =
reader.getMaps();
public void readMoreJobs() {
-IteratorMap.EntryString,String i =
utilProperties.entrySet().iterator();
-while (i.hasNext()) {
-Map.EntryString,String entry = i.next();
+for (Map.EntryString, String entry : utilProperties.entrySet()) {
addJob(entry);
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] tests/bridge/org/mmbase/bridge DataTypesTest.java
Update of /var/cvs/tests/bridge/org/mmbase/bridge
In directory james.mmbase.org:/tmp/cvs-serv10111
Modified Files:
DataTypesTest.java
Log Message:
generics, comments, sarted on 'testClone'
See also: http://cvs.mmbase.org/viewcvs/tests/bridge/org/mmbase/bridge
Index: DataTypesTest.java
===
RCS file: /var/cvs/tests/bridge/org/mmbase/bridge/DataTypesTest.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- DataTypesTest.java 26 Jan 2009 15:50:19 - 1.51
+++ DataTypesTest.java 30 Apr 2009 14:13:42 - 1.52
@@ -28,10 +28,14 @@
public DataTypesTest(String name) {
super(name);
}
-protected static Object[] cases = null;
+protected static MapClass, Object[][] casesCache = new HashMapClass,
Object[][]();
+
+private Object[][] cases;
+
public void setUp() throws Exception {
+cases = casesCache.get(this.getClass());
if (cases == null) {
Cloud cloud = getCloud();
Node node1 = cloud.getNodeManager(datatypes);
@@ -41,7 +45,7 @@
Node node3 = aa.createNode();
commit(node3);
-cases = new Object[] {
+cases = new Object[][] {
/*{field,
{valid values},
{invalid values}} */
@@ -122,7 +126,7 @@
new Object[] {new
Double(Double.POSITIVE_INFINITY), bla bla
}},
new Object[] {handle,
- new Object[] {new byte[] {4, 3, 2, 1},
getBinary(), null},
+ new Object[] {getBinary(), null},
new Object[] {new byte[] {1, 2}}
},
new Object[] {boolean,
@@ -174,6 +178,7 @@
*/
};
+casesCache.put(this.getClass(), cases);
}
}
@@ -194,8 +199,7 @@
Cloud cloud = getCloud();
NodeManager nodeManager = cloud.getNodeManager(datatypes);
StringBuffer err = new StringBuffer();
-for (Object element : cases) {
-Object[] kase = (Object[]) element;
+for (Object[] kase : cases) {
Field field = nodeManager.getField((String)kase[0]);
Object[] validValues = (Object[]) kase[1];
Object[] invalidValues = (Object[]) kase[2];
@@ -343,34 +347,33 @@
public void testValidValuesCommit() {
Cloud cloud = getCloud();
NodeManager nodeManager = cloud.getNodeManager(datatypes);
-for (Object element : cases) {
-Object[] kase = (Object[]) element;
+for (Object[] kase : cases) {
Field field = nodeManager.getField((String)kase[0]);
Object[] validValues = (Object[]) kase[1];
-for (int j = 0; j validValues.length; j++) {
+for (Object validValue : validValues) {
Node newNode = nodeManager.createNode();
try {
-newNode.setValue(field.getName(), validValues[j]);
+newNode.setValue(field.getName(), validValue);
newNode.setValue(field.getName(), null);
-newNode.setValue(field.getName(), validValues[j]);
+newNode.setValue(field.getName(), validValue);
newNode.commit(); // should not give exception
-if(field.getName().equals(handle) validValues[j] !=
null) {
+if(field.getName().equals(handle) validValue != null)
{
assertFalse(Checksum is null,
newNode.isNull(checksum));
}
if (field.getDataType().isRequired() ||
(
- validValues[j] != null
- (! (validValues[j].equals() (
+ validValue != null
+ (! (validValue.equals() (
field.getDataType()
instanceof NumberDataType
||
field.getDataType() instanceof NodeDataType)
)) // for numbers and nodes may be
interpreted as null
- ! (field.getDataType() instanceof NodeDataType
validValues[j].equals(new Integer(-1))) // -1 casts to null for node-fields.
+ ! (field.getDataType() instanceof NodeDataType
validValue.equals(new Integer(-1))) // -1 casts to null for node-fields.
)
) {
-assertFalse(field + field.getName() + was null,
after we set ' + validValues[j] + ' in it, newNode.isNull(field.getName()));
+assertFalse(field + field.getName() + was null,
after we set ' +
[MMBASE CVS] tests/bridge/org/mmbase/bridge FilledNodeTest.java
Update of /var/cvs/tests/bridge/org/mmbase/bridge In directory james.mmbase.org:/tmp/cvs-serv10184 Modified Files: FilledNodeTest.java Log Message: generics See also: http://cvs.mmbase.org/viewcvs/tests/bridge/org/mmbase/bridge Index: FilledNodeTest.java === RCS file: /var/cvs/tests/bridge/org/mmbase/bridge/FilledNodeTest.java,v retrieving revision 1.28 retrieving revision 1.29 diff -u -b -r1.28 -r1.29 --- FilledNodeTest.java 18 Apr 2009 07:23:03 - 1.28 +++ FilledNodeTest.java 30 Apr 2009 14:14:15 - 1.29 @@ -70,7 +70,7 @@ node.setValue(stringfield, Bridge testing!); node.setValue(xmlfield, getEmptyDocument()); node.setValue(nodefield, typedefNode); -org.mmbase.datatypes.DataTypeObject dt = node.getNodeManager().getField(datetimefield).getDataType(); +org.mmbase.datatypes.DataType? dt = node.getNodeManager().getField(datetimefield).getDataType(); //assertTrue(Not a datetime-datatype but + dt.getClass(), dt.getClass().equals(org.mmbase.datatypes.DateTimeDataType.class)); // would give error in Node#setValue otherwise node.setValue(datetimefield, TEST_DATE); ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] tests/bridge/org/mmbase/bridge ProcessorTest.java
Update of /var/cvs/tests/bridge/org/mmbase/bridge
In directory james.mmbase.org:/tmp/cvs-serv10245
Modified Files:
ProcessorTest.java
Log Message:
commented in the failing cases again. I know how to fix them now.
See also: http://cvs.mmbase.org/viewcvs/tests/bridge/org/mmbase/bridge
Index: ProcessorTest.java
===
RCS file: /var/cvs/tests/bridge/org/mmbase/bridge/ProcessorTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- ProcessorTest.java 26 Jan 2009 16:00:05 - 1.5
+++ ProcessorTest.java 30 Apr 2009 14:16:08 - 1.6
@@ -13,6 +13,7 @@
import org.mmbase.tests.*;
import org.mmbase.datatypes.processors.*;
import junit.framework.*;
+import org.mmbase.bridge.util.*;
import org.mmbase.util.DynamicDate;
import org.mmbase.util.logging.Logger;
@@ -20,9 +21,10 @@
/**
+ * Testing wether the processors of datatypes behave as expected.
*
* @author Michiel Meeuwissen
- * @version $Id: ProcessorTest.java,v 1.5 2009/01/26 16:00:05 michiel Exp $
+ * @version $Id: ProcessorTest.java,v 1.6 2009/04/30 14:16:08 michiel Exp $
* @since MMBase-1.9.1
*/
public class ProcessorTest extends BridgeTest {
@@ -32,6 +34,7 @@
super(name);
}
+
protected Node testCommitProcessorIsChanged1(Cloud c) {
NodeManager nm = c.getNodeManager(mustbechanged);
Node n = nm.createNode();
@@ -49,19 +52,19 @@
Node n = c.getNode(nn);
try {
n.commit();
-throw new AssertionFailedError(Should have thrown exception);
+fail(Should have thrown exception);
} catch(RuntimeException ru) {
// ok
}
}
-
public void testCommitProcessorIsChanged() {
Cloud c = getCloud();
int nn = testCommitProcessorIsChanged1(c).getNumber();
testCommitProcessorIsChanged2(c, nn);
testCommitProcessorIsChanged3(c, nn);
}
+
public void testCommitProcessorIsChangedTransaction() {
Cloud c = getCloud();
Transaction t = c.getTransaction(aa);
@@ -74,9 +77,9 @@
t = c.getTransaction(cc);
testCommitProcessorIsChanged3(t, nn);
t.commit();
-
}
+
protected Node testAge(Cloud c) {
NodeManager nm = c.getNodeManager(datatypes);
Node n = nm.createNode();
@@ -85,39 +88,44 @@
n = c.getNode(n.getNumber());
assertEquals(DynamicDate.eval(2008-01-01),
n.getDateValue(birthdate));
n.setIntValue(age, 10);
-/*
-assertEquals(10, n.getIntValue(age)); /// TODO TODO FAILS FAILS
+assertEquals(10, n.getIntValue(age));
n.commit();
assertEquals(10, n.getIntValue(age));
-*/
return n;
}
public void testAge() {
+try {
org.mmbase.cache.CacheManager.getInstance().disable(.*);
testAge(getCloud());
org.mmbase.cache.CacheManager.getInstance().readConfiguration();
+} catch (NoClassDefFoundError ncdfe) {
+log.service(Probably using RMMCI, cannot disable caches then. +
ncdfe.getMessage());
+}
}
-
public void testAgeTransaction() {
+try {
org.mmbase.cache.CacheManager.getInstance().disable(.*);
Transaction t = getCloud().getTransaction(bla);
Node n = testAge(t);
t.commit();
assertEquals(10, getCloud().getNode(n.getNumber()).getIntValue(age));
org.mmbase.cache.CacheManager.getInstance().readConfiguration();
+} catch (NoClassDefFoundError ncdfe) {
+log.service(Probably using RMMCI, cannot disable caches then. +
ncdfe.getMessage());
}
+}
-protected int testCommitCount(Cloud c) {
+// Creates an commits a node, and checks if that increased the commit count
+protected void testCommitCount(Cloud c) {
+if
(c.getCloudContext().getUri().equals(ContextProvider.DEFAULT_CLOUD_CONTEXT_NAME))
{ // only test on local
NodeManager nm = c.getNodeManager(datatypes);
int ccbefore = CountCommitProcessor.count;
Node n = nm.createNode();
n.commit();
-if
(c.getCloudContext().getUri().equals(ContextProvider.DEFAULT_CLOUD_CONTEXT_NAME))
{
assertEquals(ccbefore + 1, CountCommitProcessor.count);
}
-return n.getNumber();
}
public void testCommitCount() {
@@ -129,11 +137,11 @@
Transaction t = getCloud().getTransaction(commitcount);
testCommitCount(t);
t.commit();
-if
(getCloudContext().getUri().equals(ContextProvider.DEFAULT_CLOUD_CONTEXT_NAME))
{
-// there is no point in calling a commit processor twice
-assertEquals(ccbefore + 1, CountCommitProcessor.count);
+if
(getCloudContext().getUri().equals(ContextProvider.DEFAULT_CLOUD_CONTEXT_NAME))
{ // only test on local
+assertEquals(ccbefore + 1
[MMBASE CVS] tests/bridge/org/mmbase/datatypes/processors AssertChangedCommitProcessor.java
Update of /var/cvs/tests/bridge/org/mmbase/datatypes/processors In directory james.mmbase.org:/tmp/cvs-serv10396/datatypes/processors Modified Files: AssertChangedCommitProcessor.java Log Message: javadoc See also: http://cvs.mmbase.org/viewcvs/tests/bridge/org/mmbase/datatypes/processors Index: AssertChangedCommitProcessor.java === RCS file: /var/cvs/tests/bridge/org/mmbase/datatypes/processors/AssertChangedCommitProcessor.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- AssertChangedCommitProcessor.java 18 Nov 2008 23:30:07 - 1.1 +++ AssertChangedCommitProcessor.java 30 Apr 2009 14:17:54 - 1.2 @@ -12,11 +12,11 @@ import org.mmbase.bridge.*; /** - * If you use this processor for a field, then setting it to an empty value will be ignored (the - * previous value will remain intact). + * If you use this processor for a field, then commit will fail if the node is not 'changed'. Used + * to assert it is changed in test-cases. * * @author Michiel Meeuwissen - * @version $Id: AssertChangedCommitProcessor.java,v 1.1 2008/11/18 23:30:07 michiel Exp $ + * @version $Id: AssertChangedCommitProcessor.java,v 1.2 2009/04/30 14:17:54 michiel Exp $ * @since MMBase-1.9.1 */ ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/taglib pom.xml
Update of /var/cvs/applications/taglib
In directory james.mmbase.org:/tmp/cvs-serv10521
Modified Files:
pom.xml
Log Message:
actually depends on jsp, not jstl
See also: http://cvs.mmbase.org/viewcvs/applications/taglib
Index: pom.xml
===
RCS file: /var/cvs/applications/taglib/pom.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- pom.xml 29 Apr 2009 07:11:33 - 1.13
+++ pom.xml 30 Apr 2009 14:24:48 - 1.14
@@ -114,9 +114,10 @@
/dependency
dependency
- groupIdjavax.servlet/groupId
- artifactIdjstl/artifactId
+ groupId${jsp.groupId}/groupId
+ artifactIdjsp-api/artifactId
scopeprovided/scope
/dependency
+
/dependencies
/project
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/dove pom.xml
Update of /var/cvs/applications/dove
In directory james.mmbase.org:/tmp/cvs-serv10579
Modified Files:
pom.xml
Log Message:
dove has a servlet, so depends on servlet api
See also: http://cvs.mmbase.org/viewcvs/applications/dove
Index: pom.xml
===
RCS file: /var/cvs/applications/dove/pom.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- pom.xml 28 Apr 2009 15:19:34 - 1.6
+++ pom.xml 30 Apr 2009 14:25:25 - 1.7
@@ -16,4 +16,11 @@
packagingjar/packaging
version${mmbase.version}/version
+ dependencies
+dependency
+ groupIdjavax.servlet/groupId
+ artifactIdservlet-api/artifactId
+ scopeprovided/scope
+/dependency
+ /dependencies
/project
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications pom.xml
Update of /var/cvs/applications
In directory james.mmbase.org:/tmp/cvs-serv10719
Modified Files:
pom.xml
Log Message:
sigh
See also: http://cvs.mmbase.org/viewcvs/applications
Index: pom.xml
===
RCS file: /var/cvs/applications/pom.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- pom.xml 29 Apr 2009 07:04:42 - 1.16
+++ pom.xml 30 Apr 2009 14:35:09 - 1.17
@@ -40,6 +40,11 @@
classifiersources/classifier
scopeprovided/scope
/dependency
+dependency
+ groupId${jsp.groupId}/groupId
+ artifactIdjsp-api/artifactId
+ scopeprovided/scope
+/dependency
/dependencies
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/editwizard pom.xml
Update of /var/cvs/applications/editwizard
In directory james.mmbase.org:/tmp/cvs-serv10719/editwizard
Modified Files:
pom.xml
Log Message:
sigh
See also: http://cvs.mmbase.org/viewcvs/applications/editwizard
Index: pom.xml
===
RCS file: /var/cvs/applications/editwizard/pom.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- pom.xml 28 Apr 2009 15:19:34 - 1.6
+++ pom.xml 30 Apr 2009 14:35:09 - 1.7
@@ -27,7 +27,7 @@
dependency
groupIdorg.mmbase/groupId
artifactIdmmbase-dove/artifactId
- version${project.version}/version
+ version${mmbase.version}/version
/dependency
/dependencies
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/dove pom.xml
Update of /var/cvs/applications/dove
In directory james.mmbase.org:/tmp/cvs-serv10719/dove
Modified Files:
pom.xml
Log Message:
sigh
See also: http://cvs.mmbase.org/viewcvs/applications/dove
Index: pom.xml
===
RCS file: /var/cvs/applications/dove/pom.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- pom.xml 30 Apr 2009 14:25:25 - 1.7
+++ pom.xml 30 Apr 2009 14:35:09 - 1.8
@@ -16,11 +16,5 @@
packagingjar/packaging
version${mmbase.version}/version
- dependencies
-dependency
- groupIdjavax.servlet/groupId
- artifactIdservlet-api/artifactId
- scopeprovided/scope
-/dependency
- /dependencies
+
/project
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/taglib pom.xml
Update of /var/cvs/applications/taglib
In directory james.mmbase.org:/tmp/cvs-serv10719/taglib
Modified Files:
pom.xml
Log Message:
sigh
See also: http://cvs.mmbase.org/viewcvs/applications/taglib
Index: pom.xml
===
RCS file: /var/cvs/applications/taglib/pom.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- pom.xml 30 Apr 2009 14:24:48 - 1.14
+++ pom.xml 30 Apr 2009 14:35:09 - 1.15
@@ -113,11 +113,6 @@
scopeprovided/scope
/dependency
-dependency
- groupId${jsp.groupId}/groupId
- artifactIdjsp-api/artifactId
- scopeprovided/scope
-/dependency
/dependencies
/project
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/media/src/org/mmbase/applications/media State.java
Update of /var/cvs/applications/media/src/org/mmbase/applications/media In directory james.mmbase.org:/tmp/cvs-serv10900/media/src/org/mmbase/applications/media Added Files: State.java Log Message: java constants for states See also: http://cvs.mmbase.org/viewcvs/applications/media/src/org/mmbase/applications/media State.java is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/bridge/util NodeMap.java
Update of /var/cvs/src/org/mmbase/bridge/util
In directory james.mmbase.org:/tmp/cvs-serv9
Modified Files:
NodeMap.java
Log Message:
Made toString like a Map, not like a Node
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/bridge/util
Index: NodeMap.java
===
RCS file: /var/cvs/src/org/mmbase/bridge/util/NodeMap.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- NodeMap.java29 Apr 2009 07:39:07 - 1.6
+++ NodeMap.java30 Apr 2009 14:39:01 - 1.7
@@ -21,7 +21,7 @@
* This object is also still a Node object.
*
* @author Michiel Meeuwissen
- * @version $Id: NodeMap.java,v 1.6 2009/04/29 07:39:07 michiel Exp $
+ * @version $Id: NodeMap.java,v 1.7 2009/04/30 14:39:01 michiel Exp $
* @since MMBase-1.8
*/
@@ -100,6 +100,9 @@
NodeMap.this.setValue(field.getName(), value);
return r;
}
+public String toString() {
+return getKey() + = +
NodeMap.this.getValueWithoutProcess(field.getName());
+}
};
}
public void remove() {
@@ -172,26 +175,32 @@
}
}
-// javadoc inherited
+@Override
public Object put(String key, Object value) {
Object r = getValue(key);
setValue(key, value);
return r;
}
-// javadoc inherited
+@Override
public Object get(Object key) {
return getValue((String) key);
}
-// javadoc inherited
+@Override
public boolean isEmpty() {
return false;
}
-// javadoc inherited
+@Override
public int size() {
return getNodeManager().getFields().size();
}
+
+@Override
+public String toString() {
+return entrySet().toString();
+}
+
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/datatypes/processors Age.java ChecksumProcessorFactory.java
Update of /var/cvs/src/org/mmbase/datatypes/processors
In directory james.mmbase.org:/tmp/cvs-serv11236/processors
Modified Files:
Age.java ChecksumProcessorFactory.java
Log Message:
logging only
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/datatypes/processors
Index: Age.java
===
RCS file: /var/cvs/src/org/mmbase/datatypes/processors/Age.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- Age.java4 Mar 2009 11:32:09 - 1.6
+++ Age.java30 Apr 2009 14:40:59 - 1.7
@@ -10,6 +10,7 @@
package org.mmbase.datatypes.processors;
import org.mmbase.bridge.*;
+import org.mmbase.bridge.util.*;
import org.mmbase.util.*;
import java.util.*;
import org.mmbase.util.logging.*;
@@ -39,8 +40,10 @@
try {
// educated guess for the birth date:
Date date = DynamicDate.eval(DynamicDate.getInstance(today -
6 month - + value + year));
-log.debug(setting age to + value + - + date);
node.setValueWithoutProcess(birthdateField, date);
+if (log.isDebugEnabled()) {
+log.debug(setting age to + value + in +
birthdateField + - + date + - + new NodeMap(node));
+}
} catch (org.mmbase.util.dateparser.ParseException pe) {
log.warn(pe);
}
@@ -61,7 +64,9 @@
Date birthDate = node.getDateValue(birthdateField);
Date now = new Date();
int age = (int) Math.floor((double) (now.getTime() -
birthDate.getTime()) / (1000 * 3600 * 24 * 365.25));
-log.debug(getting age for + birthDate + -- + age);
+if (log.isDebugEnabled()) {
+log.debug(getting age for + birthDate + -- + age +
from + new NodeMap(node));
+}
return Casting.toType(value.getClass(), age);
}
}
Index: ChecksumProcessorFactory.java
===
RCS file:
/var/cvs/src/org/mmbase/datatypes/processors/ChecksumProcessorFactory.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- ChecksumProcessorFactory.java 24 Sep 2008 20:26:08 - 1.8
+++ ChecksumProcessorFactory.java 30 Apr 2009 14:40:59 - 1.9
@@ -12,6 +12,8 @@
import org.mmbase.util.transformers.*;
import org.mmbase.util.functions.*;
import java.io.StringWriter;
+import org.mmbase.util.logging.*;
+
/**
* See {...@link org.mmbase.util.transformers.ChecksumFactory}. This produces
CommitProcessors meant
@@ -19,12 +21,14 @@
* Checksum 'processor', and the field for which this field is a checksum.
*
* @author Michiel Meeuwissen
- * @version $Id: ChecksumProcessorFactory.java,v 1.8 2008/09/24 20:26:08
michiel Exp $
+ * @version $Id: ChecksumProcessorFactory.java,v 1.9 2009/04/30 14:40:59
michiel Exp $
* @since MMBase-1.8
*/
public class ChecksumProcessorFactory implements
ParameterizedCommitProcessorFactory, java.io.Serializable {
+private static final Logger log =
Logging.getLoggerInstance(ChecksumProcessorFactory.class);
+
private static final long serialVersionUID = 1L;
protected static final Parameter[] PARAMS = new Parameter[] {
@@ -47,14 +51,23 @@
if (!field.isVirtual()) {
if (node.getChanged().contains(sourceField)) {
if (node.isNull(sourceField)) {
+log.debug(Source field is null);
// set checksum null too.
node.setValue(field.getName(), null);
return;
}
StringWriter writer = new StringWriter();
transformer.transform(node.getInputStreamValue(sourceField), writer);
-node.setStringValue(field.getName(),
writer.toString());
+String checksum = writer.toString();
+if (log.isDebugEnabled()) {
+log.debug(Setting checksum field ' +
field.getName() + ' to + checksum);
+}
+node.setStringValue(field.getName(), checksum);
+} else {
+log.debug(Ignoring because ' + sourceField + ' is
not changed);
}
+} else {
+log.debug(Ignoring because ' + field + ' is virtual);
}
}
public String toString() {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/datatypes BasicDataType.java DataType.java
Update of /var/cvs/src/org/mmbase/datatypes
In directory james.mmbase.org:/tmp/cvs-serv11293
Modified Files:
BasicDataType.java DataType.java
Log Message:
MMB-1815
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/datatypes
See also: http://www.mmbase.org/jira/browse/MMB-1815
Index: BasicDataType.java
===
RCS file: /var/cvs/src/org/mmbase/datatypes/BasicDataType.java,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -b -r1.110 -r1.111
--- BasicDataType.java 30 Apr 2009 10:15:46 - 1.110
+++ BasicDataType.java 30 Apr 2009 14:42:08 - 1.111
@@ -40,7 +40,7 @@
* @author Pierre van Rooden
* @author Michiel Meeuwissen
* @since MMBase-1.8
- * @version $Id: BasicDataType.java,v 1.110 2009/04/30 10:15:46 michiel Exp $
+ * @version $Id: BasicDataType.java,v 1.111 2009/04/30 14:42:08 michiel Exp $
*/
public class BasicDataTypeC extends AbstractDescriptor implements
DataTypeC, ComparableDataTypeC, Descriptor {
@@ -69,6 +69,7 @@
protected C defaultValue;
private CommitProcessor commitProcessor =
EmptyCommitProcessor.getInstance();
+private CommitProcessor deleteProcessor =
EmptyCommitProcessor.getInstance();
private Processor[] getProcessors;
private Processor[] setProcessors;
@@ -888,6 +889,13 @@
commitProcessor = cp;
}
+public CommitProcessor getDeleteProcessor() {
+return deleteProcessor == null ? EmptyCommitProcessor.getInstance() :
deleteProcessor;
+}
+public void setDeleteProcessor(CommitProcessor cp) {
+deleteProcessor = cp;
+}
+
/**
* {...@inheritdoc}
*/
Index: DataType.java
===
RCS file: /var/cvs/src/org/mmbase/datatypes/DataType.java,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- DataType.java 30 Apr 2009 10:15:46 - 1.76
+++ DataType.java 30 Apr 2009 14:42:08 - 1.77
@@ -33,7 +33,7 @@
* @author Pierre van Rooden
* @author Michiel Meeuwissen
* @since MMBase-1.8
- * @version $Id: DataType.java,v 1.76 2009/04/30 10:15:46 michiel Exp $
+ * @version $Id: DataType.java,v 1.77 2009/04/30 14:42:08 michiel Exp $
* @param C Class this DataType
*/
@@ -341,6 +341,14 @@
*/
public void setCommitProcessor(CommitProcessor cp);
+
+/**
+ * Return the Delete processor of this datatype
+ * @return A commitprocessor that will be called if the Node is deleted.
+ * @since MMBase-1.9.1
+ */
+public CommitProcessor getDeleteProcessor();
+
/**
* Returns the default processor for this action
* @param action either {...@link #PROCESS_GET}, or {...@link #PROCESS_SET}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/datatypes/util/xml DataTypeDefinition.java
Update of /var/cvs/src/org/mmbase/datatypes/util/xml
In directory james.mmbase.org:/tmp/cvs-serv11293/util/xml
Modified Files:
DataTypeDefinition.java
Log Message:
MMB-1815
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/datatypes/util/xml
See also: http://www.mmbase.org/jira/browse/MMB-1815
Index: DataTypeDefinition.java
===
RCS file: /var/cvs/src/org/mmbase/datatypes/util/xml/DataTypeDefinition.java,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- DataTypeDefinition.java 27 Apr 2009 16:14:18 - 1.73
+++ DataTypeDefinition.java 30 Apr 2009 14:42:08 - 1.74
@@ -32,7 +32,7 @@
*
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: DataTypeDefinition.java,v 1.73 2009/04/27 16:14:18 michiel
Exp $
+ * @version $Id: DataTypeDefinition.java,v 1.74 2009/04/30 14:42:08 michiel
Exp $
* @since MMBase-1.8
**/
public class DataTypeDefinition {
@@ -236,48 +236,51 @@
* @return whether successfully read the element.
*/
protected boolean addCondition(Element childElement) {
-boolean ret = false;
String childTag = childElement.getLocalName();
if (property.equals(childTag)) {
-ret = setProperty(childElement);
+setProperty(childElement);
+return true;
} else if (required.equals(childTag)) {
boolean value = DataTypeXml.getBooleanValue(childElement, false);
dataType.setRequired(value);
setRestrictionData(dataType.getRequiredRestriction(),
childElement);
-ret = true;
+return true;
} else if (unique.equals(childTag)) {
boolean value = DataTypeXml.getBooleanValue(childElement, false);
dataType.setUnique(value);
setRestrictionData(dataType.getUniqueRestriction(), childElement);
-ret = true;
+return true;
} else if (getprocessor.equals(childTag)) {
addProcessor(DataType.PROCESS_GET, childElement);
-ret = true;
+return true;
} else if (setprocessor.equals(childTag)) {
addProcessor(DataType.PROCESS_SET, childElement);
-ret = true;
+return true;
} else if (commitprocessor.equals(childTag)) {
addCommitProcessor(childElement);
-ret = true;
+return true;
+} else if (deleteprocessor.equals(childTag)) {
+addDeleteProcessor(childElement);
+return true;
} else if (enumeration.equals(childTag)) {
addEnumeration(childElement);
-ret = true;
+return true;
} else if (default.equals(childTag)) {
String value = DataTypeXml.getAttribute(childElement, value);
dataType.setDefaultValue(value);
-ret = true;
+return true;
} else if (addPatternCondition(childElement)) {
-ret = true;
+return true;
} else if (addPasswordProperty(childElement)) {
-ret = true;
+return true;
} else if (addDecimalCondition(childElement)) {
-ret = true;
+return true;
} else if (addLengthDataCondition(childElement)) {
-ret = true;
+return true;
} else if (addComparableCondition(childElement)) {
-ret = true;
+return true;
}
-return ret;
+return false;
}
@@ -314,6 +317,12 @@
newProcessor = DataTypeXml.chainProcessors(oldProcessor, newProcessor);
dataType.setCommitProcessor(newProcessor);
}
+protected void addDeleteProcessor(Element processorElement) {
+CommitProcessor newProcessor =
DataTypeXml.createCommitProcessor(processorElement);
+CommitProcessor oldProcessor = dataType.getDeleteProcessor();
+newProcessor = DataTypeXml.chainProcessors(oldProcessor, newProcessor);
+dataType.setDeleteProcessor(newProcessor);
+}
protected void setRestrictionData(DataType.Restriction restriction,
Element element) {
if (DataTypeXml.hasAttribute(element, fixed)) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/datatypes/util/xml/resources datatypes.xsd
Update of /var/cvs/src/org/mmbase/datatypes/util/xml/resources In directory james.mmbase.org:/tmp/cvs-serv11293/util/xml/resources Modified Files: datatypes.xsd Log Message: MMB-1815 See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/datatypes/util/xml/resources See also: http://www.mmbase.org/jira/browse/MMB-1815 Index: datatypes.xsd === RCS file: /var/cvs/src/org/mmbase/datatypes/util/xml/resources/datatypes.xsd,v retrieving revision 1.42 retrieving revision 1.43 diff -u -b -r1.42 -r1.43 --- datatypes.xsd 14 Apr 2009 12:55:32 - 1.42 +++ datatypes.xsd 30 Apr 2009 14:42:08 - 1.43 @@ -8,7 +8,7 @@ attributeFormDefault=unqualified version=1.0 !-- - Version: $Id: datatypes.xsd,v 1.42 2009/04/14 12:55:32 michiel Exp $ + Version: $Id: datatypes.xsd,v 1.43 2009/04/30 14:42:08 michiel Exp $ -- xsd:import @@ -118,6 +118,7 @@ xsd:element name=setprocessortype=Processor maxOccurs=unbounded minOccurs=0 / xsd:element name=getprocessortype=Processor maxOccurs=unbounded minOccurs=0 / xsd:element name=commitprocessor type=Processor maxOccurs=unbounded minOccurs=0 / + xsd:element name=deleteprocessor type=Processor maxOccurs=unbounded minOccurs=0 / xsd:element ref=specialization maxOccurs=unbounded minOccurs=0 / ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/bridge/util Queries.java
Update of /var/cvs/src/org/mmbase/bridge/util
In directory james.mmbase.org:/tmp/cvs-serv11403
Modified Files:
Queries.java
Log Message:
DataType#castForSearch makes this hackery superflouous
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/bridge/util
Index: Queries.java
===
RCS file: /var/cvs/src/org/mmbase/bridge/util/Queries.java,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -b -r1.114 -r1.115
--- Queries.java25 Nov 2008 13:22:40 - 1.114
+++ Queries.java30 Apr 2009 14:43:36 - 1.115
@@ -26,7 +26,7 @@
* methods are put here.
*
* @author Michiel Meeuwissen
- * @version $Id: Queries.java,v 1.114 2008/11/25 13:22:40 michiel Exp $
+ * @version $Id: Queries.java,v 1.115 2009/04/30 14:43:36 michiel Exp $
* @see org.mmbase.bridge.Query
* @since MMBase-1.7
*/
@@ -470,21 +470,7 @@
}
}
if (operator != OPERATOR_IN) { // should the elements of the
collection then not be cast?
-
-if (fieldType == Field.TYPE_XML) {
-// XML's are treated as String in the query-handler so,
let's anticipate that here...
-// a bit of a hack, perhaps we need something like a
'searchCast' or so.
-value = Casting.toString(value);
-} else {
-Object castedValue = field.getDataType().cast(value, null,
field);
-if (castedValue == null value != null fieldType ==
Field.TYPE_NODE) {
-// non existing node-number, like e.g. -1 are csated
to null,
-// but that is incorrect when e..g the operator is
GREATER
-castedValue = Casting.toInteger(value);
-}
-value = castedValue;
-
-}
+value = field.getDataType().castForSearch(value, null, field);
}
Object compareValue = getCompareValue(fieldType, operator, value,
datePart, cloud);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/bridge/util AbstractNode.java
Update of /var/cvs/src/org/mmbase/bridge/util
In directory james.mmbase.org:/tmp/cvs-serv11560/util
Modified Files:
AbstractNode.java
Log Message:
MMB-1815, Plus some issues that made test-cases fail. Like that fact that
commit processors where sometimes not called, or called too often. See
ProcessorTest.java for what is garanteed to work now.
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/bridge/util
See also: http://www.mmbase.org/jira/browse/MMB-1815
Index: AbstractNode.java
===
RCS file: /var/cvs/src/org/mmbase/bridge/util/AbstractNode.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- AbstractNode.java 29 Apr 2009 07:36:08 - 1.31
+++ AbstractNode.java 30 Apr 2009 14:46:39 - 1.32
@@ -32,7 +32,7 @@
* here, to minimalize the implementation effort of fully implemented Nodes.
*
* @author Michiel Meeuwissen
- * @version $Id: AbstractNode.java,v 1.31 2009/04/29 07:36:08 michiel Exp $
+ * @version $Id: AbstractNode.java,v 1.32 2009/04/30 14:46:39 michiel Exp $
* @see org.mmbase.bridge.Node
* @since MMBase-1.8
*/
@@ -502,13 +502,7 @@
return (Element)tree.importNode(doc.getDocumentElement(), true);
}
-public final void processCommit() {
-FieldIterator fi = getNodeManager().getFields().fieldIterator();
-while (fi.hasNext()) {
-Field field = fi.nextField();
-field.getDataType().getCommitProcessor().commit(this, field);
-}
-}
+
public CollectionString validate() {
ListString errors = new ArrayListString();
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/bridge/implementation BasicCloud.java BasicNode.java BasicTransaction.java
Update of /var/cvs/src/org/mmbase/bridge/implementation
In directory james.mmbase.org:/tmp/cvs-serv11560/implementation
Modified Files:
BasicCloud.java BasicNode.java BasicTransaction.java
Log Message:
MMB-1815, Plus some issues that made test-cases fail. Like that fact that
commit processors where sometimes not called, or called too often. See
ProcessorTest.java for what is garanteed to work now.
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/bridge/implementation
See also: http://www.mmbase.org/jira/browse/MMB-1815
Index: BasicCloud.java
===
RCS file: /var/cvs/src/org/mmbase/bridge/implementation/BasicCloud.java,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -b -r1.196 -r1.197
--- BasicCloud.java 25 Nov 2008 13:25:44 - 1.196
+++ BasicCloud.java 30 Apr 2009 14:46:39 - 1.197
@@ -29,7 +29,7 @@
* @author Rob Vermeulen
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: BasicCloud.java,v 1.196 2008/11/25 13:25:44 michiel Exp $
+ * @version $Id: BasicCloud.java,v 1.197 2009/04/30 14:46:39 michiel Exp $
*/
public class BasicCloud implements Cloud, Cloneable, ComparableCloud,
SizeMeasurable, Serializable {
@@ -849,6 +849,7 @@
return resultNodeList;
}
+
//javadoc inherited
public NodeList getList(
String startNodes,
@@ -1153,4 +1154,34 @@
throw new java.lang.SecurityException(You (' + userContext +
') are now allowed to shutdown mmbase ( + action + ));
}
}
+
+/**
+ * Calls the delete processor for every field.
+ * @since MMBase-1.9.1
+ */
+protected void processDeleteProcessors(Node n) {
+if (log.isDebugEnabled()) {
+log.debug(Calling delete processors on + n);
+}
+for (Field field : n.getNodeManager().getFields()) {
+field.getDataType().getDeleteProcessor().commit(n, field);
+}
+}
+/**
+ * Calls the commit processor for every field.
+ * @since MMBase-1.9.1
+ */
+protected void processCommitProcessors(Node n) {
+if (log.isDebugEnabled()) {
+log.debug(Calling commit processors on + n);
+}
+for (Field field : n.getNodeManager().getFields()) {
+field.getDataType().getCommitProcessor().commit(n, field);
+}
+}
+
+protected void setValue(BasicNode node, String fieldName, Object value) {
+node.getNode().setValue(fieldName, value);
+}
+
}
Index: BasicNode.java
===
RCS file: /var/cvs/src/org/mmbase/bridge/implementation/BasicNode.java,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -b -r1.235 -r1.236
--- BasicNode.java 24 Apr 2009 15:13:27 - 1.235
+++ BasicNode.java 30 Apr 2009 14:46:39 - 1.236
@@ -31,7 +31,7 @@
* @author Rob Vermeulen
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: BasicNode.java,v 1.235 2009/04/24 15:13:27 michiel Exp $
+ * @version $Id: BasicNode.java,v 1.236 2009/04/30 14:46:39 michiel Exp $
* @see org.mmbase.bridge.Node
* @see org.mmbase.module.core.MMObjectNode
*/
@@ -279,14 +279,7 @@
*/
@Override
protected void setValueWithoutChecks(String fieldName, Object value) {
-String result =
BasicCloudContext.tmpObjectManager.setObjectField(account, +
temporaryNodeId, fieldName, value);
-if (TemporaryNodeManager.UNKNOWN == result) {
-throw new BridgeException(Can't change unknown field ' +
fieldName + ', of node + getNumber() +
- of nodeManager ' +
getNodeManager().getName() +');
-} else if (TemporaryNodeManager.INVALID_VALUE == result) {
-log.debug(Storing value);
-getNode().setValue(fieldName, value); // commit() will throw that
invalid.
-}
+cloud.setValue(this, fieldName, value);
}
@Override
protected Integer toNodeNumber(Object v) {
@@ -507,7 +500,7 @@
getCloud().setProperty(CLOUD_COMMITNODE_KEY, prev);
}
-processCommit();
+cloud.processCommitProcessors(this);
if (log.isDebugEnabled()) {
log.debug(committing + noderef.getChanged() + +
noderef.getValues());
}
@@ -552,6 +545,7 @@
@Override
public void delete(boolean deleteRelations) {
checkDelete();
+cloud.processDeleteProcessors(this);
if (isNew()) {
// remove from the Transaction
// note that the node is immediately destroyed !
@@ -586,6 +580,7 @@
if (temporaryNodeId != -1) {
BasicCloudContext.tmpObjectManager.deleteTmpNode(account,
+ temporaryNodeId);
}
+
MMObjectNode node = getNode();
//node.getBuilder().removeNode(node
[MMBASE CVS] applications/resources/config datatypes.xml
Update of /var/cvs/applications/resources/config In directory james.mmbase.org:/tmp/cvs-serv11648/config Modified Files: datatypes.xml Log Message: Using 'deleteprocessor' to delete the file on delete of the node See also: http://cvs.mmbase.org/viewcvs/applications/resources/config Index: datatypes.xml === RCS file: /var/cvs/applications/resources/config/datatypes.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- datatypes.xml 25 Apr 2009 06:52:25 - 1.3 +++ datatypes.xml 30 Apr 2009 14:47:27 - 1.4 @@ -23,9 +23,9 @@ getprocessor type=binary class name=org.mmbase.datatypes.processors.BinaryFile$Getter / /getprocessor - commitprocessor -class name=org.mmbase.datatypes.processors.BinaryCommitProcessor / - /commitprocessor + deleteprocessor +class name=org.mmbase.datatypes.processors.BinaryFile$Delete / + /deleteprocessor /specialization /datatype ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/resources/src/org/mmbase/datatypes BinaryStringDataType.java
Update of /var/cvs/applications/resources/src/org/mmbase/datatypes
In directory james.mmbase.org:/tmp/cvs-serv11648/src/org/mmbase/datatypes
Modified Files:
BinaryStringDataType.java
Log Message:
Using 'deleteprocessor' to delete the file on delete of the node
See also:
http://cvs.mmbase.org/viewcvs/applications/resources/src/org/mmbase/datatypes
Index: BinaryStringDataType.java
===
RCS file:
/var/cvs/applications/resources/src/org/mmbase/datatypes/BinaryStringDataType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- BinaryStringDataType.java 25 Apr 2009 06:52:25 - 1.1
+++ BinaryStringDataType.java 30 Apr 2009 14:47:27 - 1.2
@@ -12,6 +12,7 @@
import org.mmbase.bridge.*;
import org.mmbase.util.*;
import org.mmbase.util.logging.*;
+import java.util.*;
/**
@@ -43,5 +44,20 @@
return Casting.toSerializableInputStream(value);
}
+@Override
+protected String castToPresent(Object value, Node node, Field field) {
+return Casting.toSerializableInputStream(value).getName();
+}
+@Override
+protected CollectionLocalizedString
validateRequired(CollectionLocalizedString errors, Object castValue, Object
value, Node node, Field field) {
+String v =
org.mmbase.datatypes.processors.BinaryFile.getFileName(node, field,
((SerializableInputStream) castValue).getName());
+return requiredRestriction.validate(errors, v, node, field);
+
+}
+
+@Override
+public String castForSearch(final Object value, final Node node, final
Field field) {
+return Casting.toSerializableInputStream(value).getName();
+}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/resources/src/org/mmbase/datatypes/processors BinaryFile.java
Update of /var/cvs/applications/resources/src/org/mmbase/datatypes/processors
In directory
james.mmbase.org:/tmp/cvs-serv11648/src/org/mmbase/datatypes/processors
Modified Files:
BinaryFile.java
Log Message:
Using 'deleteprocessor' to delete the file on delete of the node
See also:
http://cvs.mmbase.org/viewcvs/applications/resources/src/org/mmbase/datatypes/processors
Index: BinaryFile.java
===
RCS file:
/var/cvs/applications/resources/src/org/mmbase/datatypes/processors/BinaryFile.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- BinaryFile.java 24 Apr 2009 15:07:45 - 1.2
+++ BinaryFile.java 30 Apr 2009 14:47:27 - 1.3
@@ -41,11 +41,29 @@
private static File getFile(final Node node, final Field field, String
fileName) {
+return new File(getDirectory(), getFileName(node, field,
fileName).replace(/, File.separator));
+}
+
+public static String getFileName(final Node node, final Field field,
String fileName) {
StringBuilder buf = new StringBuilder();
org.mmbase.storage.implementation.database.DatabaseStorageManager.appendDirectory(buf,
node.getNumber(), /);
buf.append(/).append(node.getNumber()).append(.);
buf.append(fileName);
-return new File(getDirectory(), buf.toString().replace(/,
File.separator));
+return buf.toString();
+}
+
+public static class Delete implements CommitProcessor {
+public void commit(final Node node, final Field field) {
+String existing = (String) node.getValue(field.getName());
+if (existing != null) {
+File ef = new File(getDirectory(), existing);
+if (ef.exists()) {
+ef.delete();
+} else {
+log.warn(Could not find + ef + so could not delete
it);
+}
+}
+}
}
@@ -64,7 +82,7 @@
log.debug(Removing existing field + ef);
ef.delete();
} else {
-log.warn(Could not fined + ef + so could not
delete it);
+log.warn(Could not find + ef + so could not
delete it);
}
}
File f = getFile(node, field, name);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/util ReplacingLocalizedString.java
Update of /var/cvs/src/org/mmbase/util
In directory james.mmbase.org:/tmp/cvs-serv12004
Modified Files:
ReplacingLocalizedString.java
Log Message:
avoid NPE
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util
Index: ReplacingLocalizedString.java
===
RCS file: /var/cvs/src/org/mmbase/util/ReplacingLocalizedString.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- ReplacingLocalizedString.java 28 Apr 2009 06:31:22 - 1.10
+++ ReplacingLocalizedString.java 30 Apr 2009 15:08:49 - 1.11
@@ -22,7 +22,7 @@
*
*
* @author Michiel Meeuwissen
- * @version $Id: ReplacingLocalizedString.java,v 1.10 2009/04/28 06:31:22
michiel Exp $
+ * @version $Id: ReplacingLocalizedString.java,v 1.11 2009/04/30 15:08:49
michiel Exp $
* @since MMBase-1.8
*/
public class ReplacingLocalizedString extends WrappedLocalizedString {
@@ -118,6 +118,7 @@
* Utility method for second argument of replaceAll
*/
public static String makeLiteral(String s) {
+if (s == null) return null;
// sometimes, implementing java looks rather idiotic, but honestely,
this is correct!
s = s.replaceAll(, );
s = s.replaceAll(\\., .);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] speeltuin/mihxil/streams/blocks recent.jspx
Update of /var/cvs/speeltuin/mihxil/streams/blocks In directory james.mmbase.org:/tmp/cvs-serv12683 Added Files: recent.jspx Log Message: See also: http://cvs.mmbase.org/viewcvs/speeltuin/mihxil/streams/blocks recent.jspx is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] speeltuin/mihxil/streams pom.xml
Update of /var/cvs/speeltuin/mihxil/streams In directory james.mmbase.org:/tmp/cvs-serv13683 Modified Files: pom.xml Log Message: See also: http://cvs.mmbase.org/viewcvs/speeltuin/mihxil/streams Index: pom.xml === RCS file: /var/cvs/speeltuin/mihxil/streams/pom.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -b -r1.5 -r1.6 --- pom.xml 24 Apr 2009 18:43:30 - 1.5 +++ pom.xml 30 Apr 2009 16:35:13 - 1.6 @@ -9,11 +9,13 @@ version1.9-SNAPSHOT/version /parent + artifactIdmmbase-streams/artifactId nameMMBase Streams/name packagingwar/packaging description +Support for maintenance of media files in MMBase itself. Uploaded, transcoding, and serving. /description ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] speeltuin/mihxil/streams/src/org/mmbase/streams CreateCachesProcessor.java
Update of /var/cvs/speeltuin/mihxil/streams/src/org/mmbase/streams
In directory james.mmbase.org:/tmp/cvs-serv13683/src/org/mmbase/streams
Modified Files:
CreateCachesProcessor.java
Log Message:
See also:
http://cvs.mmbase.org/viewcvs/speeltuin/mihxil/streams/src/org/mmbase/streams
Index: CreateCachesProcessor.java
===
RCS file:
/var/cvs/speeltuin/mihxil/streams/src/org/mmbase/streams/CreateCachesProcessor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- CreateCachesProcessor.java 24 Apr 2009 18:43:30 - 1.2
+++ CreateCachesProcessor.java 30 Apr 2009 16:35:13 - 1.3
@@ -54,11 +54,17 @@
Node resultNode;
if (nodes.size() 0) {
resultNode = nodes.get(0);
+resultNode.setIntValue(state, State.REQUEST.getValue());
} else {
resultNode = caches.createNode();
-resultNode.setNodeValue(id, node);
+resultNode.setIntValue(state, State.REQUEST.getValue());
resultNode.setStringValue(key, t.getKey());
-resultNode.setIntValue(state, State.REQUEST.ordinal());
+resultNode.setNodeValue(id, node);
+resultNode.commit();
+
+// virtual field actually creates relation
+resultNode.setNodeValue(mediaprovider,
node.getNodeValue(mediaprovider));
+
logger.service(Created + resultNode);
}
return resultNode;
@@ -66,21 +72,28 @@
+
public void commit(final Node node, final Field field) {
-if (node.isChanged(field.getName())) {
+if (node.getNumber() 0) {
LOG.info(Field ' + field + was changed. Triggering caches.);
final ChainedLogger logger = new ChainedLogger();
logger.addLogger(Logging.getLoggerInstance(CACHES. +
node.getCloud().getUser().getIdentifier()));
logger.addLogger(LOG);
+ThreadPools.jobsExecutor.execute(new Runnable() {
+
+public void run() {
+try {
for (Transcoder t : list) {
Node cacheNode = getCacheNode(node, t, logger);
-if (cacheNode.isNew()) {
+if (cacheNode.isNew() ||
cacheNode.isChanged()) {
cacheNode.commit();
}
}
-ThreadPools.jobsExecutor.execute(new Runnable() {
-public void run() {
+} catch (Exception e) {
+logger.error(e.getMessage());
+}
+
for (Transcoder t : list) {
logger.service(Creating with + t);
Node cacheNode =
CreateCachesProcessor.this.getCacheNode(node, t, logger);
@@ -93,11 +106,11 @@
buf.append(ResourceLoader.getName(inFile.getName())).append(.).append(t.getExtension());
File outFile = new
File(FileServlet.getDirectory(), buf.toString().replace(/, File.separator));
try {
-cacheNode.setIntValue(state,
State.BUSY.ordinal());
+cacheNode.setIntValue(state,
State.BUSY.getValue());
cacheNode.commit();
t.transcode(in, outFile.toURI(), logger);
cacheNode.setStringValue(url,
buf.toString());
-cacheNode.setIntValue(state,
State.DONE.ordinal());
+cacheNode.setIntValue(state,
State.DONE.getValue());
cacheNode.commit();
} catch (Exception e) {
@@ -108,7 +121,9 @@
}
}
});
-
+} else {
+LOG.info(Cannot execute processor, because node has not yet a
real number + node);
}
}
+
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/util/logging LoggerWriter.java
Update of /var/cvs/src/org/mmbase/util/logging
In directory james.mmbase.org:/tmp/cvs-serv13787
Modified Files:
LoggerWriter.java
Log Message:
MMB-1811
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/logging
See also: http://www.mmbase.org/jira/browse/MMB-1811
Index: LoggerWriter.java
===
RCS file: /var/cvs/src/org/mmbase/util/logging/LoggerWriter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- LoggerWriter.java 24 Apr 2009 16:28:39 - 1.1
+++ LoggerWriter.java 30 Apr 2009 16:36:01 - 1.2
@@ -7,13 +7,15 @@
*/
package org.mmbase.util.logging;
+
import java.io.*;
+import java.util.*;
/**
* A Writer that logs every line to a certain logger.
*
* @author Michiel Meeuwissen
- * @version $Id: LoggerWriter.java,v 1.1 2009/04/24 16:28:39 michiel Exp $
+ * @version $Id: LoggerWriter.java,v 1.2 2009/04/30 16:36:01 michiel Exp $
* @since MMBase-1.9.1
*/
@@ -24,30 +26,47 @@
private final StringBuilder buffer = new StringBuilder();
private final Level level;
+/**
+ * @param log The logger to which this Writer must write everythin
+ * @param lev On which level this must happen. If you want to log on
different levels, then
+ * override {...@link #getLevel(String)}
+ */
public LoggerWriter(Logger log, Level lev) {
logger = log;
level = lev;
}
+protected Level getLevel(String line) {
+return level;
+}
+protected void logLine(String line) {
+Level l = getLevel(line);
+if (l == null) l = level;
+Logging.log(l, logger, line);
+}
+
+
+@Override
public void write(char[] buf, int start, int end) throws IOException {
buffer.append(buf, start, end);
flush();
}
-
+@Override
public void flush() throws IOException {
String[] lines = buffer.toString().split([\\n\\r]);
int used = 0;
for (int i = 0 ; i lines.length - 1; i++) {
-Logging.log(level, logger, lines[i]);
+logLine(lines[i]);
used += lines[i].length();
used ++;
}
buffer.delete(0, used);
}
+@Override
public void close() throws IOException {
flush();
-Logging.log(level, logger, buffer.toString());
+logLine(buffer.toString());
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/util ThreadPools.java
Update of /var/cvs/src/org/mmbase/util
In directory james.mmbase.org:/tmp/cvs-serv16034
Modified Files:
ThreadPools.java
Log Message:
There are some dependencies on MMBaseContext, which made this unusable on
rmmci. Fixed.
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util
Index: ThreadPools.java
===
RCS file: /var/cvs/src/org/mmbase/util/ThreadPools.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- ThreadPools.java21 Apr 2009 12:36:27 - 1.28
+++ ThreadPools.java30 Apr 2009 18:48:43 - 1.29
@@ -18,11 +18,13 @@
*
* @since MMBase 1.8
* @author Michiel Meeuwissen
- * @version $Id: ThreadPools.java,v 1.28 2009/04/21 12:36:27 michiel Exp $
+ * @version $Id: ThreadPools.java,v 1.29 2009/04/30 18:48:43 michiel Exp $
*/
public abstract class ThreadPools {
private static final Logger log =
Logging.getLoggerInstance(ThreadPools.class);
+public static final ThreadGroup threadGroup = new ThreadGroup(MMBase
Thread Pool);
+
private static MapFuture, String identifiers =
Collections.synchronizedMap(new WeakHashMapFuture, String());
@@ -70,7 +72,7 @@
private static Thread newThread(Runnable r, final String id) {
boolean isUp =
org.mmbase.bridge.ContextProvider.getDefaultCloudContext().isUp();
-Thread t = new
Thread(org.mmbase.module.core.MMBaseContext.getThreadGroup(), r,
+Thread t = new Thread(threadGroup, r,
isUp ?
org.mmbase.module.core.MMBaseContext.getMachineName() + : + id : id) {
/**
* Overrides run of Thread to catch and log all exceptions.
Otherwise they go through to app-server.
@@ -107,11 +109,18 @@
static {
jobsExecutor.execute(new Runnable() {
public void run() {
+String machineName;
+try {
org.mmbase.bridge.ContextProvider.getDefaultCloudContext().assertUp();
+machineName =
org.mmbase.module.core.MMBaseContext.getMachineName();
+} catch (NoClassDefFoundError cnfe) {
+// happens if no MMBaseContext, because this is used
with the
+// rmmci-client jar.
+machineName = localhost;
+}
for (Thread t : nameLess) {
-
t.setName(org.mmbase.module.core.MMBaseContext.getMachineName() + : +
t.getName());
+t.setName(machineName + : + t.getName());
}
-nameLess = null;
}
});
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/cache CacheManager.java
Update of /var/cvs/src/org/mmbase/cache
In directory james.mmbase.org:/tmp/cvs-serv16075
Modified Files:
CacheManager.java
Log Message:
There are some dependencies on MMBaseContext, which made this unusable on
rmmci. Fixed.
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/cache
Index: CacheManager.java
===
RCS file: /var/cvs/src/org/mmbase/cache/CacheManager.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- CacheManager.java 15 Nov 2008 19:15:10 - 1.44
+++ CacheManager.java 30 Apr 2009 18:49:07 - 1.45
@@ -32,7 +32,7 @@
* static any more.
*
* @since MMBase-1.8
- * @version $Id: CacheManager.java,v 1.44 2008/11/15 19:15:10 michiel Exp $
+ * @version $Id: CacheManager.java,v 1.45 2009/04/30 18:49:07 michiel Exp $
*/
public class CacheManager implements CacheManagerMBean {
@@ -51,6 +51,18 @@
// singleton
}
+private static String getMachineName() {
+String machineName;
+try {
+
org.mmbase.bridge.ContextProvider.getDefaultCloudContext().assertUp();
+machineName =
org.mmbase.module.core.MMBaseContext.getMachineName();
+} catch (NoClassDefFoundError ncfde) {
+//happens when RMMCI
+machineName = localhost;
+}
+return machineName;
+}
+
/**
* @since MMBase-1.9.1
*/
@@ -64,10 +76,9 @@
final HashtableString, String props = new
HashtableString, String();
try {
-
org.mmbase.bridge.ContextProvider.getDefaultCloudContext().assertUp();
-
props.put(type, Caches);
-String machineName =
org.mmbase.module.core.MMBaseContext.getMachineName();
+String machineName = getMachineName();
+
if (machineName != null) {
props.put(type, machineName);
}
@@ -162,7 +173,6 @@
}
Runnable run = new Runnable() {
public void run() {
-
org.mmbase.bridge.ContextProvider.getDefaultCloudContext().assertUp();
ObjectName name = getObjectName(cache);
try {
MBeanServer mbs =
ManagementFactory.getPlatformMBeanServer();
@@ -192,7 +202,7 @@
try {
props.put(type, Caches);
org.mmbase.util.transformers.CharTransformer identifier = new
org.mmbase.util.transformers.Identifier();
-String machineName =
org.mmbase.module.core.MMBaseContext.getMachineName();
+String machineName = getMachineName();
if (machineName != null) {
props.put(mmb, machineName);
} else {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/module/core MMBaseContext.java
Update of /var/cvs/src/org/mmbase/module/core
In directory james.mmbase.org:/tmp/cvs-serv16116
Modified Files:
MMBaseContext.java
Log Message:
Moved thread group constant to ThreadPools
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/core
Index: MMBaseContext.java
===
RCS file: /var/cvs/src/org/mmbase/module/core/MMBaseContext.java,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- MMBaseContext.java 29 Apr 2009 07:39:07 - 1.70
+++ MMBaseContext.java 30 Apr 2009 18:49:42 - 1.71
@@ -27,7 +27,7 @@
* @author Daniel Ockeloen
* @author David van Zeventer
* @author Jaco de Groot
- * @version $Id: MMBaseContext.java,v 1.70 2009/04/29 07:39:07 michiel Exp $
+ * @version $Id: MMBaseContext.java,v 1.71 2009/04/30 18:49:42 michiel Exp $
*/
public class MMBaseContext {
private static final Logger log =
Logging.getLoggerInstance(MMBaseContext.class);
@@ -40,7 +40,7 @@
private static String htmlRootUrlPath = /;
private static boolean htmlRootUrlPathInitialized = false;
private static String outputFile;
-private static final ThreadGroup threadGroup = new
ThreadGroup(org.mmbase.Version.get());// + + new Date();
+
/**
* Initialize MMBase using a codeServletContext/code. This method will
* check the servlet configuration for context parameters mmbase.outputfile
@@ -139,7 +139,7 @@
* @since MMBase-1.8
*/
public static ThreadGroup getThreadGroup() {
-return threadGroup;
+return org.mmbase.util.ThreadPools.threadGroup;
}
/**
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] tests/util/org/mmbase/util RmmciUtilTests.java
Update of /var/cvs/tests/util/org/mmbase/util In directory james.mmbase.org:/tmp/cvs-serv16327/util/org/mmbase/util Added Files: RmmciUtilTests.java Log Message: added 'rmmciutil' tests, which are like the normal util tests, but performed with only the rmmci-client jar See also: http://cvs.mmbase.org/viewcvs/tests/util/org/mmbase/util RmmciUtilTests.java is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] tests build.xml Makefile
Update of /var/cvs/tests
In directory james.mmbase.org:/tmp/cvs-serv16327
Modified Files:
build.xml Makefile
Log Message:
added 'rmmciutil' tests, which are like the normal util tests, but performed
with only the rmmci-client jar
See also: http://cvs.mmbase.org/viewcvs/tests
Index: build.xml
===
RCS file: /var/cvs/tests/build.xml,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- build.xml 27 Apr 2009 16:06:02 - 1.82
+++ build.xml 30 Apr 2009 18:58:36 - 1.83
@@ -262,6 +262,19 @@
/java
/target
+ target name=run.rmmciutil depends=init description=Various tests on
utitilies (org.mmbase.util)
+java
+classname=${ui.class}
+fork=true
+timeout=30
+classpathref=run.rmmci.client
+ arg value=org.mmbase.util.RmmciUtilTests /
+ jvmarg value=-Dmmbase.config=${tests.source.dir}/config /
+ jvmarg value=-Duser.dir=${tests.work.dir} /
+ assertionsenable //assertions
+/java
+ /target
+
target name=run.datatypes depends=init description=Various tests on
org.mmbase.datatypes
java
@@ -411,14 +424,19 @@
target name=run.all description=Run all tests
echo
message=DBSQ
/
antcall target=run.dbsq inheritRefs=true/
+echo message=sleeping.. /
sleep seconds=10 /
echo
message=TYPEREL
/
antcall target=run.typerel inheritRefs=true/
+echo message=sleeping.. /
sleep seconds=10 /
antcall target=run.all.bridge inheritRefs=true/
+echo message=sleeping.. /
sleep seconds=10 /
echo
message=UTIL
/
antcall target=run.util inheritRefs=true/
+echo message=RMMCI
UTIL /
+antcall target=run.rmmciutil inheritRefs=true/
echo
message=DATATYPES
/
antcall target=run.datatypes inheritRefs=true/
sleep seconds=10 /
@@ -437,6 +455,7 @@
target name=run.all.bridge
echo
message=BRIDGE
/
antcall target=run.bridge inheritRefs=true /
+echo message=sleeping.. /
sleep seconds=10 /
echo
message=RMMCI
/
antcall target=run.bridge.rmmci inheritRefs=true /
@@ -446,6 +465,7 @@
echo
message=RMMCI
/
antcall target=run.bridge.rmmci inheritRefs=true/
echo
message=CLUSTERING
/
+echo message=sleeping.. /
sleep seconds=10 /
antcall target=run.clustering inheritRefs=true/
/target
Index: Makefile
===
RCS file: /var/cvs/tests/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- Makefile27 Apr 2009 15:17:58 - 1.11
+++ Makefile30 Apr 2009 18:58:36 - 1.12
@@ -1,12 +1,12 @@
-export JAVA_HOME=/opt/jdk15
+export JAVA_HOME=/opt/jdk16
ant=ant -quiet -listener org.apache.tools.ant.listener.Log4jListener -lib
lib:. -Dnoconnection=true
#ant=ant -lib lib:. -Dnoconnection=true
.PHONY: all bridge rmmci dbsq util datatypes clustering convert typerel
richtext cloudcontext transactions
all:
- $(ant) run.all
+ $(ant) run.all | tee work/all.log
#ok
bridge: dependencies
@@ -26,9 +26,13 @@
$(ant) run.dbsq | tee work/dbsq.log
#ok
-util:
+util: dependencies
$(ant) run.util | tee work/util.log
+
+rmmciutil: dependencies
+ $(ant) run.rmmciutil | tee work/rmmciutil.log
+
#ok
datatypes: dependencies
$(ant) run.datatypes | tee work/datatypes.log
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] tests pom.xml
Update of /var/cvs/tests In directory james.mmbase.org:/tmp/cvs-serv16398 Modified Files: pom.xml Log Message: See also: http://cvs.mmbase.org/viewcvs/tests Index: pom.xml === RCS file: /var/cvs/tests/pom.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- pom.xml 20 Apr 2009 12:39:18 - 1.4 +++ pom.xml 30 Apr 2009 18:59:03 - 1.5 @@ -49,6 +49,16 @@ /includes /resource resource +directorybridge/directory +includes + include**/*.xml/include + include**/*.dtd/include + include**/*.xsd/include + include**/*.properties/include + includeINDEX/include +/includes + /resource + resource directoryconvertimage/directory includes include**/*.jpg/include ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] tests/util/org/mmbase/util LocalizedEntryListFactoryTest.java
Update of /var/cvs/tests/util/org/mmbase/util
In directory james.mmbase.org:/tmp/cvs-serv16452/util/org/mmbase/util
Modified Files:
LocalizedEntryListFactoryTest.java
Log Message:
this makes it work with rmmci jar only
See also: http://cvs.mmbase.org/viewcvs/tests/util/org/mmbase/util
Index: LocalizedEntryListFactoryTest.java
===
RCS file:
/var/cvs/tests/util/org/mmbase/util/LocalizedEntryListFactoryTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- LocalizedEntryListFactoryTest.java 21 Jun 2007 15:50:20 - 1.3
+++ LocalizedEntryListFactoryTest.java 30 Apr 2009 18:59:25 - 1.4
@@ -18,7 +18,7 @@
/**
*
* @author Michiel Meeuwissen
- * @verion $Id: LocalizedEntryListFactoryTest.java,v 1.3 2007/06/21 15:50:20
nklasens Exp $
+ * @verion $Id: LocalizedEntryListFactoryTest.java,v 1.4 2009/04/30 18:59:25
michiel Exp $
*/
public class LocalizedEntryListFactoryTest extends TestCase {
@@ -144,7 +144,7 @@
String config =
enumeration +
entry basename='org.mmbase.datatypes.resources.states' +
- javaconstants='org.mmbase.module.builders.MMServers' +
+
javaconstants='org.mmbase.datatypes.resources.StateConstants' +
/ +
/enumeration;
Document doc = DocumentReader.getDocumentBuilder(false).parse(new
InputSource(new StringReader(config)));
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] tests/config/builders/tests datatypes.xml mustbechanged.xml
Update of /var/cvs/tests/config/builders/tests In directory james.mmbase.org:/tmp/cvs-serv16621 Modified Files: datatypes.xml mustbechanged.xml Log Message: modernized a bith further See also: http://cvs.mmbase.org/viewcvs/tests/config/builders/tests Index: datatypes.xml === RCS file: /var/cvs/tests/config/builders/tests/datatypes.xml,v retrieving revision 1.36 retrieving revision 1.37 diff -u -b -r1.36 -r1.37 --- datatypes.xml 8 Apr 2009 14:16:47 - 1.36 +++ datatypes.xml 30 Apr 2009 19:03:51 - 1.37 @@ -58,7 +58,7 @@ descriptions descriptionExample of String pattern./description /descriptions - datatype base=emailaddress + datatype base=emailaddress xmlns=http://www.mmbase.org/xmlns/datatypes; maxLength value=255 / /datatype /field @@ -141,18 +141,15 @@ /field field name=range - datatype xmlns=http://www.mmbase.org/xmlns/datatypes; + datatype base=integer xmlns=http://www.mmbase.org/xmlns/datatypes; default value=6 / minInclusive value=1 / maxExclusive value=10 / /datatype - db -type state=persistentINTEGER/type - /db /field field name=enumeration - datatype xmlns=http://www.mmbase.org/xmlns/datatypes; + datatype base=integer xmlns=http://www.mmbase.org/xmlns/datatypes; default value=6 / enumeration entry value=2 / @@ -161,12 +158,9 @@ entry value=8 / /enumeration /datatype - db -type state=persistentINTEGER/type - /db /field -field - datatype xmlns=http://www.mmbase.org/xmlns/datatypes; +field name=localized_weak_enumeration + datatype base=integer xmlns=http://www.mmbase.org/xmlns/datatypes; default value=6 / enumeration enforce=onchange entry value=2 xml:lang=en display=two / @@ -178,13 +172,9 @@ entry value=8 xml:lang=en display=eight / /enumeration /datatype - db -namelocalized_weak_enumeration/name -type state=persistentINTEGER/type - /db /field -field - datatype xmlns=http://www.mmbase.org/xmlns/datatypes; +field name=weakest_enumeraton + datatype base=integer xmlns=http://www.mmbase.org/xmlns/datatypes; default value=6 / enumeration enforce=never entry value=2 / @@ -193,25 +183,19 @@ entry value=8 / /enumeration /datatype - db -nameweakest_enumeration/name -type state=persistentINTEGER/type - /db + /field -field +field name=restricted_ordinals datatype base=ordinals xmlns=http://www.mmbase.org/xmlns/datatypes; minInclusive value=2 / maxExclusive value=10 / /datatype - db -namerestricted_ordinals/name -type state=persistentINTEGER/type - /db /field -field - datatype xmlns=http://www.mmbase.org/xmlns/datatypes; +field name=mmbase_state_enumeration + datatype base=integer +xmlns=http://www.mmbase.org/xmlns/datatypes; default value=ERROR / enumeration entry basename=org.mmbase.datatypes.resources.states @@ -219,53 +203,28 @@ / /enumeration /datatype - db -namemmbase_state_enumeration/name -type state=persistentINTEGER/type - /db /field -field - datatype xmlns=http://www.mmbase.org/xmlns/datatypes; -default value=ERROR / -enumeration - entry basename=org.mmbase.datatypes.resources.states - javaconstants=org.mmbase.datatypes.resources.StateConstants - / -/enumeration - /datatype - db -namemmbase_state_enumeration/name -type state=persistentINTEGER/type - /db -/field - +field name=float + datatype base=float +xmlns=http://www.mmbase.org/xmlns/datatypes; / -field - db -namefloat/name -type state=persistentFLOAT/type - /db /field -field - db -namedatetime/name -type state=persistentDATETIME/type - /db +field name=datetime + datatype base=datetime +xmlns=http://www.mmbase.org/xmlns/datatypes; / /field -field - datatype xmlns=http://www.mmbase.org/xmlns/datatypes; +field name=period + datatype + base=datetime + xmlns=http://www.mmbase.org/xmlns/datatypes; default value=2005-10-05 / minInclusive value=2005-01-01 / maxExclusive value=2050-01-01 / /datatype - db -nameperiod/name -type state=persistentDATETIME/type - /db /field field @@ -300,30 +259,21 @@ /db /field -field - datatype
[MMBASE CVS] tests/taglib/jsps index.jsp
Update of /var/cvs/tests/taglib/jsps In directory james.mmbase.org:/tmp/cvs-serv16797/taglib/jsps Modified Files: index.jsp Log Message: See also: http://cvs.mmbase.org/viewcvs/tests/taglib/jsps Index: index.jsp === RCS file: /var/cvs/tests/taglib/jsps/index.jsp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -b -r1.11 -r1.12 --- index.jsp 31 Oct 2008 10:55:21 - 1.11 +++ index.jsp 30 Apr 2009 19:05:03 - 1.12 @@ -33,7 +33,7 @@ 1.5). Run the sequence also with cookies disabled please, or perhaps even better in that case start a href=cloud.htmlhere/a (with cookies disabled, and url not encoded, cloud-tag will detect that - from 1.6 on). http://www.mmbase.org + from 1.6 on). /mm:import mm:link page=cloud.jsp / mm:write referid=text escape=links,censor / @@ -79,6 +79,6 @@ p An alternative a href=mm:url page=caches.jsp /Caches overview/a /p -a href=mailto:mih...@komputilo.org;Michiel Meeuwissen/a +a href=mailto:tag...@meeuw.org;Michiel Meeuwissen/a /body /html ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] tests/bridge/org/mmbase/bridge ProcessorTest.java
Update of /var/cvs/tests/bridge/org/mmbase/bridge
In directory james.mmbase.org:/tmp/cvs-serv16886/org/mmbase/bridge
Modified Files:
ProcessorTest.java
Log Message:
it doest not fail any more
See also: http://cvs.mmbase.org/viewcvs/tests/bridge/org/mmbase/bridge
Index: ProcessorTest.java
===
RCS file: /var/cvs/tests/bridge/org/mmbase/bridge/ProcessorTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- ProcessorTest.java 30 Apr 2009 14:16:08 - 1.6
+++ ProcessorTest.java 30 Apr 2009 19:07:43 - 1.7
@@ -24,7 +24,7 @@
* Testing wether the processors of datatypes behave as expected.
*
* @author Michiel Meeuwissen
- * @version $Id: ProcessorTest.java,v 1.6 2009/04/30 14:16:08 michiel Exp $
+ * @version $Id: ProcessorTest.java,v 1.7 2009/04/30 19:07:43 michiel Exp $
* @since MMBase-1.9.1
*/
public class ProcessorTest extends BridgeTest {
@@ -154,7 +154,7 @@
nn = n.getNumber();
if
(getCloudContext().getUri().equals(ContextProvider.DEFAULT_CLOUD_CONTEXT_NAME))
{ // only test on local
// commit processor must have been called.
-assertEquals(ccbefore + 1, CountCommitProcessor.count); // FAILS
+assertEquals(ccbefore + 1, CountCommitProcessor.count);
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/util LocalizedString.java
Update of /var/cvs/src/org/mmbase/util
In directory james.mmbase.org:/tmp/cvs-serv17809
Modified Files:
LocalizedString.java
Log Message:
Removed some hacking with default locale which made stuff hard to undertnad and
fails testcase
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util
Index: LocalizedString.java
===
RCS file: /var/cvs/src/org/mmbase/util/LocalizedString.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- LocalizedString.java29 Apr 2009 07:39:08 - 1.39
+++ LocalizedString.java30 Apr 2009 19:53:46 - 1.40
@@ -32,7 +32,7 @@
*/p
*
* @author Michiel Meeuwissen
- * @version $Id: LocalizedString.java,v 1.39 2009/04/29 07:39:08 michiel Exp $
+ * @version $Id: LocalizedString.java,v 1.40 2009/04/30 19:53:46 michiel Exp $
* @since MMBase-1.8
*/
public class LocalizedString implements java.io.Serializable,
PublicCloneableLocalizedString {
@@ -47,16 +47,13 @@
* Sets a default locale for this JVM or web-app. When not using it, the
locale is the system
* default. Several web-apps do run in one JVM however and it is very
imaginable that you want a
* different default for the Locale.
- *
- * So, this function can be called only once. Calling it the second time
will not do
- * anything. It returns the already set default locale then, which should
probably prompt you to log an error
- * or throw an exception or so. Otherwise it returns codenull/code
indicating that the
- * default locale is now what you just set.
+ * @return The previously set default locale. Should normally be
codenull/code since it is
+ * odd to call this more than once.
*/
public static Locale setDefault(Locale locale) {
-if (defaultLocale != null) return defaultLocale;
+Locale prev = defaultLocale;
defaultLocale = locale;
-return null;
+return prev;
}
/**
* Returns the default locale if set, or otherwise the system default
({...@link java.util.Locale#getDefault}).
@@ -83,10 +80,6 @@
private MapLocale, String values = null;
private String bundle = null;
-// just for the contract of Serializable
-protected LocalizedString() {
-}
-
/**
* @param k The key of this String, if k == codenull/code then the
first set will define it.
*/
@@ -113,7 +106,7 @@
*/
public String get(Locale locale) {
if (locale == null) {
-locale = defaultLocale == null ? Locale.getDefault() :
defaultLocale;
+locale = getDefault();
}
if (values != null) {
String result = values.get(locale);
@@ -140,12 +133,14 @@
// This code 'fixes' that reference.
// It's not nice, but as a proper fix likely requires a total
rewrite of Module.java and
// MMBase.java, this will have to do for the moment.
-if (locale.equals(defaultLocale)) {
+Locale def = getDefault();
+if (locale.equals(def)) {
result = values.get(null);
if (result != null) {
values.put(locale, result);
return result;
}
+
}
}
@@ -175,11 +170,12 @@
}
if (locale == null) {
-locale = defaultLocale;
+locale = getDefault();
}
values.put(locale, value);
+
if (locale != null) {
String variant = locale.getVariant();
String country = locale.getCountry();
@@ -237,7 +233,7 @@
}
public String getDebugString() {
-return k: + getKey() + values: + getValues() + b: +
getBundle();
+return k: + getKey() + values: + getValues() + b: +
getBundle() + dl: + defaultLocale;
}
/**
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/util WrappedLocalizedString.java
Update of /var/cvs/src/org/mmbase/util
In directory james.mmbase.org:/tmp/cvs-serv17870
Modified Files:
WrappedLocalizedString.java
Log Message:
default constructor was removed
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util
Index: WrappedLocalizedString.java
===
RCS file: /var/cvs/src/org/mmbase/util/WrappedLocalizedString.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- WrappedLocalizedString.java 28 Apr 2009 06:31:22 - 1.4
+++ WrappedLocalizedString.java 30 Apr 2009 19:54:03 - 1.5
@@ -16,7 +16,7 @@
* Extends and wraps LocalizedString.
*
* @author Michiel Meeuwissen
- * @version $Id: WrappedLocalizedString.java,v 1.4 2009/04/28 06:31:22 michiel
Exp $
+ * @version $Id: WrappedLocalizedString.java,v 1.5 2009/04/30 19:54:03 michiel
Exp $
* @since MMBase-1.9
*/
public class WrappedLocalizedString extends LocalizedString {
@@ -31,6 +31,7 @@
* @param s The wrapped LocalizedString.
*/
public WrappedLocalizedString(LocalizedString s) {
+super(WRAPPED);
if (s == null) s = new LocalizedString(NULL);
wrapped = s;
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/core AbstractDescriptor.java
Update of /var/cvs/src/org/mmbase/core
In directory james.mmbase.org:/tmp/cvs-serv17951
Modified Files:
AbstractDescriptor.java
Log Message:
simplified a bit, making sure that the localized strings are simple never null
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/core
Index: AbstractDescriptor.java
===
RCS file: /var/cvs/src/org/mmbase/core/AbstractDescriptor.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- AbstractDescriptor.java 29 Apr 2009 07:39:07 - 1.14
+++ AbstractDescriptor.java 30 Apr 2009 19:54:39 - 1.15
@@ -20,13 +20,14 @@
*
* @author Pierre van Rooden
* @since MMBase-1.8
- * @version $Id: AbstractDescriptor.java,v 1.14 2009/04/29 07:39:07 michiel
Exp $
+ * @version $Id: AbstractDescriptor.java,v 1.15 2009/04/30 19:54:39 michiel
Exp $
*/
abstract public class AbstractDescriptor implements Descriptor,
PublicCloneableAbstractDescriptor {
-protected String key;
-protected LocalizedString description;
+protected String key; // clone sucks
+
+protected LocalizedString description; // clone sucks. so it cannot be
final
protected LocalizedString guiName;
protected AbstractDescriptor() {}
@@ -37,8 +38,8 @@
*/
protected AbstractDescriptor(String name) {
key = name;
-setGUIName(name);
-setDescription();
+guiName = new LocalizedString(key);
+description = new LocalizedString(key);
}
/**
@@ -64,13 +65,13 @@
/**
* The locale which must be used if no locale is specified.
- * The default implementation returns codenull/code.
+ * The default implementation returns {...@link LocalizedString#getDefault}
* This method can be overriden if another more logical default is
* available. E.g. in BasicField the locale of the current cloud is
returned.
* @since MMBase-1.8.1
*/
protected Locale getDefaultLocale() {
-return null;
+return LocalizedString.getDefault();
}
/**
@@ -82,7 +83,6 @@
}
public String getDescription(Locale locale) {
-if (description == null) description = new LocalizedString(key);
return description.get(locale == null ? getDefaultLocale() : locale);
}
@@ -93,13 +93,15 @@
public LocalizedString getLocalizedDescription() {
return description;
}
-
protected void setLocalizedDescription(LocalizedString description) {
this.description = description;
}
+protected void setLocalizedGUIName(LocalizedString value) {
+guiName = value;
+}
+
public void setDescription(String desc, Locale locale) {
-if (description == null) description = new LocalizedString(key);
description.set(desc, locale);
}
@@ -115,7 +117,6 @@
* @return the GUI Name
*/
public String getGUIName(Locale locale) {
-if (guiName == null) guiName = new LocalizedString(key);
return guiName.get(locale == null ? getDefaultLocale() : locale);
}
@@ -130,7 +131,6 @@
}
public void setGUIName(String g, Locale locale) {
-if (guiName == null) guiName = new LocalizedString(key);
guiName.set(g, locale);
}
@@ -142,10 +142,6 @@
return guiName;
}
-protected void setLocalizedGUIName(LocalizedString value) {
-guiName = value;
-}
-
public String toString() {
return key;
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/util/functions DescribedFunctionProvider.java
Update of /var/cvs/src/org/mmbase/util/functions
In directory james.mmbase.org:/tmp/cvs-serv18026/util/functions
Modified Files:
DescribedFunctionProvider.java
Log Message:
made getDefaul tnot return null
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/functions
Index: DescribedFunctionProvider.java
===
RCS file:
/var/cvs/src/org/mmbase/util/functions/DescribedFunctionProvider.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- DescribedFunctionProvider.java 19 Jun 2007 14:00:11 - 1.2
+++ DescribedFunctionProvider.java 30 Apr 2009 19:55:20 - 1.3
@@ -21,7 +21,7 @@
* @since MMBase-1.9
* @author Pierre van Rooden
*
- * @version $Id: DescribedFunctionProvider.java,v 1.2 2007/06/19 14:00:11
michiel Exp $
+ * @version $Id: DescribedFunctionProvider.java,v 1.3 2009/04/30 19:55:20
michiel Exp $
*/
public abstract class DescribedFunctionProvider extends FunctionProvider
implements Descriptor {
@@ -83,7 +83,7 @@
* @since MMBase-1.8.1
*/
protected Locale getDefaultLocale() {
-return null;
+return LocalizedString.getDefault();
}
public String getDescription(Locale locale) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] tests/util/org/mmbase/util LocalizedStringTest.java
Update of /var/cvs/tests/util/org/mmbase/util
In directory james.mmbase.org:/tmp/cvs-serv18133/util/org/mmbase/util
Modified Files:
LocalizedStringTest.java
Log Message:
added some cases dealing with setting values on the default locale, which
behaved a bit odd (some of these failed, but not any more)
See also: http://cvs.mmbase.org/viewcvs/tests/util/org/mmbase/util
Index: LocalizedStringTest.java
===
RCS file: /var/cvs/tests/util/org/mmbase/util/LocalizedStringTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- LocalizedStringTest.java28 Apr 2009 06:52:50 - 1.5
+++ LocalizedStringTest.java30 Apr 2009 19:56:25 - 1.6
@@ -18,7 +18,7 @@
/**
*
* @author Michiel Meeuwissen
- * @verion $Id: LocalizedStringTest.java,v 1.5 2009/04/28 06:52:50 michiel Exp
$
+ * @verion $Id: LocalizedStringTest.java,v 1.6 2009/04/30 19:56:25 michiel Exp
$
*/
public class LocalizedStringTest extends TestCase {
@@ -39,12 +39,28 @@
return fun;
}
+protected LocalizedString getInstanceWithDefaultFilled() {
+LocalizedString.setDefault(DK);
+LocalizedString fun = new LocalizedString(funny);
+fun.set(leuk, NL);
+fun.set(plezant, BE);
+fun.set(amuza, EO);
+fun.set(morsom, DK);
+return fun;
+}
+
public void testBasic() {
LocalizedString fun = getInstance();
-assertEquals(fun.get(null), funny);
-assertEquals(fun.get(EO), amuza);
-assertEquals(fun.get(BE_VAR), plezant);
-assertEquals(fun.get(NL), leuk);
+assertEquals(funny, fun.get(null));
+assertEquals(amuza, fun.get(EO));
+assertEquals(plezant, fun.get(BE_VAR));
+assertEquals(leuk, fun.get(NL));
+
+LocalizedString fun2 = getInstanceWithDefaultFilled();
+assertEquals(morsom, fun2.get(DK));
+assertEquals( + fun2.getDebugString(), morsom, fun2.get(null));
+assertEquals(funny, fun2.get(Locale.CHINESE));
+
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] tests/datatypes/org/mmbase/datatypes DataTypesTest.java
Update of /var/cvs/tests/datatypes/org/mmbase/datatypes In directory james.mmbase.org:/tmp/cvs-serv18174/datatypes/org/mmbase/datatypes Modified Files: DataTypesTest.java Log Message: That was a test-case error See also: http://cvs.mmbase.org/viewcvs/tests/datatypes/org/mmbase/datatypes Index: DataTypesTest.java === RCS file: /var/cvs/tests/datatypes/org/mmbase/datatypes/DataTypesTest.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -b -r1.5 -r1.6 --- DataTypesTest.java 30 Apr 2009 10:47:15 - 1.5 +++ DataTypesTest.java 30 Apr 2009 19:56:54 - 1.6 @@ -67,7 +67,7 @@ assertEquals(Tekst, getLine().getGUIName(new Locale(nl))); assertEquals(Text, getLine().getGUIName(new Locale(en))); -assertEquals(eline, getStringClone().getGUIName()); +assertEquals(eline, getLine().getGUIName()); } ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] all/maven/maven-mmbase-plugin pom.xml
Update of /var/cvs/all/maven/maven-mmbase-plugin In directory james.mmbase.org:/tmp/cvs-serv18466 Modified Files: pom.xml Log Message: generated source contained some untrue statements. Fixed. See also: http://cvs.mmbase.org/viewcvs/all/maven/maven-mmbase-plugin Index: pom.xml === RCS file: /var/cvs/all/maven/maven-mmbase-plugin/pom.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- pom.xml 28 Apr 2009 15:17:09 - 1.2 +++ pom.xml 30 Apr 2009 20:06:07 - 1.3 @@ -40,6 +40,10 @@ artifactIdplexus-utils/artifactId version1.5.1/version /dependency +dependency + groupIdjavax.servlet/groupId + artifactIdservlet-api/artifactId +/dependency /dependencies /project ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] all/maven/maven-mmbase-plugin/src/main/java/org/mmbase/mojo/remote InterfaceGenerator.java ObjectWrapperGenerator.java ProxyGenerator.java RmiGenerator.java
Update of
/var/cvs/all/maven/maven-mmbase-plugin/src/main/java/org/mmbase/mojo/remote
In directory
james.mmbase.org:/tmp/cvs-serv18466/src/main/java/org/mmbase/mojo/remote
Modified Files:
InterfaceGenerator.java ObjectWrapperGenerator.java
ProxyGenerator.java RmiGenerator.java
Log Message:
generated source contained some untrue statements. Fixed.
See also:
http://cvs.mmbase.org/viewcvs/all/maven/maven-mmbase-plugin/src/main/java/org/mmbase/mojo/remote
Index: InterfaceGenerator.java
===
RCS file:
/var/cvs/all/maven/maven-mmbase-plugin/src/main/java/org/mmbase/mojo/remote/InterfaceGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- InterfaceGenerator.java 8 Mar 2009 18:12:44 - 1.1
+++ InterfaceGenerator.java 30 Apr 2009 20:06:07 - 1.2
@@ -18,7 +18,7 @@
*
* @since MMBase-1.9
* @author Pierre van Rooden
- * @version $Id: InterfaceGenerator.java,v 1.1 2009/03/08 18:12:44 nklasens
Exp $
+ * @version $Id: InterfaceGenerator.java,v 1.2 2009/04/30 20:06:07 michiel Exp
$
*/
public class InterfaceGenerator extends AbstractClassGenerator {
@@ -47,9 +47,9 @@
buffer.append( * This interface has almost the same methods names as
the + originalName + interface.\n);
buffer.append( * The interface is created in such way that it can
implement java.rmi.Remote.\n);
buffer.append( * Where needed other return values or parameters are
used.\n);
-buffer.append( * @author generated by
org.mmbase.bridge.remote.generator.InterfaceGenerator\n);
+buffer.append( * @author generated by + this.getClass().getName() +
\n);
buffer.append( */\n);
-buffer.append( //DO NOT EDIT THIS FILE, IT IS GENERATED by
org.mmbase.bridge.remote.generator.RMMCI\n);
+buffer.append( //DO NOT EDIT THIS FILE, IT IS GENERATED by +
this.getClass().getName() + \n);
}
@Override
Index: ObjectWrapperGenerator.java
===
RCS file:
/var/cvs/all/maven/maven-mmbase-plugin/src/main/java/org/mmbase/mojo/remote/ObjectWrapperGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- ObjectWrapperGenerator.java 10 Mar 2009 07:32:54 - 1.4
+++ ObjectWrapperGenerator.java 30 Apr 2009 20:06:07 - 1.5
@@ -19,7 +19,7 @@
*
* @since MMBase-1.9
* @author Pierre van Rooden
- * @version $Id: ObjectWrapperGenerator.java,v 1.4 2009/03/10 07:32:54 michiel
Exp $
+ * @version $Id: ObjectWrapperGenerator.java,v 1.5 2009/04/30 20:06:07 michiel
Exp $
*/
public class ObjectWrapperGenerator extends AbstractGenerator {
@@ -94,9 +94,9 @@
buffer.append(import org.mmbase.util.logging.*;\n);
buffer.append(/**\n);
-buffer.append( * @author generated by
org.mmbase.bridge.remote.generator.ObjectWrapperGenerator\n);
+buffer.append( * @author generated by + this.getClass().getName() +
\n);
buffer.append( */\n);
-buffer.append( //DO NOT EDIT THIS FILE. IT IS GENERATED by
org.mmbase.bridge.remote.generator.RMMCI\n);
+buffer.append( //DO NOT EDIT THIS FILE, IT IS GENERATED by +
this.getClass().getName() + \n);
}
@Override
Index: ProxyGenerator.java
===
RCS file:
/var/cvs/all/maven/maven-mmbase-plugin/src/main/java/org/mmbase/mojo/remote/ProxyGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ProxyGenerator.java 8 Mar 2009 18:12:44 - 1.1
+++ ProxyGenerator.java 30 Apr 2009 20:06:07 - 1.2
@@ -20,7 +20,7 @@
*
* @since MMBase-1.9
* @author Pierre van Rooden
- * @version $Id: ProxyGenerator.java,v 1.1 2009/03/08 18:12:44 nklasens Exp $
+ * @version $Id: ProxyGenerator.java,v 1.2 2009/04/30 20:06:07 michiel Exp $
*/
public class ProxyGenerator extends AbstractClassGenerator {
@@ -48,9 +48,9 @@
buffer.append(/**\n);
buffer.append( * + proxyName + in a generated smart proxy of +
originalName + br /\n);
buffer.append( * This smart proxy is used by a local class when the
MMCI is called remotely\n);
-buffer.append( * @author generated by
org.mmbase.bridge.remote.generator.ProxyGenerator\n);
+buffer.append( * @author generated by + this.getClass().getName() +
\n);
buffer.append( */\n);
-buffer.append( //DO NOT EDIT THIS FILE. IT IS GENERATED by
org.mmbase.bridge.remote.generator.RMMCI\n);
+buffer.append( //DO NOT EDIT THIS FILE, IT IS GENERATED by +
this.getClass().getName() + \n);
}
boolean abstractListMethod(Method m) {
Index: RmiGenerator.java
===
RCS file:
/var/cvs/all/maven/maven-mmbase-plugin/src/main/java/org/mmbase/mojo/remote/RmiGenerator.java,v
retrieving
[MMBASE CVS] all/maven/maven-mmbase-plugin/src/main/java/org/mmbase/mojo RemoteGenerator.java
Update of /var/cvs/all/maven/maven-mmbase-plugin/src/main/java/org/mmbase/mojo
In directory james.mmbase.org:/tmp/cvs-serv18954
Modified Files:
RemoteGenerator.java
Log Message:
I'm not sure wht this was done like so, but anyway, it caused MMB-1814
See also:
http://cvs.mmbase.org/viewcvs/all/maven/maven-mmbase-plugin/src/main/java/org/mmbase/mojo
See also: http://www.mmbase.org/jira/browse/MMB-1814
Index: RemoteGenerator.java
===
RCS file:
/var/cvs/all/maven/maven-mmbase-plugin/src/main/java/org/mmbase/mojo/RemoteGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- RemoteGenerator.java8 Mar 2009 18:12:45 - 1.1
+++ RemoteGenerator.java30 Apr 2009 20:23:39 - 1.2
@@ -156,12 +156,6 @@
}
public void generateObjectWrapper(ListClass? objectsToWrap, File
remoteDir) {
- try {
- objectsToWrap.add(Class.forName(org.mmbase.bridge.BridgeList));
- }
- catch (ClassNotFoundException e) {
- getLog().debug( + e.getMessage(), e);
- }
new ObjectWrapperGenerator(objectsToWrap).generate(remoteDir);
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/util ThreadPools.java
Update of /var/cvs/src/org/mmbase/util
In directory james.mmbase.org:/tmp/cvs-serv19010
Modified Files:
ThreadPools.java
Log Message:
Casting still not working completely on rmmci
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util
Index: ThreadPools.java
===
RCS file: /var/cvs/src/org/mmbase/util/ThreadPools.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- ThreadPools.java30 Apr 2009 18:48:43 - 1.29
+++ ThreadPools.java30 Apr 2009 20:24:23 - 1.30
@@ -18,7 +18,7 @@
*
* @since MMBase 1.8
* @author Michiel Meeuwissen
- * @version $Id: ThreadPools.java,v 1.29 2009/04/30 18:48:43 michiel Exp $
+ * @version $Id: ThreadPools.java,v 1.30 2009/04/30 20:24:23 michiel Exp $
*/
public abstract class ThreadPools {
private static final Logger log =
Logging.getLoggerInstance(ThreadPools.class);
@@ -73,7 +73,7 @@
private static Thread newThread(Runnable r, final String id) {
boolean isUp =
org.mmbase.bridge.ContextProvider.getDefaultCloudContext().isUp();
Thread t = new Thread(threadGroup, r,
- isUp ?
org.mmbase.module.core.MMBaseContext.getMachineName() + : + id : id) {
+ isUp ? getMachineName() + : + id : id) {
/**
* Overrides run of Thread to catch and log all exceptions.
Otherwise they go through to app-server.
*/
@@ -106,9 +106,7 @@
}
});
-static {
-jobsExecutor.execute(new Runnable() {
-public void run() {
+private static String getMachineName() {
String machineName;
try {
org.mmbase.bridge.ContextProvider.getDefaultCloudContext().assertUp();
@@ -118,6 +116,13 @@
// rmmci-client jar.
machineName = localhost;
}
+return machineName;
+}
+
+static {
+jobsExecutor.execute(new Runnable() {
+public void run() {
+String machineName = getMachineName();
for (Thread t : nameLess) {
t.setName(machineName + : + t.getName());
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/rmmci/src/org/mmbase/bridge/remote RemoteBridgeList.java
Update of /var/cvs/applications/rmmci/src/org/mmbase/bridge/remote
In directory james.mmbase.org:/tmp/cvs-serv19401
Modified Files:
RemoteBridgeList.java
Log Message:
javadoc
See also:
http://cvs.mmbase.org/viewcvs/applications/rmmci/src/org/mmbase/bridge/remote
Index: RemoteBridgeList.java
===
RCS file:
/var/cvs/applications/rmmci/src/org/mmbase/bridge/remote/RemoteBridgeList.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- RemoteBridgeList.java 31 Mar 2007 17:14:59 - 1.1
+++ RemoteBridgeList.java 30 Apr 2009 20:46:13 - 1.2
@@ -18,9 +18,7 @@
* The interface is created in such way that it can implement java.rmi.Remote.
* Where needed other return values or parameters are used.
* @since MMBase-1.9
- * @author generated by org.mmbase.bridge.remote.generator.InterfaceGenerator
*/
- //DO NOT EDIT THIS FILE, IT IS GENERATED by
org.mmbase.bridge.remote.generator.RMMCI
public interface RemoteBridgeListE extends RemoteListE {
public void setProperty(java.lang.Object arg0,java.lang.Object arg1) throws
RemoteException;
public java.lang.Object getProperty(java.lang.Object arg0) throws
RemoteException;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/rmmci/src/org/mmbase/bridge/remote/proxy MappedObject_Proxy.java RemoteBridgeList_Proxy.java RemoteIterator_Proxy.java RemoteList_Proxy.java UriRemoteCloudContext_Proxy.java
Update of /var/cvs/applications/rmmci/src/org/mmbase/bridge/remote/proxy
In directory james.mmbase.org:/tmp/cvs-serv19401/proxy
Modified Files:
MappedObject_Proxy.java RemoteBridgeList_Proxy.java
RemoteIterator_Proxy.java RemoteList_Proxy.java
UriRemoteCloudContext_Proxy.java
Log Message:
javadoc
See also:
http://cvs.mmbase.org/viewcvs/applications/rmmci/src/org/mmbase/bridge/remote/proxy
Index: MappedObject_Proxy.java
===
RCS file:
/var/cvs/applications/rmmci/src/org/mmbase/bridge/remote/proxy/MappedObject_Proxy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- MappedObject_Proxy.java 31 Mar 2007 17:14:59 - 1.1
+++ MappedObject_Proxy.java 30 Apr 2009 20:46:13 - 1.2
@@ -13,6 +13,10 @@
import org.mmbase.bridge.remote.*;
import org.mmbase.bridge.remote.util.ObjectWrapper;
+
+/**
+ * @javadoc
+ */
public class MappedObject_ProxyO extends ServerMappedObject implements
MappedObject {
private O remoteObject;
Index: RemoteBridgeList_Proxy.java
===
RCS file:
/var/cvs/applications/rmmci/src/org/mmbase/bridge/remote/proxy/RemoteBridgeList_Proxy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- RemoteBridgeList_Proxy.java 31 Mar 2007 17:14:59 - 1.1
+++ RemoteBridgeList_Proxy.java 30 Apr 2009 20:46:13 - 1.2
@@ -17,6 +17,10 @@
import org.mmbase.bridge.remote.util.*;
+/**
+ * @javadoc
+ */
+
public class RemoteBridgeList_ProxyL extends Comparable? super L,E extends
RemoteList_ProxyL,E implements BridgeListL, MappedObject {
public RemoteBridgeList_Proxy(RemoteBridgeListE remoteObject) {
Index: RemoteIterator_Proxy.java
===
RCS file:
/var/cvs/applications/rmmci/src/org/mmbase/bridge/remote/proxy/RemoteIterator_Proxy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- RemoteIterator_Proxy.java 31 Mar 2007 17:14:59 - 1.1
+++ RemoteIterator_Proxy.java 30 Apr 2009 20:46:13 - 1.2
@@ -17,6 +17,9 @@
import org.mmbase.bridge.remote.util.ObjectWrapper;
+/**
+ * @javadoc
+ */
public class RemoteIterator_ProxyL, R extends
MappedObject_ProxyRemoteIteratorR implements ListIteratorL {
ListIteratorL local;
Index: RemoteList_Proxy.java
===
RCS file:
/var/cvs/applications/rmmci/src/org/mmbase/bridge/remote/proxy/RemoteList_Proxy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- RemoteList_Proxy.java 31 Mar 2007 17:14:59 - 1.1
+++ RemoteList_Proxy.java 30 Apr 2009 20:46:13 - 1.2
@@ -17,6 +17,10 @@
import org.mmbase.bridge.remote.*;
import org.mmbase.bridge.remote.util.ObjectWrapper;
+
+/**
+ * @javadoc
+ */
public class RemoteList_ProxyL, R extends AbstractListL implements
ListL, MappedObject {
// remote object
Index: UriRemoteCloudContext_Proxy.java
===
RCS file:
/var/cvs/applications/rmmci/src/org/mmbase/bridge/remote/proxy/UriRemoteCloudContext_Proxy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- UriRemoteCloudContext_Proxy.java17 Jul 2008 17:14:06 - 1.1
+++ UriRemoteCloudContext_Proxy.java30 Apr 2009 20:46:13 - 1.2
@@ -11,6 +11,13 @@
package org.mmbase.bridge.remote.proxy;
import org.mmbase.bridge.remote.*;
+
+/**
+ * Effort to try to fix that RemoteCloudContext.getCloud().getCloudContext()
does not return a
+ * eremote cloud context.
+ * Not working, not used, afaik..
+ * @version $Id: UriRemoteCloudContext_Proxy.java,v 1.2 2009/04/30 20:46:13
michiel Exp $
+ */
public class UriRemoteCloudContext_Proxy extends RemoteCloudContext_Proxy {
private final String uri;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] tests/bridge/org/mmbase/bridge CloudContextTest.java FilledNodeTest.java NodeTest.java ProcessorTest.java
() {
-for (String element : fieldTypes) {
+for (final String element : fieldTypes) {
Date value = null;
if (element.equals(node)) {
value = node.getDateValue(element + field);
@@ -412,14 +413,14 @@
value.getTime()==TEST_TIME);
} else if (element.equals(double)) {
value = node.getDateValue(element + field);
-long time = new Double(Double.MAX_VALUE).longValue() * 1000;
-assertTrue(element + field queried as datetime did not
return +new Date(time)+, but + value,
-value.getTime()==time);
+Date time = Casting.toDate(TEST_DOUBLE);
+assertTrue(element + field queried as datetime did not
return + time + , but + value,
+ value.getTime() == time.getTime());
} else if (element.equals(float)) {
value = node.getDateValue(element + field);
-long time = new Float(Float.MAX_VALUE).longValue() * 1000;
-assertTrue(element + field queried as datetime did not
return +new Date(time)+, but + value,
-value.getTime()==time);
+Date time = Casting.toDate(Float.MAX_VALUE);
+assertTrue(element + field queried as datetime did not
return + time +, but + value,
+ value.getTime() == time.getTime());
} else if (element.equals(int)) {
value = node.getDateValue(element + field);
long time = new Integer(Integer.MAX_VALUE).longValue()*1000;
@@ -427,9 +428,9 @@
value.getTime()==time);
} else if (element.equals(long)) {
value = node.getDateValue(element + field);
-long time = Long.MAX_VALUE * 1000; // oddd..
-assertTrue(element + field queried as datetime did not
return +new Date(time) + , but + value,
-value.getTime()==time);
+Date time = Casting.toDate(Long.MAX_VALUE);
+assertTrue(element + field queried as datetime did not
return + time + , but + value,
+ value.getTime() == time.getTime());
} else if (element.equals(decimal)) {
value = node.getDateValue(element + field);
long time = TEST_DECIMAL.longValue() * 1000;
@@ -440,11 +441,12 @@
value = node.getDateValue(element + field);
fail(element + field 's value ' +
node.getStringValue(element + field) + ' cannot be queried as a date, should
have thrown exception);
} catch (Throwable e) {
-return;
+continue;
}
}
assertTrue(element + field queried as datetime returned null,
value != null);
}
+
}
public void testGetDecimalValue() {
@@ -453,7 +455,7 @@
if (element.equals(binary)) {
assertTrue(new BigDecimal(-1).compareTo(l) == 0);
} else if (element.equals(double)) {
-assertTrue( + l + != + Double.MAX_VALUE, new
BigDecimal(Double.MAX_VALUE).compareTo(l) == 0);
+assertTrue( + l + != + TEST_DOUBLE, new
BigDecimal(TEST_DOUBLE).compareTo(l) == 0);
} else if (element.equals(float)) {
assertTrue(new BigDecimal(Float.MAX_VALUE).compareTo(l) == 0);
} else if (element.equals(int)) {
Index: NodeTest.java
===
RCS file: /var/cvs/tests/bridge/org/mmbase/bridge/NodeTest.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- NodeTest.java 1 Dec 2008 22:41:58 - 1.26
+++ NodeTest.java 30 Apr 2009 22:36:13 - 1.27
@@ -23,7 +23,7 @@
*/
public abstract class NodeTest extends BridgeTest {
protected Node node;
-protected static String[] fieldTypes = {binary, double, float,
int, long, string, xml, node, datetime, boolean, decimal}; //,
list};
+protected final static String[] fieldTypes = {float, int, long,
string, xml, node, datetime, boolean, decimal, double, binary};
//, list};
//protected static String[] fieldTypes = {datetime};
public NodeTest(String name) {
Index: ProcessorTest.java
===
RCS file: /var/cvs/tests/bridge/org/mmbase/bridge/ProcessorTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- ProcessorTest.java 30 Apr 2009 19:07:43 - 1.7
+++ ProcessorTest.java 30 Apr 2009 22:36:13 - 1.8
@@ -24,7 +24,7 @@
* Testing wether the processors of datatypes behave as expected.
*
* @author Michiel Meeuwissen
- * @version $Id: ProcessorTest.java,v 1.7 2009/04/30 19:07:43 michiel Exp $
+ * @version $Id
[MMBASE CVS] applications/richtext build.xml
Update of /var/cvs/applications/richtext In directory james.mmbase.org:/tmp/cvs-serv21435 Modified Files: build.xml Log Message: See also: http://cvs.mmbase.org/viewcvs/applications/richtext Index: build.xml === RCS file: /var/cvs/applications/richtext/build.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -u -b -r1.12 -r1.13 --- build.xml 17 Nov 2008 11:18:41 - 1.12 +++ build.xml 30 Apr 2009 22:38:38 - 1.13 @@ -1,5 +1,5 @@ ?xml version=1.0? -project name=MMBase Richtext default=kupu basedir=. +project name=richtext default=kupu basedir=. property name=java.source.version value=1.5 / property name=kupu.repository value=http://codespeak.net/svn/kupu/trunk/kupu; / ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/richtext/config/components wiki.xml
Update of /var/cvs/applications/richtext/config/components In directory james.mmbase.org:/tmp/cvs-serv21499/config/components Modified Files: wiki.xml Log Message: See also: http://cvs.mmbase.org/viewcvs/applications/richtext/config/components Index: wiki.xml === RCS file: /var/cvs/applications/richtext/config/components/wiki.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- wiki.xml7 Aug 2008 12:18:02 - 1.4 +++ wiki.xml30 Apr 2009 22:38:50 - 1.5 @@ -34,5 +34,11 @@ /body /block + block name=relations +body jsp=/mmbase/components/richtext/wiki/relations.jspx + param name=n/ +/body + /block + /component ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/cloudcontext build.xml
Update of /var/cvs/applications/cloudcontext In directory james.mmbase.org:/tmp/cvs-serv21658/cloudcontext Modified Files: Tag: MMBase-1_8 build.xml Log Message: See also: http://cvs.mmbase.org/viewcvs/applications/cloudcontext Index: build.xml === RCS file: /var/cvs/applications/cloudcontext/build.xml,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -u -b -r1.5.2.1 -r1.5.2.2 --- build.xml 21 Nov 2007 09:52:42 - 1.5.2.1 +++ build.xml 30 Apr 2009 22:41:11 - 1.5.2.2 @@ -4,6 +4,7 @@ project name=cloudcontext default=jar basedir=. + property name=java.source.version value=1.5 / property name=project.name value=cloudcontextsecurity / property name=project.package value=org/mmbase/security/implementation/cloudcontext / property name=project.target.templates.dir value=security / ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/editwizard/examples/advanced/tasks mags.xml
Update of /var/cvs/applications/editwizard/examples/advanced/tasks
In directory
james.mmbase.org:/tmp/cvs-serv21771/editwizard/examples/advanced/tasks
Modified Files:
Tag: MMBase-1_8
mags.xml
Log Message:
See also:
http://cvs.mmbase.org/viewcvs/applications/editwizard/examples/advanced/tasks
Index: mags.xml
===
RCS file:
/var/cvs/applications/editwizard/examples/advanced/tasks/Attic/mags.xml,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -b -r1.4 -r1.4.2.1
--- mags.xml13 Feb 2006 10:37:31 - 1.4
+++ mags.xml30 Apr 2009 22:41:45 - 1.4.2.1
@@ -47,7 +47,7 @@
titleNews article/title
field name=title ftype=data /
field name=date ftype=data /
-field fdatapath=fie...@name='pos'] ftype=data /
+field fdatapath=fie...@name='pos'] /
/item
command name=search nodepath=news fields=title orderby=title
age=-1
@@ -60,7 +60,7 @@
action type=create
relation role=posrel destinationtype=news
- field name=pos{sum(//relati...@role='posrel' and
@lastitem='true']/fie...@name='pos'])+{$pos}}/field
+ field name=pos{sum(//relati...@role='posrel' and
@lastitem='true' and @source=/data/object/@number and object/@searchtype =
'news']/fie...@name='pos'])+{$pos}}/field
/relation
/action
/list
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/editwizard/examples/simple index.jsp
Update of /var/cvs/applications/editwizard/examples/simple
In directory james.mmbase.org:/tmp/cvs-serv21841/editwizard/examples/simple
Modified Files:
Tag: MMBase-1_8
index.jsp
Log Message:
See also: http://cvs.mmbase.org/viewcvs/applications/editwizard/examples/simple
Index: index.jsp
===
RCS file: /var/cvs/applications/editwizard/examples/simple/Attic/index.jsp,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -u -b -r1.13.2.1 -r1.13.2.2
--- index.jsp 10 May 2007 15:53:06 - 1.13.2.1
+++ index.jsp 30 Apr 2009 22:42:19 - 1.13.2.2
@@ -38,6 +38,28 @@
/tdtd
An editor for news articles. In the one step you can create or add a
news article and relate people and images to it.
/td/tr
+trtd
+ mm:link referids=referrer page=$jsps/list.jsp
+mm:param name=wizard../samples/news_origin/mm:param
+mm:param name=startnodesdefault.mags/mm:param
+mm:param name=origindefault.mags/mm:param
+mm:param name=relationRoleposrel/mm:param
+mm:param name=relationOriginNodedefault.mags/mm:param
+mm:param name=nodepathmags,posrel,news/mm:param
+mm:param name=orderbyposrel.pos/mm:param
+mm:param name=directionsdown/mm:param
+mm:param name=searchyes/mm:param
+a href=${_}News (with origin = default.mags)/a
+ /mm:link
+
+ mm:link referids=referrer page=$jsps/wizard.jsp
+mm:param name=wizard../samples/news_origin/mm:param
+mm:param name=origindefault.mags/mm:param
+mm:param name=objectnumbernew/mm:param
+a href=${_}NEW/a
+ /mm:link
+
+ /td/tr
/table
hr /
a class=navigate href=../img alt=back src=mm:url
page=/mmbase/style/images/back.png / //abr /
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/richtext/blocks/wiki relations.jspx
Update of /var/cvs/applications/richtext/blocks/wiki In directory james.mmbase.org:/tmp/cvs-serv21982/blocks/wiki Added Files: relations.jspx Log Message: See also: http://cvs.mmbase.org/viewcvs/applications/richtext/blocks/wiki relations.jspx is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] CVSROOT deny.pl checkoutlist
Update of /var/cvs/CVSROOT In directory james.mmbase.org:/tmp/cvs-serv22108 Modified Files: checkoutlist Added Files: deny.pl Log Message: will disable CVS tomorrow See also: http://cvs.mmbase.org/viewcvs/CVSROOT deny.pl is new Index: checkoutlist === RCS file: /var/cvs/CVSROOT/checkoutlist,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- checkoutlist17 Feb 2004 16:02:50 - 1.3 +++ checkoutlist30 Apr 2009 22:49:16 - 1.4 @@ -13,4 +13,5 @@ # comment lines begin with '#' xmlvalidate.pl No XML-validation script could be found +deny.pl Deny every check in log/cvsmail No mails script could be found \ No newline at end of file ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] CVSROOT deny.pl
Update of /var/cvs/CVSROOT
In directory james.mmbase.org:/tmp/cvs-serv22251
Modified Files:
deny.pl
Log Message:
will disable CVS tomorrow
See also: http://cvs.mmbase.org/viewcvs/CVSROOT
Index: deny.pl
===
RCS file: /var/cvs/CVSROOT/deny.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- deny.pl 30 Apr 2009 22:49:16 - 1.1
+++ deny.pl 30 Apr 2009 22:51:03 - 1.2
@@ -1,3 +1,8 @@
#!/usr/bin/perl
-print You cannot check in in CVS any more. We migrated to Subversion. Please
https://scm.mmbase.org.\n;;
-exit(-1);
+$module_dir = shift @ARGV;
+if ($module_dir ne CVSROOT) {
+print You cannot check in in CVS any more. We migrated to Subversion.
Please use https://scm.mmbase.org.\n;;
+exit(-1);
+} else {
+exit(0);
+}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] all/maven-base pom.xml
Update of /var/cvs/all/maven-base
In directory james.mmbase.org:/tmp/cvs-serv1312
Modified Files:
pom.xml
Log Message:
rationalized dependency managment a bit, because it was not quite wokring
everywhere. Added a 'servlet25' profile.
See also: http://cvs.mmbase.org/viewcvs/all/maven-base
Index: pom.xml
===
RCS file: /var/cvs/all/maven-base/pom.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- pom.xml 28 Apr 2009 15:16:09 - 1.24
+++ pom.xml 29 Apr 2009 07:01:49 - 1.25
@@ -552,7 +552,6 @@
groupIdjavax.servlet/groupId
artifactIdservlet-api/artifactId
version${servlet.version}/version
-scopeprovided/scope
/dependency
dependency
@@ -566,27 +565,23 @@
groupId${jsp.groupId}/groupId
artifactIdjsp-api/artifactId
version${jsp.version}/version
-scopeprovided/scope
/dependency
dependency
groupIdjavax.servlet/groupId
artifactIdjstl/artifactId
version${jstl.version}/version
-scopeprovided/scope
/dependency
dependency
groupIdtaglibs/groupId
artifactIdstandard/artifactId
version${taglib-standard.version}/version
-scopeprovided/scope
/dependency
dependency
groupIdlog4j/groupId
artifactIdlog4j/artifactId
version${log4j.version}/version
-scopeprovided/scope
/dependency
dependency
@@ -622,7 +617,6 @@
artifactIdservlet-api/artifactId
/exclusion
/exclusions
-scopeprovided/scope
/dependency
dependency
groupIdcommons-lang/groupId
@@ -633,7 +627,6 @@
groupIdcommons-fileupload/groupId
artifactIdcommons-fileupload/artifactId
version1.1/version
-scopeprovided/scope
/dependency
dependency
@@ -645,19 +638,6 @@
/dependencies
/dependencyManagement
- dependencies
-dependency
- groupIdjavax.servlet/groupId
- artifactIdservlet-api/artifactId
- scopeprovided/scope
-/dependency
-dependency
- groupId${jsp.groupId}/groupId
- artifactIdjsp-api/artifactId
- scopeprovided/scope
-/dependency
-
- /dependencies
distributionManagement
repository
@@ -868,6 +848,23 @@
/repository
/distributionManagement
/profile
+
+profile
+ idservlet25/id
+ properties
+servlet.version2.5/servlet.version
+jsp.version2.1/jsp.version
+jsp.groupIdjavax.servlet.jsp/jsp.groupId
+jstl.version1.2/jstl.version
+ /properties
+ dependencies
+dependency
+ groupIdtaglibs/groupId
+ artifactIdstandard/artifactId
+ scopeprovided/scope
+/dependency
+ /dependencies
+/profile
/profiles
/project
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] all/base-webapp pom.xml
Update of /var/cvs/all/base-webapp
In directory james.mmbase.org:/tmp/cvs-serv1418
Modified Files:
pom.xml
Log Message:
rationalized dependency managment a bit, because it was not quite wokring
everywhere. Added a 'servlet25' profile.
See also: http://cvs.mmbase.org/viewcvs/all/base-webapp
Index: pom.xml
===
RCS file: /var/cvs/all/base-webapp/pom.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- pom.xml 1 Apr 2009 13:33:00 - 1.5
+++ pom.xml 29 Apr 2009 07:03:05 - 1.6
@@ -13,6 +13,11 @@
artifactIdbase-webapp/artifactId
packagingwar/packaging
nameMMBase Base webapp/name
+ version${base.version}/version
+
+ properties
+base.version${mmbase.version}/base.version
+ /properties
description
This is a minimalistic war containing the essentials for an MMBase web
applications. This can be used as initial war overlay for your own project.
@@ -44,7 +49,7 @@
dependency
groupIdorg.mmbase/groupId
artifactIdmmbase/artifactId
- version${project.version}/version
+ version${mmbase.version}/version
/dependency
!--
@@ -54,9 +59,17 @@
dependency
groupIdorg.mmbase/groupId
artifactIdmmbase-taglib/artifactId
- version${project.version}/version
+ version${mmbase.version}/version
typewar/type
/dependency
/dependencies
+ profiles
+profile
+ idservlet25/id
+ properties
+base.version${mmbase.version}-servlet25/base.version
+ /properties
+/profile
+ /profiles
/project
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] all pom.xml
Update of /var/cvs/all
In directory james.mmbase.org:/tmp/cvs-serv1366
Modified Files:
pom.xml
Log Message:
rationalized dependency managment a bit, because it was not quite wokring
everywhere. Added a 'servlet25' profile.
See also: http://cvs.mmbase.org/viewcvs/all
Index: pom.xml
===
RCS file: /var/cvs/all/pom.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- pom.xml 28 Apr 2009 15:17:43 - 1.20
+++ pom.xml 29 Apr 2009 07:02:39 - 1.21
@@ -153,39 +153,32 @@
dependency
groupIdlog4j/groupId
artifactIdlog4j/artifactId
- scopecompile/scope
/dependency
dependency
groupIdcommons-fileupload/groupId
artifactIdcommons-fileupload/artifactId
- scopecompile/scope
/dependency
dependency
groupIdcommons-logging/groupId
artifactIdcommons-logging/artifactId
- scopecompile/scope
+ scopeprovided/scope
/dependency
dependency
- groupIdjavax.servlet/groupId
- artifactIdservlet-api/artifactId
-/dependency
-dependency
groupId${jsp.groupId}/groupId
artifactIdjsp-api/artifactId
+ scopeprovided/scope
/dependency
dependency
groupIdjavax.servlet/groupId
artifactIdjstl/artifactId
- scopecompile/scope
/dependency
-!-- the dependency on standard taglibs can be dropped when going to jstl
1.2 --
dependency
groupIdtaglibs/groupId
artifactIdstandard/artifactId
- scopecompile/scope
/dependency
+
!--
dependency
groupIdjavax.portlet/groupId
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] all/base-webapp .cvsignore
Update of /var/cvs/all/base-webapp In directory james.mmbase.org:/tmp/cvs-serv1483 Modified Files: .cvsignore Log Message: some addition of netbeans See also: http://cvs.mmbase.org/viewcvs/all/base-webapp Index: .cvsignore === RCS file: /var/cvs/all/base-webapp/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- .cvsignore 17 Feb 2009 22:41:33 - 1.1 +++ .cvsignore 29 Apr 2009 07:04:02 - 1.2 @@ -1,4 +1,5 @@ target +profiles.xml .classpath -.project *.log +.project ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications pom.xml
Update of /var/cvs/applications
In directory james.mmbase.org:/tmp/cvs-serv1536
Modified Files:
pom.xml
Log Message:
depending on 'mmbase.version' for modules that have that version
See also: http://cvs.mmbase.org/viewcvs/applications
Index: pom.xml
===
RCS file: /var/cvs/applications/pom.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- pom.xml 24 Apr 2009 08:14:11 - 1.15
+++ pom.xml 29 Apr 2009 07:04:42 - 1.16
@@ -23,25 +23,24 @@
dependency
groupIdorg.mmbase/groupId
artifactIdmmbase/artifactId
- version${project.version}/version
+ version${mmbase.version}/version
scopeprovided/scope
/dependency
-
-
dependency
groupIdorg.mmbase/groupId
artifactIdmmbase/artifactId
- version${project.version}/version
+ version${mmbase.version}/version
classifierjavadoc/classifier
scopeprovided/scope
/dependency
dependency
groupIdorg.mmbase/groupId
artifactIdmmbase/artifactId
- version${project.version}/version
+ version${mmbase.version}/version
classifiersources/classifier
scopeprovided/scope
/dependency
+
/dependencies
build
@@ -143,4 +142,6 @@
modulescan/module
/modules
+
+
/project
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/vwms pom.xml
Update of /var/cvs/applications/vwms
In directory james.mmbase.org:/tmp/cvs-serv1611
Modified Files:
pom.xml
Log Message:
vwms uses Mail
See also: http://cvs.mmbase.org/viewcvs/applications/vwms
Index: pom.xml
===
RCS file: /var/cvs/applications/vwms/pom.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- pom.xml 28 Apr 2009 15:19:34 - 1.2
+++ pom.xml 29 Apr 2009 07:05:12 - 1.3
@@ -18,4 +18,14 @@
VWMS ('virtual webmasters') are legacy. Don't use it.
/description
+ dependencies
+dependency
+ groupIdorg.mmbase/groupId
+ artifactIdmmbase-email/artifactId
+ version${mmbase.version}/version
+ classifierclasses/classifier
+ scopeprovided/scope
+/dependency
+ /dependencies
+
/project
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] all/maven pom.xml
Update of /var/cvs/all/maven In directory james.mmbase.org:/tmp/cvs-serv1676 Modified Files: pom.xml Log Message: accidentely commented out build of the webapps See also: http://cvs.mmbase.org/viewcvs/all/maven Index: pom.xml === RCS file: /var/cvs/all/maven/pom.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- pom.xml 28 Apr 2009 15:17:09 - 1.2 +++ pom.xml 29 Apr 2009 07:05:38 - 1.3 @@ -25,10 +25,8 @@ module../module module../applications/module -!-- module../base-webapp/module module../example-webapp/module --- /modules build ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/media/config/builders/media mediasources.xml
Update of /var/cvs/applications/media/config/builders/media In directory james.mmbase.org:/tmp/cvs-serv1889/media/config/builders/media Modified Files: mediasources.xml Log Message: added javaconstant to enumeration See also: http://cvs.mmbase.org/viewcvs/applications/media/config/builders/media Index: mediasources.xml === RCS file: /var/cvs/applications/media/config/builders/media/mediasources.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -b -r1.9 -r1.10 --- mediasources.xml17 Apr 2009 11:14:11 - 1.9 +++ mediasources.xml29 Apr 2009 07:10:26 - 1.10 @@ -144,8 +144,11 @@ /gui editorpositionslist8/list/positions/editor datatype base=integer xmlns=http://www.mmbase.org/xmlns/datatypes; -enumeration - entry basename=org.mmbase.applications.media.builders.resources.states / +default value=UNDEFINED / +enumeration enforce=onchange + entry + javaconstants=org.mmbase.applications.media.State + basename=org.mmbase.applications.media.builders.resources.states / /enumeration /datatype /field ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/rmmci pom.xml
Update of /var/cvs/applications/rmmci
In directory james.mmbase.org:/tmp/cvs-serv1944
Modified Files:
pom.xml
Log Message:
depending on 'mmbase.version' for modules that have that version
See also: http://cvs.mmbase.org/viewcvs/applications/rmmci
Index: pom.xml
===
RCS file: /var/cvs/applications/rmmci/pom.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- pom.xml 28 Apr 2009 15:19:34 - 1.3
+++ pom.xml 29 Apr 2009 07:10:54 - 1.4
@@ -24,8 +24,7 @@
dependency
groupIdorg.mmbase/groupId
artifactIdmmbase/artifactId
-version${project.version}/version
-!-- classifierclasses/classifier --
+version${mmbase.version}/version
/dependency
dependency
groupIdjavax.servlet/groupId
@@ -95,4 +94,6 @@
/plugins
/build
+
+
/project
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/rmmci/assembly client.xml
Update of /var/cvs/applications/rmmci/assembly In directory james.mmbase.org:/tmp/cvs-serv1998/assembly Modified Files: client.xml Log Message: See also: http://cvs.mmbase.org/viewcvs/applications/rmmci/assembly Index: client.xml === RCS file: /var/cvs/applications/rmmci/assembly/client.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- client.xml 18 Apr 2009 09:22:33 - 1.2 +++ client.xml 29 Apr 2009 07:11:09 - 1.3 @@ -69,6 +69,7 @@ includeorg/mmbase/util/HashCodeUtil*/include !-- used by SortedBundle, but is generic tool-- includeorg/mmbase/util/PublicCloneable*/include !-- used by SortedBundle, but is generic tool-- includeorg/mmbase/util/StringSplitter*/include !-- used by Queries-- + includeorg/mmbase/util/SerializableInputStream*/include !-- Representation of binaries-- includeorg/mmbase/storage/Storable.class/include !-- DataTypes uses .. -- includeorg/mmbase/storage/StorageException.class/include !-- -- ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/taglib pom.xml
Update of /var/cvs/applications/taglib In directory james.mmbase.org:/tmp/cvs-serv2043 Modified Files: pom.xml Log Message: depending on 'mmbase.version' for modules that have that version See also: http://cvs.mmbase.org/viewcvs/applications/taglib Index: pom.xml === RCS file: /var/cvs/applications/taglib/pom.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -u -b -r1.12 -r1.13 --- pom.xml 28 Apr 2009 15:19:34 - 1.12 +++ pom.xml 29 Apr 2009 07:11:33 - 1.13 @@ -110,11 +110,13 @@ dependency groupIdcommons-fileupload/groupId artifactIdcommons-fileupload/artifactId + scopeprovided/scope /dependency dependency groupIdjavax.servlet/groupId artifactIdjstl/artifactId + scopeprovided/scope /dependency /dependencies /project ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/vpro-wizards pom.xml
Update of /var/cvs/applications/vpro-wizards In directory james.mmbase.org:/tmp/cvs-serv2090 Modified Files: pom.xml Log Message: removed an odd newline See also: http://cvs.mmbase.org/viewcvs/applications/vpro-wizards Index: pom.xml === RCS file: /var/cvs/applications/vpro-wizards/pom.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- pom.xml 27 Apr 2009 11:09:37 - 1.3 +++ pom.xml 29 Apr 2009 07:11:59 - 1.4 @@ -4,8 +4,7 @@ parent groupIdorg.mmbase/groupId - artifactIdmmbase-application-parent - /artifactId + artifactIdmmbase-application-parent/artifactId version1.9-SNAPSHOT/version /parent ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/rmmci/src/org/mmbase/bridge/remote/rmi RemoteBridgeList_Rmi.java
Update of /var/cvs/applications/rmmci/src/org/mmbase/bridge/remote/rmi
In directory
james.mmbase.org:/tmp/cvs-serv2184/rmmci/src/org/mmbase/bridge/remote/rmi
Modified Files:
RemoteBridgeList_Rmi.java
Log Message:
spacing, javadoc
See also:
http://cvs.mmbase.org/viewcvs/applications/rmmci/src/org/mmbase/bridge/remote/rmi
Index: RemoteBridgeList_Rmi.java
===
RCS file:
/var/cvs/applications/rmmci/src/org/mmbase/bridge/remote/rmi/RemoteBridgeList_Rmi.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- RemoteBridgeList_Rmi.java 31 Mar 2007 17:15:00 - 1.1
+++ RemoteBridgeList_Rmi.java 29 Apr 2009 07:13:17 - 1.2
@@ -19,6 +19,10 @@
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
+/**
+ * @javadoc Why is this implemented?
+ */
+
public class RemoteBridgeList_RmiR, L extends RemoteList_RmiR, L
implements RemoteBridgeListR, Unreferenced {
private static Logger log =
Logging.getLoggerInstance(RemoteBridgeList_Rmi.class);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/rmmci/src/org/mmbase/bridge/remote/rmi RemoteIterator_Rmi.java RemoteList_Rmi.java ServerMappedObject_Rmi.java
Update of /var/cvs/applications/rmmci/src/org/mmbase/bridge/remote/rmi
In directory james.mmbase.org:/tmp/cvs-serv2263/src/org/mmbase/bridge/remote/rmi
Modified Files:
RemoteIterator_Rmi.java RemoteList_Rmi.java
ServerMappedObject_Rmi.java
Log Message:
Added some @javadoc tags, because it seems useful to know hwy certain Rmi's are
manually overriden
See also:
http://cvs.mmbase.org/viewcvs/applications/rmmci/src/org/mmbase/bridge/remote/rmi
Index: RemoteIterator_Rmi.java
===
RCS file:
/var/cvs/applications/rmmci/src/org/mmbase/bridge/remote/rmi/RemoteIterator_Rmi.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- RemoteIterator_Rmi.java 31 Mar 2007 17:15:00 - 1.1
+++ RemoteIterator_Rmi.java 29 Apr 2009 07:14:27 - 1.2
@@ -15,7 +15,9 @@
import org.mmbase.bridge.remote.RemoteIterator;
import org.mmbase.bridge.remote.util.ObjectWrapper;
-
+/**
+ * @javadoc Why is this implemented?
+ */
public class RemoteIterator_RmiR, L extends
ServerMappedObject_RmiListIteratorL implements RemoteIteratorR {
public RemoteIterator_Rmi(ListIteratorL originalObject) throws
RemoteException {
Index: RemoteList_Rmi.java
===
RCS file:
/var/cvs/applications/rmmci/src/org/mmbase/bridge/remote/rmi/RemoteList_Rmi.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- RemoteList_Rmi.java 31 Mar 2007 17:15:00 - 1.1
+++ RemoteList_Rmi.java 29 Apr 2009 07:14:27 - 1.2
@@ -15,6 +15,9 @@
import org.mmbase.bridge.remote.RemoteList;
import org.mmbase.bridge.remote.util.ObjectWrapper;
+/**
+ * @javadoc Why is this implemented?
+ */
public class RemoteList_RmiR, L extends ServerMappedObject_RmiListL
implements RemoteListR {
public RemoteList_Rmi(ListL originalObject) throws RemoteException {
Index: ServerMappedObject_Rmi.java
===
RCS file:
/var/cvs/applications/rmmci/src/org/mmbase/bridge/remote/rmi/ServerMappedObject_Rmi.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ServerMappedObject_Rmi.java 31 Mar 2007 17:15:00 - 1.1
+++ ServerMappedObject_Rmi.java 29 Apr 2009 07:14:27 - 1.2
@@ -18,6 +18,9 @@
import org.mmbase.bridge.remote.util.StubToLocalMapper;
+/**
+ * @javadoc
+ */
public abstract class ServerMappedObject_RmiO extends UnicastRemoteObject
implements ServerMappedObject, Unreferenced {
//original object
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/media/src/org/mmbase/applications/media/builders/resources states_nl.properties states.properties
Update of /var/cvs/applications/media/src/org/mmbase/applications/media/builders/resources In directory james.mmbase.org:/tmp/cvs-serv2416/media/src/org/mmbase/applications/media/builders/resources Modified Files: states_nl.properties states.properties Log Message: using constants for the values See also: http://cvs.mmbase.org/viewcvs/applications/media/src/org/mmbase/applications/media/builders/resources Index: states_nl.properties === RCS file: /var/cvs/applications/media/src/org/mmbase/applications/media/builders/resources/states_nl.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- states_nl.properties3 Jun 2004 16:00:09 - 1.2 +++ states_nl.properties29 Apr 2009 07:16:28 - 1.3 @@ -1,6 +1,6 @@ -1=Aangevraagd -2=Bezig -3=Klaar -4=Bron --1=Ongedefinieerd -10=Verwijderd \ No newline at end of file +REQUEST=Aangevraagd +BUSY=Bezig +DONE=Klaar +SOURCE=Bron +UNDEFINED=Ongedefinieerd +REMOVED=Verwijderd Index: states.properties === RCS file: /var/cvs/applications/media/src/org/mmbase/applications/media/builders/resources/states.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- states.properties 3 Jun 2004 16:00:09 - 1.2 +++ states.properties 29 Apr 2009 07:16:28 - 1.3 @@ -1,6 +1,6 @@ -1=Request -2=Busy -3=Done -4=Source --1=Undefined -10=Removed \ No newline at end of file +REQUEST=Request +BUSY=Busy +DONE=Done +SOURCE=Source +UNDEFINED=Undefined +REMOVED=Removed ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] applications/resources/src/org/mmbase/module/builders Resources.java
Update of /var/cvs/applications/resources/src/org/mmbase/module/builders
In directory
james.mmbase.org:/tmp/cvs-serv2517/resources/src/org/mmbase/module/builders
Modified Files:
Resources.java
Log Message:
added @Override annotations
See also:
http://cvs.mmbase.org/viewcvs/applications/resources/src/org/mmbase/module/builders
Index: Resources.java
===
RCS file:
/var/cvs/applications/resources/src/org/mmbase/module/builders/Resources.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Resources.java 24 Nov 2006 09:37:25 - 1.1
+++ Resources.java 29 Apr 2009 07:17:28 - 1.2
@@ -19,7 +19,7 @@
* (configuration files, classes, resourcebundles).
*
* @author Michiel Meeuwissen
- * @version $Id: Resources.java,v 1.1 2006/11/24 09:37:25 pierre Exp $
+ * @version $Id: Resources.java,v 1.2 2009/04/29 07:17:28 michiel Exp $
* @since MMBase-1.8
*/
public class Resources extends Attachments {
@@ -29,6 +29,7 @@
* Registers this builder in the ResourceLoader.
* {...@inheritdoc}
*/
+@Override
public boolean init() {
boolean res = super.init();
if (res) {
@@ -62,6 +63,7 @@
* Implements virtual filename field.
* {...@inheritdoc}
*/
+@Override
public Object getValue(MMObjectNode node, String field) {
if (field.equals(ResourceLoader.FILENAME_FIELD)) {
String s = node.getStringValue(ResourceLoader.RESOURCENAME_FIELD);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/bridge/util AbstractNode.java
Update of /var/cvs/src/org/mmbase/bridge/util
In directory james.mmbase.org:/tmp/cvs-serv2889/bridge/util
Modified Files:
AbstractNode.java
Log Message:
removed some logging
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/bridge/util
Index: AbstractNode.java
===
RCS file: /var/cvs/src/org/mmbase/bridge/util/AbstractNode.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- AbstractNode.java 24 Apr 2009 15:12:47 - 1.30
+++ AbstractNode.java 29 Apr 2009 07:36:08 - 1.31
@@ -32,7 +32,7 @@
* here, to minimalize the implementation effort of fully implemented Nodes.
*
* @author Michiel Meeuwissen
- * @version $Id: AbstractNode.java,v 1.30 2009/04/24 15:12:47 michiel Exp $
+ * @version $Id: AbstractNode.java,v 1.31 2009/04/29 07:36:08 michiel Exp $
* @see org.mmbase.bridge.Node
* @since MMBase-1.8
*/
@@ -98,9 +98,6 @@
log.info(Setting size to + si.getSize());
}
-log.info(Size + getSize(fieldName));
-log.info(Found + value);
-
if (value == null dt instanceof
org.mmbase.datatypes.NumberDataType) {
// null would otherwise be converted to -1, which makes little
sense.
// but must happen because setNumericValue methods cannot
accept null.
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/core/util Fields.java
Update of /var/cvs/src/org/mmbase/core/util
In directory james.mmbase.org:/tmp/cvs-serv3193/core/util
Modified Files:
Fields.java
Log Message:
javadoc
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/core/util
Index: Fields.java
===
RCS file: /var/cvs/src/org/mmbase/core/util/Fields.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- Fields.java 24 Apr 2009 15:19:19 - 1.16
+++ Fields.java 29 Apr 2009 07:39:07 - 1.17
@@ -61,7 +61,7 @@
return new org.mmbase.module.corebuilders.FieldDefs(name, type,
listItemType, state, dataType);
}
/**
- * Defaulting version of {...@link #createField(name, int int, int,
DataType)} (no list item type,
+ * Defaulting version of {...@link #createField(String, int int, int,
DataType)} (no list item type,
* because it is nearly always irrelevant).
* @since MMBase-1.9
*/
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/bridge/util DataTypeField.java NodeMap.java
Update of /var/cvs/src/org/mmbase/bridge/util
In directory james.mmbase.org:/tmp/cvs-serv3193/bridge/util
Modified Files:
DataTypeField.java NodeMap.java
Log Message:
javadoc
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/bridge/util
Index: DataTypeField.java
===
RCS file: /var/cvs/src/org/mmbase/bridge/util/DataTypeField.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- DataTypeField.java 22 Dec 2008 14:53:52 - 1.11
+++ DataTypeField.java 29 Apr 2009 07:39:07 - 1.12
@@ -20,14 +20,14 @@
/**
* Wraps a DataType object into a (virtual) Field object. It can be
instantiated with {...@link
* #DataTypeField(Cloud, DataType)} to have a 'virtual field with a Virtual
NodeManager with only one field
- * (itself). The constructor {...@link DataTypeField(Field, DataType)},
produces a new field object,
+ * (itself). The constructor {...@link #DataTypeField(Field, DataType)},
produces a new field object,
* that is very similar to the one wrapped, only with a different {...@link
DataType}.
*
* This also a way to associate a Cloud object with a DataType (it is actually
possible to see that
* as the essence of being a {...@link org.mmbase.bridge.Field}).
*
* @author Michiel Meeuwissen
- * @version $Id: DataTypeField.java,v 1.11 2008/12/22 14:53:52 michiel Exp $
+ * @version $Id: DataTypeField.java,v 1.12 2009/04/29 07:39:07 michiel Exp $
* @since MMBase-1.8.7
*/
Index: NodeMap.java
===
RCS file: /var/cvs/src/org/mmbase/bridge/util/NodeMap.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- NodeMap.java4 Sep 2008 06:54:27 - 1.5
+++ NodeMap.java29 Apr 2009 07:39:07 - 1.6
@@ -15,13 +15,13 @@
import org.mmbase.bridge.*;
/**
- * A {...@link java.util.Map} representing a Node. This class can be used if
you need a bridge {...@org.mmbase.bridge.node} object to look like a
+ * A {...@link java.util.Map} representing a Node. This class can be used if
you need a bridge {...@link org.mmbase.bridge.Node} object to look like a
* {...@link java.util.Map} (where the keys are the fields). Don't confuse
this with {...@link MapNode}.
*
* This object is also still a Node object.
*
* @author Michiel Meeuwissen
- * @version $Id: NodeMap.java,v 1.5 2008/09/04 06:54:27 michiel Exp $
+ * @version $Id: NodeMap.java,v 1.6 2009/04/29 07:39:07 michiel Exp $
* @since MMBase-1.8
*/
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/util/transformers TransformingReader.java
Update of /var/cvs/src/org/mmbase/util/transformers
In directory james.mmbase.org:/tmp/cvs-serv3193/util/transformers
Modified Files:
TransformingReader.java
Log Message:
javadoc
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/transformers
Index: TransformingReader.java
===
RCS file: /var/cvs/src/org/mmbase/util/transformers/TransformingReader.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- TransformingReader.java 23 Mar 2007 14:04:55 - 1.7
+++ TransformingReader.java 29 Apr 2009 07:39:08 - 1.8
@@ -64,6 +64,7 @@
}
+@Override
public synchronized int read() throws IOException {
int result = super.read();
if (result == -1) { // nothing to read any more, wait until
transformation is ready.
@@ -73,6 +74,7 @@
return result;
}
+@Override
public synchronized int read(char cbuf[], int off, int len) throws
IOException {
int result = super.read(cbuf, off, len);
if (result == -1) {
@@ -101,8 +103,9 @@
/**
* {...@inheritdoc}
- * ALso closes the wrapped Reader.
+ * Also closes the wrapped Reader.
*/
+@Override
public void close() throws IOException {
super.close();
in.close();
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
